highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tests: Convert lavf pixfmt conversion tests to non-legacy test scripts

Browse Source 
Also split monolithic lavf-pixfmt test into individual tests.
This commit is contained in:
Diego Biurrun 2018-08-14 11:07:10 +02:00
parent a957e9379d
commit 896fe15dbb
25 changed files with 78 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
tests/Makefile
View File

@ -109,6 +109,7 @@ include $(SRC_PATH)/tests/fate/mpc.mak
include $(SRC_PATH)/tests/fate/mpeg4.mak include $(SRC_PATH)/tests/fate/mpeg4.mak
include $(SRC_PATH)/tests/fate/opus.mak include $(SRC_PATH)/tests/fate/opus.mak
include $(SRC_PATH)/tests/fate/pcm.mak include $(SRC_PATH)/tests/fate/pcm.mak
include $(SRC_PATH)/tests/fate/pixfmt.mak
include $(SRC_PATH)/tests/fate/probe.mak include $(SRC_PATH)/tests/fate/probe.mak
include $(SRC_PATH)/tests/fate/prores.mak include $(SRC_PATH)/tests/fate/prores.mak
include $(SRC_PATH)/tests/fate/qt.mak include $(SRC_PATH)/tests/fate/qt.mak

11
tests/fate-run.sh
View File

@ -223,6 +223,17 @@ lavftest(){
${base}/lavf-regression.sh $t lavf tests/vsynth1 "$target_exec" "$target_path" "$threads" "$thread_type" "$cpuflags" ${base}/lavf-regression.sh $t lavf tests/vsynth1 "$target_exec" "$target_path" "$threads" "$thread_type" "$cpuflags"
} }
pixfmt_conversion(){
conversion="${test#pixfmt-}"
outdir="tests/data/pixfmt"
raw_dst="$outdir/$conversion.out.yuv"
file=${outdir}/${conversion}.yuv
run_avconv $DEC_OPTS -r 1 -f image2 -c:v pgmyuv -i $raw_src \
$ENC_OPTS -f rawvideo -t 1 -s 352x288 -pix_fmt $conversion $target_path/$raw_dst
do_avconv $file $DEC_OPTS -f rawvideo -s 352x288 -pix_fmt $conversion -i $target_path/$raw_dst \
$ENC_OPTS -f rawvideo -s 352x288 -pix_fmt yuv444p
}
video_filter(){ video_filter(){
filters=$1 filters=$1
shift shift

1
tests/fate/avformat.mak
View File

@ -16,7 +16,6 @@ FATE_LAVF-$(call ENCDEC2, MPEG2VIDEO, MP2, MPEGTS) += ts
FATE_LAVF-$(CONFIG_YUV4MPEGPIPE_MUXER) += yuv4mpeg FATE_LAVF-$(CONFIG_YUV4MPEGPIPE_MUXER) += yuv4mpeg
FATE_LAVF += $(FATE_LAVF-yes:%=fate-lavf-%) FATE_LAVF += $(FATE_LAVF-yes:%=fate-lavf-%)
FATE_LAVF += fate-lavf-pixfmt
$(FATE_LAVF): $(AREF) $(VREF) $(FATE_LAVF): $(AREF) $(VREF)
$(FATE_LAVF): CMD = lavftest $(FATE_LAVF): CMD = lavftest

28
tests/fate/pixfmt.mak Normal file
View File

@ -0,0 +1,28 @@
FATE_PIXFMT = bgr24 \
gray \
monob \
monow \
rgb24 \
rgb32 \
rgb555 \
rgb565 \
yuv410p \
yuv411p \
yuv420p \
yuv422p \
yuv440p \
yuv444p \
yuvj420p \
yuvj422p \
yuvj440p \
yuvj444p \
yuyv422 \
FATE_PIXFMT := $(FATE_PIXFMT:%=fate-pixfmt-%)
$(FATE_PIXFMT): CMD = pixfmt_conversion
$(FATE_PIXFMT): REF = $(SRC_PATH)/tests/ref/pixfmt/$(@:fate-pixfmt-%=%)
$(FATE_PIXFMT): $(VREF)
FATE_AVCONV += $(FATE_PIXFMT)
fate-pixfmt: $(FATE_PIXFMT)

16
tests/lavf-regression.sh
View File

@ -95,19 +95,3 @@ file=${outfile}lavf.y4m
do_avconv $file $DEC_OPTS -f image2 -c:v pgmyuv -i $raw_src $ENC_OPTS -t 1 -qscale 10 do_avconv $file $DEC_OPTS -f image2 -c:v pgmyuv -i $raw_src $ENC_OPTS -t 1 -qscale 10
do_avconv_crc $file -i $target_path/$file do_avconv_crc $file -i $target_path/$file
fi fi
# pix_fmt conversions
if [ -n "$do_pixfmt" ] ; then
outfile="$datadir/pixfmt/"
conversions="yuv420p yuv422p yuv444p yuyv422 yuv410p yuv411p yuvj420p \
yuvj422p yuvj444p rgb24 bgr24 rgb32 rgb565 rgb555 gray monow \
monob yuv440p yuvj440p"
for pix_fmt in $conversions ; do
file=${outfile}${pix_fmt}.yuv
run_avconv $DEC_OPTS -r 1 -f image2 -c:v pgmyuv -i $raw_src \
$ENC_OPTS -f rawvideo -t 1 -s 352x288 -pix_fmt $pix_fmt $target_path/$raw_dst
do_avconv $file $DEC_OPTS -f rawvideo -s 352x288 -pix_fmt $pix_fmt -i $target_path/$raw_dst \
$ENC_OPTS -f rawvideo -s 352x288 -pix_fmt yuv444p
done
fi

38
tests/ref/lavf/pixfmt
View File

@ -1,38 +0,0 @@
5641dba168ff665af1cdb4a91e1afdd6 *./tests/data/pixfmt/yuv420p.yuv
304128 ./tests/data/pixfmt/yuv420p.yuv
ac68f9fdd9d55efd0306d9b004038761 *./tests/data/pixfmt/yuv422p.yuv
304128 ./tests/data/pixfmt/yuv422p.yuv
5641dba168ff665af1cdb4a91e1afdd6 *./tests/data/pixfmt/yuv444p.yuv
304128 ./tests/data/pixfmt/yuv444p.yuv
ac68f9fdd9d55efd0306d9b004038761 *./tests/data/pixfmt/yuyv422.yuv
304128 ./tests/data/pixfmt/yuyv422.yuv
507c7e9f0c97660385df977469ca9e6d *./tests/data/pixfmt/yuv410p.yuv
304128 ./tests/data/pixfmt/yuv410p.yuv
8594ea0b8d7c2c964525b0801b5351de *./tests/data/pixfmt/yuv411p.yuv
304128 ./tests/data/pixfmt/yuv411p.yuv
e176bd14185788110e055f945de7f95f *./tests/data/pixfmt/yuvj420p.yuv
304128 ./tests/data/pixfmt/yuvj420p.yuv
472028e46a81c98d9b2477507def4723 *./tests/data/pixfmt/yuvj422p.yuv
304128 ./tests/data/pixfmt/yuvj422p.yuv
c10442da177c9f1d12be3c53be6fa12c *./tests/data/pixfmt/yuvj444p.yuv
304128 ./tests/data/pixfmt/yuvj444p.yuv
c6e0f9b5817f484b175c1ec4ffb4e9c9 *./tests/data/pixfmt/rgb24.yuv
304128 ./tests/data/pixfmt/rgb24.yuv
c6e0f9b5817f484b175c1ec4ffb4e9c9 *./tests/data/pixfmt/bgr24.yuv
304128 ./tests/data/pixfmt/bgr24.yuv
c6e0f9b5817f484b175c1ec4ffb4e9c9 *./tests/data/pixfmt/rgb32.yuv
304128 ./tests/data/pixfmt/rgb32.yuv
66d39d464bd89ded2a124897f0a75ade *./tests/data/pixfmt/rgb565.yuv
304128 ./tests/data/pixfmt/rgb565.yuv
c894c3bd8d2631ed1964500b90a0c350 *./tests/data/pixfmt/rgb555.yuv
304128 ./tests/data/pixfmt/rgb555.yuv
6be306b0cce5f8e6c271ea17fef9745b *./tests/data/pixfmt/gray.yuv
304128 ./tests/data/pixfmt/gray.yuv
31398104d2349dd48328a6862bc6711f *./tests/data/pixfmt/monow.yuv
304128 ./tests/data/pixfmt/monow.yuv
31398104d2349dd48328a6862bc6711f *./tests/data/pixfmt/monob.yuv
304128 ./tests/data/pixfmt/monob.yuv
00b85790df5740bab95e2559d81603a7 *./tests/data/pixfmt/yuv440p.yuv
304128 ./tests/data/pixfmt/yuv440p.yuv
4d8d402c45d913038d4b725396719111 *./tests/data/pixfmt/yuvj440p.yuv
304128 ./tests/data/pixfmt/yuvj440p.yuv

2
tests/ref/pixfmt/bgr24 Normal file
View File

@ -0,0 +1,2 @@
c6e0f9b5817f484b175c1ec4ffb4e9c9 *tests/data/pixfmt/bgr24.yuv
304128 tests/data/pixfmt/bgr24.yuv

2
tests/ref/pixfmt/gray Normal file
View File

@ -0,0 +1,2 @@
6be306b0cce5f8e6c271ea17fef9745b *tests/data/pixfmt/gray.yuv
304128 tests/data/pixfmt/gray.yuv

2
tests/ref/pixfmt/monob Normal file
View File

@ -0,0 +1,2 @@
31398104d2349dd48328a6862bc6711f *tests/data/pixfmt/monob.yuv
304128 tests/data/pixfmt/monob.yuv

2
tests/ref/pixfmt/monow Normal file
View File

@ -0,0 +1,2 @@
31398104d2349dd48328a6862bc6711f *tests/data/pixfmt/monow.yuv
304128 tests/data/pixfmt/monow.yuv

2
tests/ref/pixfmt/rgb24 Normal file
View File

@ -0,0 +1,2 @@
c6e0f9b5817f484b175c1ec4ffb4e9c9 *tests/data/pixfmt/rgb24.yuv
304128 tests/data/pixfmt/rgb24.yuv

2
tests/ref/pixfmt/rgb32 Normal file
View File

@ -0,0 +1,2 @@
c6e0f9b5817f484b175c1ec4ffb4e9c9 *tests/data/pixfmt/rgb32.yuv
304128 tests/data/pixfmt/rgb32.yuv

2
tests/ref/pixfmt/rgb555 Normal file
View File

@ -0,0 +1,2 @@
c894c3bd8d2631ed1964500b90a0c350 *tests/data/pixfmt/rgb555.yuv
304128 tests/data/pixfmt/rgb555.yuv

2
tests/ref/pixfmt/rgb565 Normal file
View File

@ -0,0 +1,2 @@
66d39d464bd89ded2a124897f0a75ade *tests/data/pixfmt/rgb565.yuv
304128 tests/data/pixfmt/rgb565.yuv

2
tests/ref/pixfmt/yuv410p Normal file
View File

@ -0,0 +1,2 @@
507c7e9f0c97660385df977469ca9e6d *tests/data/pixfmt/yuv410p.yuv
304128 tests/data/pixfmt/yuv410p.yuv

2
tests/ref/pixfmt/yuv411p Normal file
View File

@ -0,0 +1,2 @@
8594ea0b8d7c2c964525b0801b5351de *tests/data/pixfmt/yuv411p.yuv
304128 tests/data/pixfmt/yuv411p.yuv

2
tests/ref/pixfmt/yuv420p Normal file
View File

@ -0,0 +1,2 @@
5641dba168ff665af1cdb4a91e1afdd6 *tests/data/pixfmt/yuv420p.yuv
304128 tests/data/pixfmt/yuv420p.yuv

2
tests/ref/pixfmt/yuv422p Normal file
View File

@ -0,0 +1,2 @@
ac68f9fdd9d55efd0306d9b004038761 *tests/data/pixfmt/yuv422p.yuv
304128 tests/data/pixfmt/yuv422p.yuv

2
tests/ref/pixfmt/yuv440p Normal file
View File

@ -0,0 +1,2 @@
00b85790df5740bab95e2559d81603a7 *tests/data/pixfmt/yuv440p.yuv
304128 tests/data/pixfmt/yuv440p.yuv

2
tests/ref/pixfmt/yuv444p Normal file
View File

@ -0,0 +1,2 @@
5641dba168ff665af1cdb4a91e1afdd6 *tests/data/pixfmt/yuv444p.yuv
304128 tests/data/pixfmt/yuv444p.yuv

2
tests/ref/pixfmt/yuvj420p Normal file
View File

@ -0,0 +1,2 @@
e176bd14185788110e055f945de7f95f *tests/data/pixfmt/yuvj420p.yuv
304128 tests/data/pixfmt/yuvj420p.yuv

2
tests/ref/pixfmt/yuvj422p Normal file
View File

@ -0,0 +1,2 @@
472028e46a81c98d9b2477507def4723 *tests/data/pixfmt/yuvj422p.yuv
304128 tests/data/pixfmt/yuvj422p.yuv

2
tests/ref/pixfmt/yuvj440p Normal file
View File

@ -0,0 +1,2 @@
4d8d402c45d913038d4b725396719111 *tests/data/pixfmt/yuvj440p.yuv
304128 tests/data/pixfmt/yuvj440p.yuv

2
tests/ref/pixfmt/yuvj444p Normal file
View File

@ -0,0 +1,2 @@
c10442da177c9f1d12be3c53be6fa12c *tests/data/pixfmt/yuvj444p.yuv
304128 tests/data/pixfmt/yuvj444p.yuv

2
tests/ref/pixfmt/yuyv422 Normal file
View File

@ -0,0 +1,2 @@
ac68f9fdd9d55efd0306d9b004038761 *tests/data/pixfmt/yuyv422.yuv
304128 tests/data/pixfmt/yuyv422.yuv