diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-19 23:34:58 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-19 23:34:58 +0200 |
| commit | 8f116bf71b2349bc3a8de08ef25c2b74f972db26 (patch) | |
| tree | 81f892e1c2f6e34a65e8f64abf0ca7c963b0f70a | |
| parent | e07e8882ae92b3328ca3ae97b494e5c2158256dd (diff) | |
| parent | bc7fbd36ea855339b6a12bf02a55b0bec7bba14f (diff) | |
| download | ffmpeg-8f116bf71b2349bc3a8de08ef25c2b74f972db26.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
fate: cosmetics: More sensible order for entries in video filter file
Conflicts:
tests/fate/filter-video.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | tests/fate/filter-video.mak | 28 |
1 files changed, 15 insertions, 13 deletions
diff --git a/tests/fate/filter-video.mak b/tests/fate/filter-video.mak index e6e0ac546c..cc83d8bb1e 100644 --- a/tests/fate/filter-video.mak +++ b/tests/fate/filter-video.mak @@ -1,9 +1,20 @@ -FATE_FILTER_VSYNTH-$(CONFIG_BOXBLUR_FILTER) += fate-filter-boxblur -fate-filter-boxblur: CMD = framecrc -c:v pgmyuv -i $(SRC) -vf boxblur=2:1 - FATE_FILTER-$(call ALLYES, PERMS_FILTER DELOGO_FILTER RM_DEMUXER RV30_DECODER) += fate-filter-delogo fate-filter-delogo: CMD = framecrc -i $(SAMPLES)/real/rv30.rm -vf perms=random,delogo=show=0:x=290:y=25:w=26:h=16 -an +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 + +FATE_YADIF += fate-filter-yadif-mode1 +fate-filter-yadif-mode1: CMD = framecrc -flags bitexact -idct simple -i $(SAMPLES)/mpeg2/mpeg2_field_encoding.ts -vframes 59 -vf yadif=1 + +FATE_FILTER-$(call FILTERDEMDEC, YADIF, MPEGTS, MPEG2VIDEO) += $(FATE_YADIF) + +FATE_SAMPLES_AVCONV += $(FATE_FILTER-yes) + + +FATE_FILTER_VSYNTH-$(CONFIG_BOXBLUR_FILTER) += fate-filter-boxblur +fate-filter-boxblur: CMD = framecrc -c:v pgmyuv -i $(SRC) -vf boxblur=2:1 + FATE_FILTER_VSYNTH-$(CONFIG_DRAWBOX_FILTER) += fate-filter-drawbox fate-filter-drawbox: CMD = framecrc -c:v pgmyuv -i $(SRC) -vf drawbox=10:20:200:60:red@0.5 @@ -40,14 +51,6 @@ 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_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 - -FATE_YADIF += fate-filter-yadif-mode1 -fate-filter-yadif-mode1: CMD = framecrc -flags bitexact -idct simple -i $(SAMPLES)/mpeg2/mpeg2_field_encoding.ts -vframes 59 -vf yadif=1 - -FATE_FILTER-$(call FILTERDEMDEC, YADIF, MPEGTS, MPEG2VIDEO) += $(FATE_YADIF) - FATE_FILTER-$(call ALLYES, SMJPEG_DEMUXER MJPEG_DECODER PERMS_FILTER HQDN3D_FILTER) += fate-filter-hqdn3d-sample fate-filter-hqdn3d-sample: CMD = framecrc -idct simple -i $(SAMPLES)/smjpeg/scenwin.mjpg -vf perms=random,hqdn3d -an @@ -62,9 +65,8 @@ fate-filter-concat: CMD = framecrc -filter_complex_script $(SRC_PATH)/tests/filt $(FATE_FILTER_VSYNTH-yes): $(VREF) $(FATE_FILTER_VSYNTH-yes): SRC = $(TARGET_PATH)/tests/vsynth1/%02d.pgm -FATE_AVCONV-$(call DEMDEC, IMAGE2, PGMYUV) += $(FATE_FILTER_VSYNTH-yes) -FATE_SAMPLES_AVCONV += $(FATE_FILTER-yes) +FATE_AVCONV-$(call DEMDEC, IMAGE2, PGMYUV) += $(FATE_FILTER_VSYNTH-yes) # # Metadata tests |