diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-28 12:29:06 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-28 12:34:55 +0200 |
| commit | 506ebdac2a32e3fe27afd2ff40268c851fc1a817 (patch) | |
| tree | 5ca9861a5459a5f158ce104def62d1f9d2648752 /tests/fate | |
| parent | 2ac6d6b7cdd48b21f021221fec186d1ab424994a (diff) | |
| parent | 03b052c023e1f58d879cb7eeb6421ed39262d39d (diff) | |
| download | ffmpeg-506ebdac2a32e3fe27afd2ff40268c851fc1a817.tar.gz | |
Merge commit '03b052c023e1f58d879cb7eeb6421ed39262d39d'
* commit '03b052c023e1f58d879cb7eeb6421ed39262d39d':
fate: Invoke standard lavfi tests through fate-run.sh
Conflicts:
tests/fate/avfilter.mak
tests/lavfi-regression.sh
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/fate')
| -rw-r--r-- | tests/fate/avfilter.mak | 10 | ||||
| -rw-r--r-- | tests/fate/filter-video.mak | 31 |
2 files changed, 31 insertions, 10 deletions
diff --git a/tests/fate/avfilter.mak b/tests/fate/avfilter.mak index d68757de87..a0565b6974 100644 --- a/tests/fate/avfilter.mak +++ b/tests/fate/avfilter.mak @@ -2,17 +2,12 @@ FATE_LAVFI = fate-lavfi-alphaextract_rgb \ fate-lavfi-alphaextract_yuv \ fate-lavfi-alphamerge_rgb \ fate-lavfi-alphamerge_yuv \ - fate-lavfi-crop \ - fate-lavfi-crop_scale \ - fate-lavfi-crop_scale_vflip \ - fate-lavfi-crop_vflip \ fate-lavfi-drawbox \ fate-lavfi-edgedetect \ fate-lavfi-fade \ fate-lavfi-field \ fate-lavfi-idet \ fate-lavfi-il \ - fate-lavfi-null \ fate-lavfi-overlay_rgb \ fate-lavfi-overlay_yuv420 \ fate-lavfi-overlay_yuv444 \ @@ -25,8 +20,6 @@ FATE_LAVFI = fate-lavfi-alphaextract_rgb \ fate-lavfi-pixfmts_pixdesctest \ fate-lavfi-pixfmts_scale \ fate-lavfi-pixfmts_vflip \ - fate-lavfi-scale200 \ - fate-lavfi-scale500 \ fate-lavfi-select \ fate-lavfi-setdar \ fate-lavfi-setsar \ @@ -34,9 +27,6 @@ FATE_LAVFI = fate-lavfi-alphaextract_rgb \ fate-lavfi-tile \ fate-lavfi-transpose \ fate-lavfi-unsharp \ - fate-lavfi-vflip \ - fate-lavfi-vflip_crop \ - fate-lavfi-vflip_vflip \ FATE_LAVFI-$(CONFIG_AVDEVICE) += fate-lavfi-life \ fate-lavfi-scalenorm \ diff --git a/tests/fate/filter-video.mak b/tests/fate/filter-video.mak index cc83d8bb1e..12ca955efa 100644 --- a/tests/fate/filter-video.mak +++ b/tests/fate/filter-video.mak @@ -63,6 +63,37 @@ fate-filter-gradfun-sample: CMD = framecrc -i $(SAMPLES)/vmd/12.vmd -filter_scri FATE_FILTER-$(call ALLYES, TESTSRC_FILTER SINE_FILTER CONCAT_FILTER) += fate-filter-concat fate-filter-concat: CMD = framecrc -filter_complex_script $(SRC_PATH)/tests/filtergraphs/concat +FATE_FILTER_VSYNTH-$(CONFIG_CROP_FILTER) += fate-filter-crop +fate-filter-crop: CMD = video_filter "crop=iw-100:ih-100:100:100" + +FATE_FILTER_VSYNTH-$(call ALLYES, CROP_FILTER SCALE_FILTER) += fate-filter-crop_scale +fate-filter-crop_scale: CMD = video_filter "crop=iw-100:ih-100:100:100,scale=400:-1" + +FATE_FILTER_VSYNTH-$(call ALLYES, CROP_FILTER SCALE_FILTER VFLIP_FILTER) += fate-filter-crop_scale_vflip +fate-filter-crop_scale_vflip: CMD = video_filter "null,null,crop=iw-200:ih-200:200:200,crop=iw-20:ih-20:20:20,scale=200:200,scale=250:250,vflip,vflip,null,scale=200:200,crop=iw-100:ih-100:100:100,vflip,scale=200:200,null,vflip,crop=iw-100:ih-100:100:100,null" + +FATE_FILTER_VSYNTH-$(call ALLYES, CROP_FILTER VFLIP_FILTER) += fate-filter-crop_vflip +fate-filter-crop_vflip: CMD = video_filter "crop=iw-100:ih-100:100:100,vflip" + +FATE_FILTER_VSYNTH-$(CONFIG_NULL_FILTER) += fate-filter-null +fate-filter-null: CMD = video_filter "null" + +FATE_FILTER_VSYNTH-$(CONFIG_SCALE_FILTER) += fate-filter-scale200 +fate-filter-scale200: CMD = video_filter "scale=200:200" + +FATE_FILTER_VSYNTH-$(CONFIG_SCALE_FILTER) += fate-filter-scale500 +fate-filter-scale500: CMD = video_filter "scale=500:500" + +FATE_FILTER_VSYNTH-$(CONFIG_VFLIP_FILTER) += fate-filter-vflip +fate-filter-vflip: CMD = video_filter "vflip" + +FATE_FILTER_VSYNTH-$(call ALLYES, CROP_FILTER VFLIP_FILTER) += fate-filter-vflip_crop +fate-filter-vflip_crop: CMD = video_filter "vflip,crop=iw-100:ih-100:100:100" + +FATE_FILTER_VSYNTH-$(CONFIG_VFLIP_FILTER) += fate-filter-vflip_vflip +fate-filter-vflip_vflip: CMD = video_filter "vflip,vflip" + + $(FATE_FILTER_VSYNTH-yes): $(VREF) $(FATE_FILTER_VSYNTH-yes): SRC = $(TARGET_PATH)/tests/vsynth1/%02d.pgm |