diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-28 12:45:31 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-28 13:00:04 +0200 |
| commit | 191430a28f6aba118471c2704e66b2abd1638b94 (patch) | |
| tree | 58665d3e174585ec7ff7ab43f941e260e92e3334 | |
| parent | 506ebdac2a32e3fe27afd2ff40268c851fc1a817 (diff) | |
| parent | 28663511c99b3cdaf9387a15032259879474f5f4 (diff) | |
| download | ffmpeg-191430a28f6aba118471c2704e66b2abd1638b94.tar.gz | |
Merge commit '28663511c99b3cdaf9387a15032259879474f5f4'
* commit '28663511c99b3cdaf9387a15032259879474f5f4':
fate: Invoke pixdesc lavfi tests through fate-run.sh
Conflicts:
tests/fate/avfilter.mak
tests/lavfi-regression.sh
tests/ref/fate/filter-pixdesc
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rwxr-xr-x | tests/fate-run.sh | 8 | ||||
| -rw-r--r-- | tests/fate/avfilter.mak | 1 | ||||
| -rw-r--r-- | tests/fate/filter-video.mak | 4 | ||||
| -rwxr-xr-x | tests/lavfi-regression.sh | 1 | ||||
| -rw-r--r-- | tests/ref/fate/filter-pixdesc (renamed from tests/ref/lavfi/pixfmts_pixdesctest) | 1 |
5 files changed, 12 insertions, 3 deletions
diff --git a/tests/fate-run.sh b/tests/fate-run.sh index a69d2945a2..da4f60eda9 100755 --- a/tests/fate-run.sh +++ b/tests/fate-run.sh @@ -175,6 +175,14 @@ video_filter(){ $FLAGS $ENC_OPTS -vf "$filters" -vcodec rawvideo $* -f nut md5: } +pixdesc(){ + pix_fmts="$(ffmpeg -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" # Disable globbing: command arguments may contain globbing characters and diff --git a/tests/fate/avfilter.mak b/tests/fate/avfilter.mak index a0565b6974..4c8c26a876 100644 --- a/tests/fate/avfilter.mak +++ b/tests/fate/avfilter.mak @@ -17,7 +17,6 @@ FATE_LAVFI = fate-lavfi-alphaextract_rgb \ fate-lavfi-pixfmts_hflip \ fate-lavfi-pixfmts_null \ fate-lavfi-pixfmts_pad \ - fate-lavfi-pixfmts_pixdesctest \ fate-lavfi-pixfmts_scale \ fate-lavfi-pixfmts_vflip \ fate-lavfi-select \ diff --git a/tests/fate/filter-video.mak b/tests/fate/filter-video.mak index 12ca955efa..75ac03a6b1 100644 --- a/tests/fate/filter-video.mak +++ b/tests/fate/filter-video.mak @@ -94,6 +94,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 b4cc220944..9301914ecb 100755 --- a/tests/lavfi-regression.sh +++ b/tests/lavfi-regression.sh @@ -108,7 +108,6 @@ do_lavfi_pixfmts "pixfmts_crop" "crop" "100:100:100:100" do_lavfi_pixfmts "pixfmts_hflip" "hflip" "" do_lavfi_pixfmts "pixfmts_null" "null" "" do_lavfi_pixfmts "pixfmts_pad" "pad" "500:400:20:20" -do_lavfi_pixfmts "pixfmts_pixdesctest" "pixdesctest" do_lavfi_pixfmts "pixfmts_scale" "scale" "200:100" do_lavfi_pixfmts "pixfmts_super2xsai" "super2xsai" do_lavfi_pixfmts "pixfmts_vflip" "vflip" diff --git a/tests/ref/lavfi/pixfmts_pixdesctest b/tests/ref/fate/filter-pixdesc index 05d5e0f735..f8473c132b 100644 --- a/tests/ref/lavfi/pixfmts_pixdesctest +++ b/tests/ref/fate/filter-pixdesc @@ -31,7 +31,6 @@ monob 309b5785a36bd988d17e15d88f4ffad1 monow 8809a02bc69b58d1114b09ca79ebffad nv12 75e90c54d858b993e99f4ee6d2a2a38f nv21 8831a3f411015d45fbc5dd191245ba9c -pal8 13de2a1c3c80cb64d14e2bc4f6f461d0 rgb0 5774780b3c532896300fa326fcde01a8 rgb24 c71ba90f69f15c8275232bb3f62d0ced rgb444be 26eaec65d7efd2b0c9c13b47dfd9b241 |