Merge remote-tracking branch 'newdev/master'

[ffmpeg] / libavformat / amr.c

diff --git a/libavformat/amr.c b/libavformat/amr.c
index f271750fdfd2cbd8511b3569c7834b73ba050aaa..66763f3fa788fa8a80c00705977e06181963f9ae 100644 (file)
--- a/libavformat/amr.c
+++ b/libavformat/amr.c
@@ -30,42 +30,37 @@ Only mono files are supported.
 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
     {
         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)
 {
@@ -73,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
@@ -85,20 +78,20 @@ static int amr_probe(AVProbeData *p)
 static int amr_read_header(AVFormatContext *s,
                            AVFormatParameters *ap)
 {
-    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 = av_new_stream(s, 0);
     if (!st)
     {
-        return AVERROR_NOMEM;
+        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;
@@ -107,35 +100,36 @@ static int amr_read_header(AVFormatContext *s,
         st->codec->codec_tag = MKTAG('s', 'a', 'w', 'b');
         st->codec->codec_id = CODEC_ID_AMR_WB;
         st->codec->sample_rate = 16000;
+        st->codec->frame_size = 320;
     }
     else
     {
         st->codec->codec_tag = MKTAG('s', 'a', 'm', 'r');
         st->codec->codec_id = CODEC_ID_AMR_NB;
         st->codec->sample_rate = 8000;
+        st->codec->frame_size = 160;
     }
     st->codec->channels = 1;
-    st->codec->codec_type = CODEC_TYPE_AUDIO;
+    st->codec->codec_type = AVMEDIA_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, toc, mode;
+    int read, size = 0, toc, mode;
+    int64_t pos = avio_tell(s->pb);
 
-    if (url_feof(&s->pb))
+    if (url_feof(s->pb))
     {
-        return AVERROR_IO;
+        return AVERROR(EIO);
     }
 
 //FIXME this is wrong, this should rather be in a AVParset
-    toc=get_byte(&s->pb);
+    toc=avio_r8(s->pb);
     mode = (toc >> 3) & 0x0F;
 
     if (enc->codec_id == CODEC_ID_AMR_NB)
@@ -157,45 +151,44 @@ static int amr_read_packet(AVFormatContext *s,
 
     if ( (size==0) || av_new_packet(pkt, size))
     {
-        return AVERROR_IO;
+        return AVERROR(EIO);
     }
 
+    /* Both AMR formats have 50 frames per second */
+    s->streams[0]->codec->bit_rate = size*8*50;
+
     pkt->stream_index = 0;
-    pkt->pos= url_ftell(&s->pb);
+    pkt->pos = pos;
     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);
+    read = avio_read(s->pb, pkt->data+1, size-1);
 
     if (read != size-1)
     {
         av_free_packet(pkt);
-        return AVERROR_IO;
+        return AVERROR(EIO);
     }
 
     return 0;
 }
 
-static int amr_read_close(AVFormatContext *s)
-{
-    return 0;
-}
-
-#ifdef CONFIG_AMR_DEMUXER
-AVInputFormat amr_demuxer = {
+#if CONFIG_AMR_DEMUXER
+AVInputFormat ff_amr_demuxer = {
     "amr",
-    "3gpp amr file format",
+    NULL_IF_CONFIG_SMALL("3GPP AMR file format"),
     0, /*priv_data_size*/
     amr_probe,
     amr_read_header,
     amr_read_packet,
-    amr_read_close,
+    NULL,
+    .flags = AVFMT_GENERIC_INDEX,
 };
 #endif
 
-#ifdef CONFIG_AMR_MUXER
-AVOutputFormat amr_muxer = {
+#if CONFIG_AMR_MUXER
+AVOutputFormat ff_amr_muxer = {
     "amr",
-    "3gpp amr file format",
+    NULL_IF_CONFIG_SMALL("3GPP AMR file format"),
     "audio/amr",
     "amr",
     0,
@@ -203,6 +196,5 @@ AVOutputFormat amr_muxer = {
     CODEC_ID_NONE,
     amr_write_header,
     amr_write_packet,
-    amr_write_trailer,
 };
 #endif