Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 24 Mar 2012 09:59:43 +0000 (10:59 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 24 Mar 2012 09:59:43 +0000 (10:59 +0100)
* qatar/master:
  rv34: error out on size changes with frame threading
  aacsbr: Add a debug check to sbr_mapping.
  aac: Reset some state variables when turning SBR off
  aac: Reset PS parameters on header decode failure.
  fate: add wmalossless test.
  aacsbr: handle m_max values smaller than 4.

Conflicts:
libavcodec/aacsbr.c
tests/fate/lossless-audio.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/aacps.c
libavcodec/aacsbr.c
libavcodec/rv34.c
libavcodec/sbr.h
libavcodec/x86/sbrdsp.asm
tests/fate/lossless-audio.mak

Simple merge
@@@ -132,10 -141,8 +143,10 @@@ static void sbr_turnoff(SpectralBandRep
  av_cold void ff_aac_sbr_ctx_init(AACContext *ac, SpectralBandReplication *sbr)
  {
      float mdct_scale;
-     sbr->kx[0] = sbr->kx[1] = 32; //Typo in spec, kx' inits to 32
-     sbr->data[0].e_a[1] = sbr->data[1].e_a[1] = -1;
 +    if(sbr->mdct.mdct_bits)
 +        return;
+     sbr->kx[0] = sbr->kx[1];
+     sbr_turnoff(sbr);
      sbr->data[0].synthesis_filterbank_samples_offset = SBR_SYNTHESIS_BUF_SIZE - (1280 - 128);
      sbr->data[1].synthesis_filterbank_samples_offset = SBR_SYNTHESIS_BUF_SIZE - (1280 - 128);
      /* SBR requires samples to be scaled to +/-32768.0 to work correctly.
Simple merge
Simple merge
Simple merge
@@@ -1,18 -1,17 +1,21 @@@
 -FATE_TESTS += fate-lossless-alac
 +FATE_LOSSLESS_AUDIO += fate-lossless-alac
  fate-lossless-alac: CMD = md5 -i $(SAMPLES)/lossless-audio/inside.m4a -f s16le
  
 -FATE_TESTS += fate-lossless-meridianaudio
 +FATE_LOSSLESS_AUDIO += fate-lossless-meridianaudio
  fate-lossless-meridianaudio: CMD = md5 -i $(SAMPLES)/lossless-audio/luckynight-partial.mlp -f s16le
  
 -FATE_TESTS += fate-lossless-monkeysaudio
 +FATE_LOSSLESS_AUDIO += fate-lossless-monkeysaudio
  fate-lossless-monkeysaudio: CMD = md5 -i $(SAMPLES)/lossless-audio/luckynight-partial.ape -f s16le
  
 -FATE_TESTS += fate-lossless-shorten
 +FATE_LOSSLESS_AUDIO += fate-lossless-shorten
  fate-lossless-shorten: CMD = md5 -i $(SAMPLES)/lossless-audio/luckynight-partial.shn -f s16le
  
 -FATE_TESTS += fate-lossless-tta
 +FATE_LOSSLESS_AUDIO += fate-lossless-tta
  fate-lossless-tta: CMD = crc -i $(SAMPLES)/lossless-audio/inside.tta
  
 -FATE_TESTS += fate-lossless-wma
++FATE_LOSSLESS_AUDIO += fate-lossless-wma
+ fate-lossless-wma: CMD = md5 -i $(SAMPLES)/lossless-audio/luckynight-partial.wma -f s16le
++
 +FATE_TESTS += $(FATE_LOSSLESS_AUDIO)
 +fate-lossless-audio: $(FATE_LOSSLESS_AUDIO)
 +