diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-01-04 02:40:32 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-01-04 02:47:34 +0100 |
| commit | ad5e4e0f947ab686325fc7783afd18cd9cd88dc4 (patch) | |
| tree | d0b15c19897c45fb730a7d875ddc342e5a65190a /tests | |
| parent | cf867517f15bb5c9618dea6e546592622c0773a5 (diff) | |
| parent | b318106fae65149356934fc72feafef3272fd4ea (diff) | |
Merge commit 'b318106fae65149356934fc72feafef3272fd4ea'
* commit 'b318106fae65149356934fc72feafef3272fd4ea':
FATE: add a test for the lavr mixing case fixed in fc6a3ef40d34ce8443ae57c2452f3f273d7d4891
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/fate/libavresample.mak | 7 | ||||
| -rw-r--r-- | tests/filtergraphs/lavr_mix_output_zero | 1 |
2 files changed, 8 insertions, 0 deletions
diff --git a/tests/fate/libavresample.mak b/tests/fate/libavresample.mak index d7c856ba43..bd4518e7b2 100644 --- a/tests/fate/libavresample.mak +++ b/tests/fate/libavresample.mak @@ -18,6 +18,13 @@ $(call CROSS_TEST,$(MIX_CHANNELS),MIX,q8,s16p) $(call CROSS_TEST,$(MIX_CHANNELS),MIX,q15,s16p) $(call CROSS_TEST,$(MIX_CHANNELS),MIX,flt,fltp) +# 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) diff --git a/tests/filtergraphs/lavr_mix_output_zero b/tests/filtergraphs/lavr_mix_output_zero new file mode 100644 index 0000000000..b745f174ee --- /dev/null +++ b/tests/filtergraphs/lavr_mix_output_zero @@ -0,0 +1 @@ +atrim=end_sample=1024,channelmap=channel_layout=FL|FR|LFE|BC,aformat=channel_layouts=3.0 |