Traneptora/FFmpeg
1
Fork 0
forked from FFmpeg/FFmpeg
Code Pull requests Activity

Merge commit '28663511c99b3cdaf9387a15032259879474f5f4'

Browse source 
* 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>
This commit is contained in:
Michael Niedermayer 2013-04-28 12:45:31 +02:00
commit 191430a28f
5 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
tests/fate-run.sh
View file

@ -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

1
tests/fate/avfilter.mak
View file

@ -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 \

4
tests/fate/filter-video.mak
View file

@ -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

1
tests/lavfi-regression.sh
View file

@ -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"

1
tests/ref/lavfi/pixfmts_pixdesctest → tests/ref/fate/filter-pixdesc
View file

@ -31,7 +31,6 @@ monob 309b5785a36bd988d17e15d88f4ffad1
monow 8809a02bc69b58d1114b09ca79ebffad
nv12 75e90c54d858b993e99f4ee6d2a2a38f
nv21 8831a3f411015d45fbc5dd191245ba9c
pal8 13de2a1c3c80cb64d14e2bc4f6f461d0
rgb0 5774780b3c532896300fa326fcde01a8
rgb24 c71ba90f69f15c8275232bb3f62d0ced
rgb444be 26eaec65d7efd2b0c9c13b47dfd9b241