X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavformat%2Famr.c;h=d8c5399e3f90b7c663a9deca68ff908eed665524;hb=459821c53386f8eddadedbfe0ec19e11bf406ed5;hp=22cd6137391c0fd6bccb7efb2ad066d3c33b74a6;hpb=0e6c947df3a834484c04c3e9a646004ab7ccda65;p=ffmpeg diff --git a/libavformat/amr.c b/libavformat/amr.c index 22cd6137391..d8c5399e3f9 100644 --- a/libavformat/amr.c +++ b/libavformat/amr.c @@ -2,18 +2,20 @@ * amr file format * Copyright (c) 2001 ffmpeg project * - * This library is free software; you can redistribute it and/or + * This file is part of FFmpeg. + * + * FFmpeg 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 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * - * This library is distributed in the hope that it will be useful, + * FFmpeg 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 this library; if not, write to the Free Software + * License along with FFmpeg; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ @@ -25,13 +27,13 @@ Only mono files are supported. */ #include "avformat.h" -static const unsigned char AMR_header [] = "#!AMR\n"; -static const unsigned char AMRWB_header [] = "#!AMR-WB\n"; +static const char AMR_header [] = "#!AMR\n"; +static const char AMRWB_header [] = "#!AMR-WB\n"; #ifdef CONFIG_MUXERS static int amr_write_header(AVFormatContext *s) { - ByteIOContext *pb = &s->pb; + ByteIOContext *pb = s->pb; AVCodecContext *enc = s->streams[0]->codec; s->priv_data = NULL; @@ -46,7 +48,7 @@ static int amr_write_header(AVFormatContext *s) } else { - //This is an error! + return -1; } put_flush_packet(pb); return 0; @@ -54,13 +56,8 @@ static int amr_write_header(AVFormatContext *s) static int amr_write_packet(AVFormatContext *s, AVPacket *pkt) { - put_buffer(&s->pb, pkt->data, pkt->size); - put_flush_packet(&s->pb); - return 0; -} - -static int amr_write_trailer(AVFormatContext *s) -{ + put_buffer(s->pb, pkt->data, pkt->size); + put_flush_packet(s->pb); return 0; } #endif /* CONFIG_MUXERS */ @@ -71,8 +68,6 @@ static int amr_probe(AVProbeData *p) //This will also trigger multichannel files: "#!AMR_MC1.0\n" and //"#!AMR-WB_MC1.0\n" (not supported) - if (p->buf_size < 5) - return 0; if(memcmp(p->buf,AMR_header,5)==0) return AVPROBE_SCORE_MAX; else @@ -83,12 +78,17 @@ static int amr_probe(AVProbeData *p) static int amr_read_header(AVFormatContext *s, AVFormatParameters *ap) { - ByteIOContext *pb = &s->pb; + ByteIOContext *pb = s->pb; AVStream *st; uint8_t header[9]; get_buffer(pb, header, 6); + st = av_new_stream(s, 0); + if (!st) + { + return AVERROR(ENOMEM); + } if(memcmp(header,AMR_header,6)!=0) { get_buffer(pb, header+6, 3); @@ -96,137 +96,90 @@ static int amr_read_header(AVFormatContext *s, { return -1; } - st = av_new_stream(s, 0); - if (!st) - { - return AVERROR_NOMEM; - } - st->codec->codec_type = CODEC_TYPE_AUDIO; st->codec->codec_tag = MKTAG('s', 'a', 'w', 'b'); st->codec->codec_id = CODEC_ID_AMR_WB; - st->codec->channels = 1; st->codec->sample_rate = 16000; } else { - st = av_new_stream(s, 0); - if (!st) - { - return AVERROR_NOMEM; - } - - st->codec->codec_type = CODEC_TYPE_AUDIO; st->codec->codec_tag = MKTAG('s', 'a', 'm', 'r'); st->codec->codec_id = CODEC_ID_AMR_NB; - st->codec->channels = 1; st->codec->sample_rate = 8000; } + st->codec->channels = 1; + st->codec->codec_type = CODEC_TYPE_AUDIO; + av_set_pts_info(st, 64, 1, st->codec->sample_rate); return 0; } -#define MAX_SIZE 32 - static int amr_read_packet(AVFormatContext *s, AVPacket *pkt) { AVCodecContext *enc = s->streams[0]->codec; + int read, size = 0, toc, mode; - if (enc->codec_id == CODEC_ID_AMR_NB) + if (url_feof(s->pb)) { - const static uint8_t packed_size[16] = {12, 13, 15, 17, 19, 20, 26, 31, 5, 0, 0, 0, 0, 0, 0, 0}; - uint8_t toc, q, ft; - int read; - int size; - - if (url_feof(&s->pb)) - { - return AVERROR_IO; - } - - toc=get_byte(&s->pb); - q = (toc >> 2) & 0x01; - ft = (toc >> 3) & 0x0F; - - size=packed_size[ft]; - - if (av_new_packet(pkt, size+1)) - { - return AVERROR_IO; - } - pkt->stream_index = 0; - pkt->pos= url_ftell(&s->pb); - pkt->data[0]=toc; + return AVERROR(EIO); + } - read = get_buffer(&s->pb, pkt->data+1, size); +//FIXME this is wrong, this should rather be in a AVParset + toc=get_byte(s->pb); + mode = (toc >> 3) & 0x0F; - if (read != size) - { - av_free_packet(pkt); - return AVERROR_IO; - } + if (enc->codec_id == CODEC_ID_AMR_NB) + { + static const uint8_t packed_size[16] = {12, 13, 15, 17, 19, 20, 26, 31, 5, 0, 0, 0, 0, 0, 0, 0}; - return 0; + size=packed_size[mode]+1; } else if(enc->codec_id == CODEC_ID_AMR_WB) { static uint8_t packed_size[16] = {18, 24, 33, 37, 41, 47, 51, 59, 61, 6, 6, 0, 0, 0, 1, 1}; - uint8_t toc, mode; - int read; - int size; - if (url_feof(&s->pb)) - { - return AVERROR_IO; - } - - toc=get_byte(&s->pb); - mode = (uint8_t)((toc >> 3) & 0x0F); - size = packed_size[mode]; - - if ( (size==0) || av_new_packet(pkt, size)) - { - return AVERROR_IO; - } - - pkt->stream_index = 0; - pkt->pos= url_ftell(&s->pb); - pkt->data[0]=toc; + size=packed_size[mode]; + } + else + { + assert(0); + } - read = get_buffer(&s->pb, pkt->data+1, size-1); + if ( (size==0) || av_new_packet(pkt, size)) + { + return AVERROR(EIO); + } - if (read != (size-1)) - { - av_free_packet(pkt); - return AVERROR_IO; - } + pkt->stream_index = 0; + pkt->pos= url_ftell(s->pb); + pkt->data[0]=toc; + pkt->duration= enc->codec_id == CODEC_ID_AMR_NB ? 160 : 320; + read = get_buffer(s->pb, pkt->data+1, size-1); - return 0; - } - else + if (read != size-1) { - return AVERROR_IO; + av_free_packet(pkt); + return AVERROR(EIO); } -} -static int amr_read_close(AVFormatContext *s) -{ return 0; } -static AVInputFormat amr_iformat = { +#ifdef CONFIG_AMR_DEMUXER +AVInputFormat amr_demuxer = { "amr", "3gpp amr file format", 0, /*priv_data_size*/ amr_probe, amr_read_header, amr_read_packet, - amr_read_close, + NULL, }; +#endif -#ifdef CONFIG_MUXERS -static AVOutputFormat amr_oformat = { +#ifdef CONFIG_AMR_MUXER +AVOutputFormat amr_muxer = { "amr", "3gpp amr file format", "audio/amr", @@ -236,15 +189,5 @@ static AVOutputFormat amr_oformat = { CODEC_ID_NONE, amr_write_header, amr_write_packet, - amr_write_trailer, }; #endif - -int amr_init(void) -{ - av_register_input_format(&amr_iformat); -#ifdef CONFIG_MUXERS - av_register_output_format(&amr_oformat); -#endif - return 0; -}