Add my name to copyright & author as requested by the original author.

[ffmpeg] / libavformat / adtsenc.c

diff --git a/libavformat/adtsenc.c b/libavformat/adtsenc.c
index 1ef68383871aec419f20fa23df04d7c0aca8b8e1..9916b92ac6ddf6032b080886dc528e2c1f0861a5 100644 (file)
--- a/libavformat/adtsenc.c
+++ b/libavformat/adtsenc.c
@@ -1,7 +1,7 @@
 /*
  * ADTS muxer.
  * Copyright (c) 2006 Baptiste Coudurier <baptiste.coudurier@smartjog.com>
- *                    Mans Rullgard <mru@inprovide.com>
+ *                    Mans Rullgard <mans@mansr.com>
  *
  * This file is part of FFmpeg.
  *
@@ -19,8 +19,10 @@
  * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
+
+#include "libavcodec/bitstream.h"
+#include "libavcodec/internal.h"
 #include "avformat.h"
-#include "bitstream.h"
 
 #define ADTS_HEADER_SIZE 7
 
@@ -31,7 +33,7 @@ typedef struct {
     int channel_conf;
 } ADTSContext;
 
-static int decode_extradata(ADTSContext *adts, uint8_t *buf, int size)
+static int decode_extradata(AVFormatContext *s, ADTSContext *adts, uint8_t *buf, int size)
 {
     GetBitContext gb;
 
@@ -40,6 +42,19 @@ static int decode_extradata(ADTSContext *adts, uint8_t *buf, int size)
     adts->sample_rate_index = get_bits(&gb, 4);
     adts->channel_conf = get_bits(&gb, 4);
 
+    if (adts->objecttype > 3) {
+        av_log(s, AV_LOG_ERROR, "MPEG-4 AOT %d is not allowed in ADTS\n", adts->objecttype+1);
+        return -1;
+    }
+    if (adts->sample_rate_index == 15) {
+        av_log(s, AV_LOG_ERROR, "Escape sample rate index illegal in ADTS\n");
+        return -1;
+    }
+    if (adts->channel_conf == 0) {
+        ff_log_missing_feature(s, "PCE based channel configuration", 0);
+        return -1;
+    }
+
     adts->write_adts = 1;
 
     return 0;
@@ -50,8 +65,9 @@ static int adts_write_header(AVFormatContext *s)
     ADTSContext *adts = s->priv_data;
     AVCodecContext *avc = s->streams[0]->codec;
 
-    if(avc->extradata_size > 0)
-        decode_extradata(adts, avc->extradata, avc->extradata_size);
+    if(avc->extradata_size > 0 &&
+            decode_extradata(s, adts, avc->extradata, avc->extradata_size) < 0)
+        return -1;
 
     return 0;
 }
@@ -84,20 +100,15 @@ static int adts_write_frame_header(AVFormatContext *s, int size)
     put_bits(&pb, 2, 0);        /* number_of_raw_data_blocks_in_frame */
 
     flush_put_bits(&pb);
-    put_buffer(&s->pb, buf, ADTS_HEADER_SIZE);
-
-    return 0;
-}
+    put_buffer(s->pb, buf, ADTS_HEADER_SIZE);
 
-static int adts_write_trailer(AVFormatContext *s)
-{
     return 0;
 }
 
 static int adts_write_packet(AVFormatContext *s, AVPacket *pkt)
 {
     ADTSContext *adts = s->priv_data;
-    ByteIOContext *pb = &s->pb;
+    ByteIOContext *pb = s->pb;
 
     if (!pkt->size)
         return 0;
@@ -111,7 +122,7 @@ static int adts_write_packet(AVFormatContext *s, AVPacket *pkt)
 
 AVOutputFormat adts_muxer = {
     "adts",
-    "ADTS AAC",
+    NULL_IF_CONFIG_SMALL("ADTS AAC"),
     "audio/aac",
     "aac",
     sizeof(ADTSContext),
@@ -119,5 +130,4 @@ AVOutputFormat adts_muxer = {
     CODEC_ID_NONE,
     adts_write_header,
     adts_write_packet,
-    adts_write_trailer,
 };