Allow parsing and decoding of ADTS AAC files with channel config = 0

[frescor/ffmpeg.git] / libavcodec / aac_ac3_parser.c

diff --git a/libavcodec/aac_ac3_parser.c b/libavcodec/aac_ac3_parser.c
index ad8f04e757baca20c092d4a3e834a31101f84b99..90cbb9535c1a7c64f721a0a1e3f39783d17b58cf 100644 (file)
--- a/libavcodec/aac_ac3_parser.c
+++ b/libavcodec/aac_ac3_parser.c
@@ -1,7 +1,7 @@
 /*
- * Common AAC and AC3 parser
- * Copyright (c) 2003 Fabrice Bellard.
- * Copyright (c) 2003 Michael Niedermayer.
+ * Common AAC and AC-3 parser
+ * Copyright (c) 2003 Fabrice Bellard
+ * Copyright (c) 2003 Michael Niedermayer
  *
  * This file is part of FFmpeg.
  *
@@ -49,10 +49,13 @@ get_next:
             if(len<=0){
                 i=END_NOT_FOUND;
             }else{
+                s->state=0;
                 i-= s->header_size -1;
-                s->remaining_size = len + i;
-                if(!new_frame_start)
+                s->remaining_size = len;
+                if(!new_frame_start || pc->index+i<=0){
+                    s->remaining_size += i;
                     goto get_next;
+                }
             }
         }
     }
@@ -67,20 +70,27 @@ get_next:
     *poutbuf = buf;
     *poutbuf_size = buf_size;
 
-                    /* update codec info */
-                    avctx->sample_rate = s->sample_rate;
-                    /* allow downmixing to stereo (or mono for AC3) */
-                    if(avctx->request_channels > 0 &&
-                            avctx->request_channels < s->channels &&
-                            (avctx->request_channels <= 2 ||
-                            (avctx->request_channels == 1 &&
-                            avctx->codec_id == CODEC_ID_AC3))) {
-                        avctx->channels = avctx->request_channels;
-                    } else {
-                        avctx->channels = s->channels;
-                    }
-                    avctx->bit_rate = s->bit_rate;
-                    avctx->frame_size = s->samples;
+    /* update codec info */
+    avctx->sample_rate = s->sample_rate;
+    if(s->codec_id)
+        avctx->codec_id = s->codec_id;
+
+    /* allow downmixing to stereo (or mono for AC-3) */
+    if(avctx->request_channels > 0 &&
+            avctx->request_channels < s->channels &&
+            (avctx->request_channels <= 2 ||
+            (avctx->request_channels == 1 &&
+            (avctx->codec_id == CODEC_ID_AC3 ||
+             avctx->codec_id == CODEC_ID_EAC3)))) {
+        avctx->channels = avctx->request_channels;
+    } else {
+        if (avctx->codec_id != CODEC_ID_AAC || s->channels) {
+        avctx->channels = s->channels;
+        avctx->channel_layout = s->channel_layout;
+        }
+    }
+    avctx->bit_rate = s->bit_rate;
+    avctx->frame_size = s->samples;
 
     return i;
 }