Merge commit 'b318106fae65149356934fc72feafef3272fd4ea'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 4 Jan 2014 01:40:32 +0000 (02:40 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 4 Jan 2014 01:47:34 +0000 (02:47 +0100)
* commit 'b318106fae65149356934fc72feafef3272fd4ea':
  FATE: add a test for the lavr mixing case fixed in fc6a3ef40d34ce8443ae57c2452f3f273d7d4891

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
tests/fate/libavresample.mak

@@@ -18,9 -18,16 +18,16 @@@ $(call CROSS_TEST,$(MIX_CHANNELS),MIX,q
  $(call CROSS_TEST,$(MIX_CHANNELS),MIX,q15,s16p)
  $(call CROSS_TEST,$(MIX_CHANNELS),MIX,flt,fltp)
  
 -fate-lavr-mix-output-zero: CMD = avconv -i $(TARGET_PATH)/tests/data/asynth-44100-4.wav -filter_script $(TARGET_PATH)/tests/data/filtergraphs/lavr_mix_output_zero -f s16le -
+ # test output zeroing with skipped corresponding input
+ FATE_LAVR_MIX-$(call FILTERDEMDECENCMUX, CHANNELMAP RESAMPLE, WAV, PCM_S16LE, PCM_S16LE, WAV) += fate-lavr-mix-output-zero
+ fate-lavr-mix-output-zero: tests/data/filtergraphs/lavr_mix_output_zero tests/data/asynth-44100-4.wav
+ fate-lavr-mix-output-zero: CMP = oneoff
++fate-lavr-mix-output-zero: CMD = ffmpeg -i $(TARGET_PATH)/tests/data/asynth-44100-4.wav -filter_script $(TARGET_PATH)/tests/data/filtergraphs/lavr_mix_output_zero -f s16le -
+ fate-lavr-mix-output-zero: REF = $(SAMPLES)/lavr/lavr-mix-output-zero
  FATE_LAVR_MIX-$(call FILTERDEMDECENCMUX, RESAMPLE, WAV, PCM_S16LE, PCM_S16LE, WAV) += $(FATE_LAVR_MIX)
  fate-lavr-mix: $(FATE_LAVR_MIX-yes)
 -FATE_LAVR += $(FATE_LAVR_MIX-yes)
 +#FATE_LAVR += $(FATE_LAVR_MIX-yes)
  
  SAMPLERATES = 2626 8000 44100 48000 96000