oggdec: Set dts when known

[ffmpeg] / libavformat / adtsenc.c

diff --git a/libavformat/adtsenc.c b/libavformat/adtsenc.c
index 95baf470c79fe1e9769d44c8ac7b0ad2aae18f4f..260c5932a3231e23da3627afa43a069206755aa8 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,12 @@
  * 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/get_bits.h"
+#include "libavcodec/put_bits.h"
+#include "libavcodec/avcodec.h"
+#include "libavcodec/mpeg4audio.h"
 #include "avformat.h"
-#include "bitstream.h"
 
 #define ADTS_HEADER_SIZE 7
 
@@ -29,17 +33,48 @@ typedef struct {
     int objecttype;
     int sample_rate_index;
     int channel_conf;
+    int pce_size;
+    uint8_t pce_data[MAX_PCE_SIZE];
 } 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;
+    PutBitContext pb;
 
     init_get_bits(&gb, buf, size * 8);
     adts->objecttype = get_bits(&gb, 5) - 1;
     adts->sample_rate_index = get_bits(&gb, 4);
     adts->channel_conf = get_bits(&gb, 4);
 
+    if (adts->objecttype > 3U) {
+        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 (get_bits(&gb, 1)) {
+        av_log(s, AV_LOG_ERROR, "960/120 MDCT window is not allowed in ADTS\n");
+        return -1;
+    }
+    if (get_bits(&gb, 1)) {
+        av_log(s, AV_LOG_ERROR, "Scalable configurations are not allowed in ADTS\n");
+        return -1;
+    }
+    if (get_bits(&gb, 1)) {
+        av_log_missing_feature(s, "Signaled SBR or PS", 0);
+        return -1;
+    }
+    if (!adts->channel_conf) {
+        init_put_bits(&pb, adts->pce_data, MAX_PCE_SIZE);
+
+        put_bits(&pb, 3, 5); //ID_PCE
+        adts->pce_size = (ff_copy_pce_data(&pb, &gb) + 3) / 8;
+        flush_put_bits(&pb);
+    }
+
     adts->write_adts = 1;
 
     return 0;
@@ -50,8 +85,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;
 }
@@ -79,12 +115,16 @@ static int adts_write_frame_header(AVFormatContext *s, int size)
     /* adts_variable_header */
     put_bits(&pb, 1, 0);        /* copyright_identification_bit */
     put_bits(&pb, 1, 0);        /* copyright_identification_start */
-    put_bits(&pb, 13, ADTS_HEADER_SIZE + size); /* aac_frame_length */
+    put_bits(&pb, 13, ADTS_HEADER_SIZE + size + ctx->pce_size); /* aac_frame_length */
     put_bits(&pb, 11, 0x7ff);   /* adts_buffer_fullness */
     put_bits(&pb, 2, 0);        /* number_of_raw_data_blocks_in_frame */
 
     flush_put_bits(&pb);
-    put_buffer(&s->pb, buf, ADTS_HEADER_SIZE);
+    put_buffer(s->pb, buf, ADTS_HEADER_SIZE);
+    if (ctx->pce_size) {
+        put_buffer(s->pb, ctx->pce_data, ctx->pce_size);
+        ctx->pce_size = 0;
+    }
 
     return 0;
 }
@@ -92,7 +132,7 @@ static int adts_write_frame_header(AVFormatContext *s, int size)
 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;
@@ -106,9 +146,9 @@ static int adts_write_packet(AVFormatContext *s, AVPacket *pkt)
 
 AVOutputFormat adts_muxer = {
     "adts",
-    "ADTS AAC",
+    NULL_IF_CONFIG_SMALL("ADTS AAC"),
     "audio/aac",
-    "aac",
+    "aac,adts",
     sizeof(ADTSContext),
     CODEC_ID_AAC,
     CODEC_ID_NONE,