X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavformat%2Famr.c;h=96f559b227ee5d0fa4eaa525ba826eff928ec1c6;hb=fad729fa505c0450482028c4a55c29fdc503dad7;hp=114a73929f91390951094e261bc9cda9814851d1;hpb=191e8ca75279073699e0c0f25128b2b2088d1cbb;p=ffmpeg diff --git a/libavformat/amr.c b/libavformat/amr.c index 114a73929f9..96f559b227e 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 Libav. + * + * 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 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, + * 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 this library; 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 */ @@ -24,46 +26,42 @@ Only mono files are supported. */ #include "avformat.h" +#include "internal.h" static const char AMR_header [] = "#!AMR\n"; static const char AMRWB_header [] = "#!AMR-WB\n"; -#ifdef CONFIG_MUXERS +#if CONFIG_AMR_MUXER static int amr_write_header(AVFormatContext *s) { - ByteIOContext *pb = &s->pb; + AVIOContext *pb = s->pb; AVCodecContext *enc = s->streams[0]->codec; s->priv_data = NULL; if (enc->codec_id == CODEC_ID_AMR_NB) { - put_tag(pb, AMR_header); /* magic number */ + avio_write(pb, AMR_header, sizeof(AMR_header) - 1); /* magic number */ } else if(enc->codec_id == CODEC_ID_AMR_WB) { - put_tag(pb, AMRWB_header); /* magic number */ + avio_write(pb, AMRWB_header, sizeof(AMRWB_header) - 1); /* magic number */ } else { - //This is an error! + return -1; } - put_flush_packet(pb); + avio_flush(pb); return 0; } static int amr_write_packet(AVFormatContext *s, AVPacket *pkt) { - put_buffer(&s->pb, pkt->data, pkt->size); - put_flush_packet(&s->pb); + avio_write(s->pb, pkt->data, pkt->size); + avio_flush(s->pb); return 0; } - -static int amr_write_trailer(AVFormatContext *s) -{ - return 0; -} -#endif /* CONFIG_MUXERS */ +#endif /* CONFIG_AMR_MUXER */ static int amr_probe(AVProbeData *p) { @@ -71,8 +69,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 @@ -80,164 +76,120 @@ static int amr_probe(AVProbeData *p) } /* amr input */ -static int amr_read_header(AVFormatContext *s, - AVFormatParameters *ap) +static int amr_read_header(AVFormatContext *s) { - ByteIOContext *pb = &s->pb; + AVIOContext *pb = s->pb; AVStream *st; uint8_t header[9]; - get_buffer(pb, header, 6); + avio_read(pb, header, 6); + st = avformat_new_stream(s, NULL); + if (!st) + { + return AVERROR(ENOMEM); + } if(memcmp(header,AMR_header,6)!=0) { - get_buffer(pb, header+6, 3); + avio_read(pb, header+6, 3); if(memcmp(header,AMRWB_header,9)!=0) { 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 = AVMEDIA_TYPE_AUDIO; + avpriv_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; + int64_t pos = avio_tell(s->pb); - if (enc->codec_id == CODEC_ID_AMR_NB) + if (s->pb->eof_reached) { - static const 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=avio_r8(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; - } + size=packed_size[mode]; + } + else + { + assert(0); + } - pkt->stream_index = 0; - pkt->pos= url_ftell(&s->pb); - pkt->data[0]=toc; + if ( (size==0) || av_new_packet(pkt, size)) + { + return AVERROR(EIO); + } - read = get_buffer(&s->pb, pkt->data+1, size-1); + /* Both AMR formats have 50 frames per second */ + s->streams[0]->codec->bit_rate = size*8*50; - if (read != (size-1)) - { - av_free_packet(pkt); - return AVERROR_IO; - } + pkt->stream_index = 0; + pkt->pos = pos; + pkt->data[0]=toc; + pkt->duration= enc->codec_id == CODEC_ID_AMR_NB ? 160 : 320; + read = avio_read(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; } -#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, +#if CONFIG_AMR_DEMUXER +AVInputFormat ff_amr_demuxer = { + .name = "amr", + .long_name = NULL_IF_CONFIG_SMALL("3GPP AMR file format"), + .read_probe = amr_probe, + .read_header = amr_read_header, + .read_packet = amr_read_packet, + .flags = AVFMT_GENERIC_INDEX, }; #endif -#ifdef CONFIG_AMR_MUXER -AVOutputFormat amr_muxer = { - "amr", - "3gpp amr file format", - "audio/amr", - "amr", - 0, - CODEC_ID_AMR_NB, - CODEC_ID_NONE, - amr_write_header, - amr_write_packet, - amr_write_trailer, +#if CONFIG_AMR_MUXER +AVOutputFormat ff_amr_muxer = { + .name = "amr", + .long_name = NULL_IF_CONFIG_SMALL("3GPP AMR file format"), + .mime_type = "audio/amr", + .extensions = "amr", + .audio_codec = CODEC_ID_AMR_NB, + .video_codec = CODEC_ID_NONE, + .write_header = amr_write_header, + .write_packet = amr_write_packet, }; #endif