Mercurial > libavcodec.hg

changeset 11356:9056fd765255 libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
AAC parser: Don't write channels, sample rate, and frame size each frame. Thanks to backwards compatible HE-AAC signalling these values are unreliable.
author alexc
date Thu, 04 Mar 2010 02:30:51 +0000
parents 3f7b7e3695c0
children 3b06c3d9e72d
files aac_ac3_parser.c
diffstat 1 files changed, 11 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/aac_ac3_parser.c	Thu Mar 04 02:00:05 2010 +0000
+++ b/aac_ac3_parser.c	Thu Mar 04 02:30:51 2010 +0000
@@ -71,10 +71,16 @@
     *poutbuf_size = buf_size;
 
     /* update codec info */
-    avctx->sample_rate = s->sample_rate;
     if(s->codec_id)
         avctx->codec_id = s->codec_id;
 
+    /* Due to backwards compatible HE-AAC the sample rate, channel count,
+       and total number of samples found in an AAC ADTS header are not
+       reliable. Bit rate is still accurate because the total frame duration in
+       seconds is still correct (as is the number of bits in the frame). */
+    if (avctx->codec_id != CODEC_ID_AAC) {
+        avctx->sample_rate = s->sample_rate;
+
     /* allow downmixing to stereo (or mono for AC-3) */
     if(avctx->request_channels > 0 &&
             avctx->request_channels < s->channels &&
@@ -83,12 +89,14 @@
             (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) {
+    } else {
         avctx->channels = s->channels;
         avctx->channel_layout = s->channel_layout;
     }
+    avctx->frame_size = s->samples;
+    }
+
     avctx->bit_rate = s->bit_rate;
-    avctx->frame_size = s->samples;
 
     return i;
 }