From d663a1fdc0fd405aafabc9bca6d19d02ca640df9 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Sun, 28 Sep 2003 20:34:11 +0000 Subject: AMR-WB support by (Johannes Carlsson ) Originally committed as revision 2311 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavformat/amr.c | 180 +++++++++++++++++++++++++++++++++++++----------------- 1 file changed, 123 insertions(+), 57 deletions(-) (limited to 'libavformat/amr.c') diff --git a/libavformat/amr.c b/libavformat/amr.c index 4baa427ea3..67a7748bda 100644 --- a/libavformat/amr.c +++ b/libavformat/amr.c @@ -20,34 +20,34 @@ /* Write and read amr data according to RFC3267, http://www.ietf.org/rfc/rfc3267.txt?number=3267 -Only amr narrowband (not amr-wb) is supported for now. +Only mono files are supported. */ #include "avformat.h" -#include "avi.h" static const unsigned char AMR_header [] = "#!AMR\n"; - -/* AMR_FILE header */ -static int put_amr_header(ByteIOContext *pb, AVCodecContext *enc) -{ - put_tag(pb, AMR_header); /* magic number */ - return 0; -} +static const unsigned char AMRWB_header [] = "#!AMR-WB\n"; static int amr_write_header(AVFormatContext *s) { ByteIOContext *pb = &s->pb; + AVCodecContext *enc = &s->streams[0]->codec; s->priv_data = NULL; - /* format header */ - if (put_amr_header(pb, &s->streams[0]->codec) < 0) { - return -1; + if (enc->codec_id == CODEC_ID_AMR_NB) + { + put_tag(pb, AMR_header); /* magic number */ + } + else if(enc->codec_id == CODEC_ID_AMR_WB) + { + put_tag(pb, AMRWB_header); /* magic number */ + } + else + { + //This is an error! } - put_flush_packet(pb); - return 0; } @@ -66,10 +66,13 @@ static int amr_write_trailer(AVFormatContext *s) static int amr_probe(AVProbeData *p) { - /* check file header */ - if (p->buf_size < 6) + //Only check for "#!AMR" which could be amr-wb, amr-nb. + //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,6)==0) + if(memcmp(p->buf,AMR_header,5)==0) return AVPROBE_SCORE_MAX; else return 0; @@ -81,24 +84,44 @@ static int amr_read_header(AVFormatContext *s, { ByteIOContext *pb = &s->pb; AVStream *st; - uint8_t header[6]; + uint8_t header[9]; get_buffer(pb, header, 6); if(memcmp(header,AMR_header,6)!=0) { - return -1; + get_buffer(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 = CODEC_ID_AMR_WB; + 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 = CODEC_ID_AMR_NB; + st->codec.codec_id = CODEC_ID_AMR_NB; + st->codec.channels = 1; + st->codec.sample_rate = 8000; } - st = av_new_stream(s, 0); - if (!st) - return AVERROR_NOMEM; - - st->codec.codec_type = CODEC_TYPE_AUDIO; - st->codec.codec_tag = CODEC_ID_AMR_NB; - st->codec.codec_id = CODEC_ID_AMR_NB; - st->codec.channels = 1; - st->codec.sample_rate = 8000; return 0; } @@ -107,39 +130,82 @@ static int amr_read_header(AVFormatContext *s, static int amr_read_packet(AVFormatContext *s, AVPacket *pkt) { - static uint16_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; + AVCodecContext *enc = &s->streams[0]->codec; - if (url_feof(&s->pb)) - return -EIO; - - toc=0; - - toc=get_byte(&s->pb); - - q = (toc >> 2) & 0x01; - ft = (toc >> 3) & 0x0F; - - size=packed_size[ft]; - //printf("amr_read_packet size=%d\n",size); - - if (av_new_packet(pkt, size+1)) - return -EIO; - pkt->stream_index = 0; + if (enc->codec_id == CODEC_ID_AMR_NB) + { + 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; - pkt->data[0]=toc; - - read = get_buffer(&s->pb, pkt->data+1, size); - - if (read != size) + if (url_feof(&s->pb)) + { + return -EIO; + } + + 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 -EIO; + } + pkt->stream_index = 0; + + pkt->data[0]=toc; + + read = get_buffer(&s->pb, pkt->data+1, size); + + if (read != size) + { + av_free_packet(pkt); + return -EIO; + } + + return 0; + } + 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 -EIO; + } + + toc=get_byte(&s->pb); + mode = (uint8_t)((toc >> 3) & 0x0F); + size = packed_size[mode]; + + if ( (size==0) || av_new_packet(pkt, size)) + { + return -EIO; + } + + pkt->stream_index = 0; + pkt->data[0]=toc; + + read = get_buffer(&s->pb, pkt->data+1, size-1); + + if (read != (size-1)) + { + av_free_packet(pkt); + return -EIO; + } + + return 0; + } + else { - av_free_packet(pkt); return -EIO; } - - return 0; } static int amr_read_close(AVFormatContext *s) @@ -150,7 +216,7 @@ static int amr_read_close(AVFormatContext *s) static AVInputFormat amr_iformat = { "amr", "3gpp amr file format", - 0, + 0, /*priv_data_size*/ amr_probe, amr_read_header, amr_read_packet, -- cgit v1.2.3