diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-28 15:02:49 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-28 15:02:49 +0100 |
| commit | 37bdf33cffd2f3bb4d4c07ef38a5649fd980639f (patch) | |
| tree | 96bdfdb1b4e0df53aeaf05a4d5d410f4cb54f457 /tests/fate | |
| parent | acaee26008c157811414fbcfd9bf5859dc71dfe2 (diff) | |
| parent | 0afcf97e1ece51d29bb791698b00cd1b7ba97dcf (diff) | |
| download | ffmpeg-37bdf33cffd2f3bb4d4c07ef38a5649fd980639f.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
vmdav: convert to bytestream2
FATE: add a test for the join filter
FATE: add a test for the volume filter
Conflicts:
libavcodec/vmdav.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/fate')
| -rw-r--r-- | tests/fate/filter.mak | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/tests/fate/filter.mak b/tests/fate/filter.mak index 96d84cacac..9b0472cdfb 100644 --- a/tests/fate/filter.mak +++ b/tests/fate/filter.mak @@ -69,6 +69,14 @@ fate-filter-gradfun: CMD = framecrc -c:v pgmyuv -i $(SRC) -vf gradfun FATE_FILTER_VSYNTH-$(CONFIG_HQDN3D_FILTER) += fate-filter-hqdn3d fate-filter-hqdn3d: CMD = framecrc -c:v pgmyuv -i $(SRC) -vf hqdn3d +FATE_FILTER-$(call FILTERDEMDECENCMUX, JOIN, WAV, PCM_S16LE, PCM_S16LE, PCM_S16LE) += fate-filter-join +fate-filter-join: SRC1 = $(TARGET_PATH)/tests/data/asynth-44100-2.wav +fate-filter-join: SRC2 = $(TARGET_PATH)/tests/data/asynth-44100-3.wav +fate-filter-join: tests/data/asynth-44100-2.wav tests/data/asynth-44100-3.wav +fate-filter-join: CMD = md5 -i $(SRC1) -i $(SRC2) -filter_complex join=channel_layout=5 -f s16le +fate-filter-join: CMP = oneline +fate-filter-join: REF = 38fa1b18b0c46d77df6f17bfc4f078dd + FATE_FILTER_VSYNTH-$(CONFIG_NEGATE_FILTER) += fate-filter-negate fate-filter-negate: CMD = framecrc -c:v pgmyuv -i $(SRC) -vf negate @@ -84,6 +92,13 @@ fate-filter-transpose: CMD = framecrc -c:v pgmyuv -i $(SRC) -vf transpose FATE_FILTER_VSYNTH-$(CONFIG_UNSHARP_FILTER) += fate-filter-unsharp fate-filter-unsharp: CMD = framecrc -c:v pgmyuv -i $(SRC) -vf unsharp +FATE_FILTER-$(call FILTERDEMDECENCMUX, VOLUME, WAV, PCM_S16LE, PCM_S16LE, PCM_S16LE) += fate-filter-volume +fate-filter-volume: SRC = $(TARGET_PATH)/tests/data/asynth-44100-2.wav +fate-filter-volume: tests/data/asynth-44100-2.wav +fate-filter-volume: CMD = md5 -i $(SRC) -af volume=precision=fixed:volume=0.5 -f s16le +fate-filter-volume: CMP = oneline +fate-filter-volume: REF = 4d6ba75ef3e32d305d066b9bc771d6f4 + FATE_YADIF += fate-filter-yadif-mode0 fate-filter-yadif-mode0: CMD = framecrc -flags bitexact -idct simple -i $(SAMPLES)/mpeg2/mpeg2_field_encoding.ts -vframes 30 -vf yadif=0 |