X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavformat%2Fvocdec.c;h=2fb84409316981ea313b3dc375e12467be8fa9c2;hb=82ee7d0dda0fec8cdb670f4e844bf5c2927ad9de;hp=909520c5e5546398445a929259cf4b0a77069d46;hpb=80b39e1ca6e4711e2094c1a0f20a188e8751c941;p=ffmpeg diff --git a/libavformat/vocdec.c b/libavformat/vocdec.c index 909520c5e55..2fb84409316 100644 --- a/libavformat/vocdec.c +++ b/libavformat/vocdec.c @@ -2,20 +2,20 @@ * Creative Voice File demuxer. * Copyright (c) 2006 Aurelien Jacobs * - * This file is part of FFmpeg. + * This file is part of Libav. * - * FFmpeg is free software; you can redistribute it and/or + * Libav is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. * - * FFmpeg is distributed in the hope that it will be useful, + * Libav is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with FFmpeg; if not, write to the Free Software + * License along with Libav; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ @@ -38,21 +38,21 @@ static int voc_probe(AVProbeData *p) return AVPROBE_SCORE_MAX; } -static int voc_read_header(AVFormatContext *s, AVFormatParameters *ap) +static int voc_read_header(AVFormatContext *s) { VocDecContext *voc = s->priv_data; - ByteIOContext *pb = s->pb; + AVIOContext *pb = s->pb; int header_size; AVStream *st; - url_fskip(pb, 20); - header_size = get_le16(pb) - 22; + avio_skip(pb, 20); + header_size = avio_rl16(pb) - 22; if (header_size != 4) { av_log(s, AV_LOG_ERROR, "unknown header size: %d\n", header_size); return AVERROR(ENOSYS); } - url_fskip(pb, header_size); - st = av_new_stream(s, 0); + avio_skip(pb, header_size); + st = avformat_new_stream(s, NULL); if (!st) return AVERROR(ENOMEM); st->codec->codec_type = AVMEDIA_TYPE_AUDIO; @@ -62,36 +62,40 @@ static int voc_read_header(AVFormatContext *s, AVFormatParameters *ap) } int -voc_get_packet(AVFormatContext *s, AVPacket *pkt, AVStream *st, int max_size) +ff_voc_get_packet(AVFormatContext *s, AVPacket *pkt, AVStream *st, int max_size) { VocDecContext *voc = s->priv_data; AVCodecContext *dec = st->codec; - ByteIOContext *pb = s->pb; + AVIOContext *pb = s->pb; VocType type; - int size; + int size, tmp_codec=-1; int sample_rate = 0; int channels = 1; while (!voc->remaining_size) { - type = get_byte(pb); + type = avio_r8(pb); if (type == VOC_TYPE_EOF) return AVERROR(EIO); - voc->remaining_size = get_le24(pb); + voc->remaining_size = avio_rl24(pb); if (!voc->remaining_size) { - if (url_is_streamed(s->pb)) + if (!s->pb->seekable) return AVERROR(EIO); - voc->remaining_size = url_fsize(pb) - url_ftell(pb); + voc->remaining_size = avio_size(pb) - avio_tell(pb); } max_size -= 4; switch (type) { case VOC_TYPE_VOICE_DATA: - dec->sample_rate = 1000000 / (256 - get_byte(pb)); - if (sample_rate) - dec->sample_rate = sample_rate; - dec->channels = channels; - dec->codec_id = ff_codec_get_id(ff_voc_codec_tags, get_byte(pb)); - dec->bits_per_coded_sample = av_get_bits_per_sample(dec->codec_id); + if (!dec->sample_rate) { + dec->sample_rate = 1000000 / (256 - avio_r8(pb)); + if (sample_rate) + dec->sample_rate = sample_rate; + avpriv_set_pts_info(st, 64, 1, dec->sample_rate); + dec->channels = channels; + dec->bits_per_coded_sample = av_get_bits_per_sample(dec->codec_id); + } else + avio_skip(pb, 1); + tmp_codec = avio_r8(pb); voc->remaining_size -= 2; max_size -= 2; channels = 1; @@ -101,32 +105,51 @@ voc_get_packet(AVFormatContext *s, AVPacket *pkt, AVStream *st, int max_size) break; case VOC_TYPE_EXTENDED: - sample_rate = get_le16(pb); - get_byte(pb); - channels = get_byte(pb) + 1; + sample_rate = avio_rl16(pb); + avio_r8(pb); + channels = avio_r8(pb) + 1; sample_rate = 256000000 / (channels * (65536 - sample_rate)); voc->remaining_size = 0; max_size -= 4; break; case VOC_TYPE_NEW_VOICE_DATA: - dec->sample_rate = get_le32(pb); - dec->bits_per_coded_sample = get_byte(pb); - dec->channels = get_byte(pb); - dec->codec_id = ff_codec_get_id(ff_voc_codec_tags, get_le16(pb)); - url_fskip(pb, 4); + if (!dec->sample_rate) { + dec->sample_rate = avio_rl32(pb); + avpriv_set_pts_info(st, 64, 1, dec->sample_rate); + dec->bits_per_coded_sample = avio_r8(pb); + dec->channels = avio_r8(pb); + } else + avio_skip(pb, 6); + tmp_codec = avio_rl16(pb); + avio_skip(pb, 4); voc->remaining_size -= 12; max_size -= 12; break; default: - url_fskip(pb, voc->remaining_size); + avio_skip(pb, voc->remaining_size); max_size -= voc->remaining_size; voc->remaining_size = 0; break; } } + if (tmp_codec >= 0) { + tmp_codec = ff_codec_get_id(ff_voc_codec_tags, tmp_codec); + if (dec->codec_id == AV_CODEC_ID_NONE) + dec->codec_id = tmp_codec; + else if (dec->codec_id != tmp_codec) + av_log(s, AV_LOG_WARNING, "Ignoring mid-stream change in audio codec\n"); + if (dec->codec_id == AV_CODEC_ID_NONE) { + if (s->audio_codec_id == AV_CODEC_ID_NONE) { + av_log(s, AV_LOG_ERROR, "unknown codec tag\n"); + return AVERROR(EINVAL); + } + av_log(s, AV_LOG_WARNING, "unknown codec tag\n"); + } + } + dec->bit_rate = dec->sample_rate * dec->bits_per_coded_sample; if (max_size <= 0) @@ -138,15 +161,15 @@ voc_get_packet(AVFormatContext *s, AVPacket *pkt, AVStream *st, int max_size) static int voc_read_packet(AVFormatContext *s, AVPacket *pkt) { - return voc_get_packet(s, pkt, s->streams[0], 0); + return ff_voc_get_packet(s, pkt, s->streams[0], 0); } -AVInputFormat voc_demuxer = { - "voc", - NULL_IF_CONFIG_SMALL("Creative Voice file format"), - sizeof(VocDecContext), - voc_probe, - voc_read_header, - voc_read_packet, - .codec_tag=(const AVCodecTag* const []){ff_voc_codec_tags, 0}, +AVInputFormat ff_voc_demuxer = { + .name = "voc", + .long_name = NULL_IF_CONFIG_SMALL("Creative Voice"), + .priv_data_size = sizeof(VocDecContext), + .read_probe = voc_probe, + .read_header = voc_read_header, + .read_packet = voc_read_packet, + .codec_tag = (const AVCodecTag* const []){ ff_voc_codec_tags, 0 }, };