diff options
| author | Diego Biurrun <diego@biurrun.de> | 2013-04-16 00:15:15 +0200 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2013-04-27 16:53:42 +0200 |
| commit | 28663511c99b3cdaf9387a15032259879474f5f4 (patch) | |
| tree | 1773d4fb414336bfdcf6d3956e33fe0606c129a4 /tests | |
| parent | 03b052c023e1f58d879cb7eeb6421ed39262d39d (diff) | |
| download | ffmpeg-28663511c99b3cdaf9387a15032259879474f5f4.tar.gz | |
fate: Invoke pixdesc lavfi tests through fate-run.sh
Diffstat (limited to 'tests')
| -rwxr-xr-x | tests/fate-run.sh | 8 | ||||
| -rw-r--r-- | tests/fate/avfilter.mak | 3 | ||||
| -rw-r--r-- | tests/fate/filter-video.mak | 4 | ||||
| -rwxr-xr-x | tests/lavfi-regression.sh | 7 | ||||
| -rw-r--r-- | tests/ref/fate/filter-pixdesc (renamed from tests/ref/lavfi/pixdesc) | 0 |
5 files changed, 13 insertions, 9 deletions
diff --git a/tests/fate-run.sh b/tests/fate-run.sh index 72554ad988..6e30b5afe5 100755 --- a/tests/fate-run.sh +++ b/tests/fate-run.sh @@ -171,6 +171,14 @@ video_filter(){ $FLAGS $ENC_OPTS -vf "$filters" -vcodec rawvideo $* -f nut md5: } +pixdesc(){ + pix_fmts="$(avconv -pix_fmts list 2>/dev/null | awk 'NR > 8 && /^IO/ { print $2 }' | sort)" + for pix_fmt in $pix_fmts; do + test=$pix_fmt + video_filter "format=$pix_fmt,pixdesctest" -pix_fmt $pix_fmt + done +} + mkdir -p "$outdir" exec 3>&2 diff --git a/tests/fate/avfilter.mak b/tests/fate/avfilter.mak index e31f449c16..edca861c7e 100644 --- a/tests/fate/avfilter.mak +++ b/tests/fate/avfilter.mak @@ -1,5 +1,4 @@ -FATE_LAVFI = fate-lavfi-pixdesc \ - fate-lavfi-pixfmts_copy \ +FATE_LAVFI = fate-lavfi-pixfmts_copy \ fate-lavfi-pixfmts_crop \ fate-lavfi-pixfmts_hflip \ fate-lavfi-pixfmts_null \ diff --git a/tests/fate/filter-video.mak b/tests/fate/filter-video.mak index 736b99f2fb..5238aade38 100644 --- a/tests/fate/filter-video.mak +++ b/tests/fate/filter-video.mak @@ -77,6 +77,10 @@ FATE_FILTER_VSYNTH-$(CONFIG_VFLIP_FILTER) += fate-filter-vflip_vflip fate-filter-vflip_vflip: CMD = video_filter "vflip,vflip" +FATE_FILTER_VSYNTH-$(CONFIG_FORMAT_FILTER) += fate-filter-pixdesc +fate-filter-pixdesc: CMD = pixdesc + + $(FATE_FILTER_VSYNTH-yes): $(VREF) $(FATE_FILTER_VSYNTH-yes): SRC = $(TARGET_PATH)/tests/vsynth1/%02d.pgm diff --git a/tests/lavfi-regression.sh b/tests/lavfi-regression.sh index f2fc75212c..588a53f69e 100755 --- a/tests/lavfi-regression.sh +++ b/tests/lavfi-regression.sh @@ -50,13 +50,6 @@ do_lavfi_pixfmts "pad" "500:400:20:20" do_lavfi_pixfmts "scale" "200:100" do_lavfi_pixfmts "vflip" "" -if [ -n "$do_pixdesc" ]; then - pix_fmts="$($avconv -pix_fmts list 2>/dev/null | awk 'NR > 8 && /^IO/ { print $2 }' | sort)" - for pix_fmt in $pix_fmts; do - do_video_filter $pix_fmt "format=$pix_fmt,pixdesctest" -pix_fmt $pix_fmt - done -fi - # TODO: add tests for # direct rendering, # chains with feedback loops diff --git a/tests/ref/lavfi/pixdesc b/tests/ref/fate/filter-pixdesc index 23452aed2a..23452aed2a 100644 --- a/tests/ref/lavfi/pixdesc +++ b/tests/ref/fate/filter-pixdesc |