diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-28 13:34:23 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-28 13:34:23 +0200 |
| commit | 124244ec48c1b733b7ad40eee67ae1a205f0162b (patch) | |
| tree | 008dc0200bf07f47103ba573a247c8e8ba15fc78 /tests/fate | |
| parent | 04001767728fd4ed8b4f9d2ebbb9f9a8c9a7be0d (diff) | |
| parent | b963f021b603509b5159873de4919dec441d0782 (diff) | |
| download | ffmpeg-124244ec48c1b733b7ad40eee67ae1a205f0162b.tar.gz | |
Merge commit 'b963f021b603509b5159873de4919dec441d0782'
* commit 'b963f021b603509b5159873de4919dec441d0782':
fate: Invoke pixfmts 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 | 9 | ||||
| -rw-r--r-- | tests/fate/filter-video.mak | 25 |
2 files changed, 27 insertions, 7 deletions
diff --git a/tests/fate/avfilter.mak b/tests/fate/avfilter.mak index 4c8c26a876..f68bf960c9 100644 --- a/tests/fate/avfilter.mak +++ b/tests/fate/avfilter.mak @@ -1,3 +1,5 @@ +#FIXME the whole file should be removed + FATE_LAVFI = fate-lavfi-alphaextract_rgb \ fate-lavfi-alphaextract_yuv \ fate-lavfi-alphamerge_rgb \ @@ -12,13 +14,6 @@ FATE_LAVFI = fate-lavfi-alphaextract_rgb \ fate-lavfi-overlay_yuv420 \ fate-lavfi-overlay_yuv444 \ fate-lavfi-pad \ - fate-lavfi-pixfmts_copy \ - fate-lavfi-pixfmts_crop \ - fate-lavfi-pixfmts_hflip \ - fate-lavfi-pixfmts_null \ - fate-lavfi-pixfmts_pad \ - fate-lavfi-pixfmts_scale \ - fate-lavfi-pixfmts_vflip \ fate-lavfi-select \ fate-lavfi-setdar \ fate-lavfi-setsar \ diff --git a/tests/fate/filter-video.mak b/tests/fate/filter-video.mak index 75ac03a6b1..f1c0cf4de6 100644 --- a/tests/fate/filter-video.mak +++ b/tests/fate/filter-video.mak @@ -98,6 +98,31 @@ FATE_FILTER_VSYNTH-$(CONFIG_FORMAT_FILTER) += fate-filter-pixdesc fate-filter-pixdesc: CMD = pixdesc +FATE_FILTER_PIXFMTS += fate-filter-pixfmts-copy +fate-filter-pixfmts-copy: CMD = pixfmts + +FATE_FILTER_PIXFMTS += fate-filter-pixfmts-crop +fate-filter-pixfmts-crop: CMD = pixfmts "100:100:100:100" + +FATE_FILTER_PIXFMTS += fate-filter-pixfmts-hflip +fate-filter-pixfmts-hflip: CMD = pixfmts + +FATE_FILTER_PIXFMTS += fate-filter-pixfmts-null +fate-filter-pixfmts-null: CMD = pixfmts + +FATE_FILTER_PIXFMTS += fate-filter-pixfmts-pad +fate-filter-pixfmts-pad: CMD = pixfmts "500:400:20:20" + +FATE_FILTER_PIXFMTS += fate-filter-pixfmts-scale +fate-filter-pixfmts-scale: CMD = pixfmts "200:100" + +FATE_FILTER_PIXFMTS += fate-filter-pixfmts-vflip +fate-filter-pixfmts-vflip: CMD = pixfmts + +$(FATE_FILTER_PIXFMTS): libavfilter/filtfmts-test$(EXESUF) +FATE_FILTER_VSYNTH-$(CONFIG_FORMAT_FILTER) += $(FATE_FILTER_PIXFMTS) + + $(FATE_FILTER_VSYNTH-yes): $(VREF) $(FATE_FILTER_VSYNTH-yes): SRC = $(TARGET_PATH)/tests/vsynth1/%02d.pgm |