[FFmpeg-cvslog] mov: Change default aac priming fallback from 2112 to 1024

[Justin Greer]

ffmpeg | branch: master | Justin Greer <justin at zencoder.com> | Tue Aug 21 22:00:55 2012 +0200| [e16fda9236bd6464e61baba31abae7852dceaa90] | committer: Michael Niedermayer

mov: Change default aac priming fallback from 2112 to 1024

This fixes priming for faac

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e16fda9236bd6464e61baba31abae7852dceaa90
---

 libavformat/mov.c  |    2 +-
 tests/fate/aac.mak |   28 ++++++++++++++--------------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/libavformat/mov.c b/libavformat/mov.c
index 8b966b1..256e81f 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -3043,7 +3043,7 @@ static int mov_read_header(AVFormatContext *s)
         MOVStreamContext *sc = st->priv_data;
         if(st->codec->codec_type == AVMEDIA_TYPE_AUDIO && st->codec->codec_id == AV_CODEC_ID_AAC) {
             if(!sc->start_pad)
-                sc->start_pad = 2112;
+                sc->start_pad = 1024;
             st->skip_samples = sc->start_pad;
         }
     }
diff --git a/tests/fate/aac.mak b/tests/fate/aac.mak
index 9934c50..0a075ca 100644
--- a/tests/fate/aac.mak
+++ b/tests/fate/aac.mak
@@ -1,62 +1,62 @@
 FATE_AAC += fate-aac-al04_44
 fate-aac-al04_44: CMD = pcm -i $(SAMPLES)/aac/al04_44.mp4
 fate-aac-al04_44: REF = $(SAMPLES)/aac/al04_44.s16
-fate-aac-al04_44: CMP_SHIFT = 4224
+fate-aac-al04_44: CMP_SHIFT = 2048
 
 FATE_AAC += fate-aac-al05_44
 fate-aac-al05_44: CMD = pcm -i $(SAMPLES)/aac/al05_44.mp4
 fate-aac-al05_44: REF = $(SAMPLES)/aac/al05_44.s16
-fate-aac-al05_44: CMP_SHIFT = 8448
+fate-aac-al05_44: CMP_SHIFT = 4096
 
 FATE_AAC += fate-aac-al06_44
 fate-aac-al06_44: CMD = pcm -i $(SAMPLES)/aac/al06_44.mp4
 fate-aac-al06_44: REF = $(SAMPLES)/aac/al06_44_reorder.s16
-fate-aac-al06_44: CMP_SHIFT = 12672
+fate-aac-al06_44: CMP_SHIFT = 6144
 
 FATE_AAC += fate-aac-al07_96
 fate-aac-al07_96: CMD = pcm -i $(SAMPLES)/aac/al07_96.mp4
 fate-aac-al07_96: REF = $(SAMPLES)/aac/al07_96_reorder.s16
-fate-aac-al07_96: CMP_SHIFT = 25344
+fate-aac-al07_96: CMP_SHIFT = 12288
 
 FATE_AAC += fate-aac-al15_44
 fate-aac-al15_44: CMD = pcm -i $(SAMPLES)/aac/al15_44.mp4
 fate-aac-al15_44: REF = $(SAMPLES)/aac/al15_44_reorder.s16
-fate-aac-al15_44: CMP_SHIFT = 25344
+fate-aac-al15_44: CMP_SHIFT = 12288
 
 FATE_AAC += fate-aac-al17_44
 fate-aac-al17_44: CMD = pcm -i $(SAMPLES)/aac/al17_44.mp4
 fate-aac-al17_44: REF = $(SAMPLES)/aac/al17_44.s16
-fate-aac-al17_44: CMP_SHIFT = 8448
+fate-aac-al17_44: CMP_SHIFT = 4096
 
 FATE_AAC += fate-aac-al18_44
 fate-aac-al18_44: CMD = pcm -i $(SAMPLES)/aac/al18_44.mp4
 fate-aac-al18_44: REF = $(SAMPLES)/aac/al18_44.s16
-fate-aac-al18_44: CMP_SHIFT = 4224
+fate-aac-al18_44: CMP_SHIFT = 2048
 
 FATE_AAC += fate-aac-am00_88
 fate-aac-am00_88: CMD = pcm -i $(SAMPLES)/aac/am00_88.mp4
 fate-aac-am00_88: REF = $(SAMPLES)/aac/am00_88.s16
-fate-aac-am00_88: CMP_SHIFT = 4224
+fate-aac-am00_88: CMP_SHIFT = 2048
 
 FATE_AAC += fate-aac-am05_44
 fate-aac-am05_44: CMD = pcm -i $(SAMPLES)/aac/am05_44.mp4
 fate-aac-am05_44: REF = $(SAMPLES)/aac/am05_44_reorder.s16
-fate-aac-am05_44: CMP_SHIFT = 25344
+fate-aac-am05_44: CMP_SHIFT = 12288
 
 FATE_AAC += fate-aac-al_sbr_hq_cm_48_2
 fate-aac-al_sbr_hq_cm_48_2: CMD = pcm -i $(SAMPLES)/aac/al_sbr_cm_48_2.mp4
 fate-aac-al_sbr_hq_cm_48_2: REF = $(SAMPLES)/aac/al_sbr_hq_cm_48_2.s16
-fate-aac-al_sbr_hq_cm_48_2: CMP_SHIFT = 8448
+fate-aac-al_sbr_hq_cm_48_2: CMP_SHIFT = 4096
 
 FATE_AAC += fate-aac-al_sbr_hq_cm_48_5.1
 fate-aac-al_sbr_hq_cm_48_5.1: CMD = pcm -i $(SAMPLES)/aac/al_sbr_cm_48_5.1.mp4
 fate-aac-al_sbr_hq_cm_48_5.1: REF = $(SAMPLES)/aac/al_sbr_hq_cm_48_5.1_reorder.s16
-fate-aac-al_sbr_hq_cm_48_5.1: CMP_SHIFT = 25344
+fate-aac-al_sbr_hq_cm_48_5.1: CMP_SHIFT = 12288
 
 FATE_AAC += fate-aac-al_sbr_ps_06_ur
 fate-aac-al_sbr_ps_06_ur: CMD = pcm -i $(SAMPLES)/aac/al_sbr_ps_06_new.mp4
 fate-aac-al_sbr_ps_06_ur: REF = $(SAMPLES)/aac/al_sbr_ps_06_ur.s16
-fate-aac-al_sbr_ps_06_ur: CMP_SHIFT = 8448
+fate-aac-al_sbr_ps_06_ur: CMP_SHIFT = 4096
 
 FATE_AAC += fate-aac-latm_000000001180bc60
 fate-aac-latm_000000001180bc60: CMD = pcm -i $(SAMPLES)/aac/latm_000000001180bc60.mpg
@@ -65,7 +65,7 @@ fate-aac-latm_000000001180bc60: REF = $(SAMPLES)/aac/latm_000000001180bc60.s16
 FATE_AAC += fate-aac-ap05_48
 fate-aac-ap05_48: CMD = pcm -i $(SAMPLES)/aac/ap05_48.mp4
 fate-aac-ap05_48: REF = $(SAMPLES)/aac/ap05_48.s16
-fate-aac-ap05_48: CMP_SHIFT = 8448
+fate-aac-ap05_48: CMP_SHIFT = 4096
 
 FATE_AAC += fate-aac-latm_stereo_to_51
 fate-aac-latm_stereo_to_51: CMD = pcm -i $(SAMPLES)/aac/latm_stereo_to_51.ts -channel_layout 5.1
@@ -73,7 +73,7 @@ fate-aac-latm_stereo_to_51: REF = $(SAMPLES)/aac/latm_stereo_to_51_ref.s16
 
 fate-aac-ct%: CMD = pcm -i $(SAMPLES)/aac/CT_DecoderCheck/$(@:fate-aac-ct-%=%)
 fate-aac-ct%: REF = $(SAMPLES)/aac/CT_DecoderCheck/aacPlusv2.wav
-fate-aac-ct%: CMP_SHIFT = 8448
+fate-aac-ct%: CMP_SHIFT = 4096
 fate-aac-ct-sbr_i-ps_i.aac: CMP_SHIFT = 0
 
 FATE_AAC_CT = sbr_bc-ps_i.3gp  \