RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge commit '896fe15dbb7b78de495c4a7dd75e7faec66778da' 

* commit '896fe15dbb7b78de495c4a7dd75e7faec66778da':
  tests: Convert lavf pixfmt conversion tests to non-legacy test scripts

Merged-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer 2019-03-14 14:31:48 -03:00
parent c2631dfd0a 896fe15dbb
commit ace96d2e69
25 changed files with 78 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
tests/Makefile
View File

@ -161,6 +161,7 @@ include $(SRC_PATH)/tests/fate/mpegts.mak
include $(SRC_PATH)/tests/fate/mxf.mak
include $(SRC_PATH)/tests/fate/opus.mak
include $(SRC_PATH)/tests/fate/pcm.mak
include $(SRC_PATH)/tests/fate/pixfmt.mak
include $(SRC_PATH)/tests/fate/pixlet.mak
include $(SRC_PATH)/tests/fate/probe.mak
include $(SRC_PATH)/tests/fate/prores.mak

11
tests/fate-run.sh
View File

@ -331,6 +331,17 @@ refcmp_metadata(){
-f null /dev/null | awk -v ref=${ref} -v fuzz=${fuzz} -f ${base}/refcmp-metadata.awk -
}
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(){
filters=$1
shift

2
tests/fate/avformat.mak
View File

@ -25,8 +25,6 @@ FATE_LAVF-$(call ENCDEC, MP2, WTV) += wtv
FATE_LAVF-$(CONFIG_YUV4MPEGPIPE_MUXER) += yuv4mpeg
FATE_LAVF += $(FATE_LAVF-yes:%=fate-lavf-%)
FATE_LAVF_PIXFMT-$(CONFIG_SCALE_FILTER) += fate-lavf-pixfmt
FATE_LAVF += $(FATE_LAVF_PIXFMT-yes)
$(FATE_LAVF): $(AREF) $(VREF)
$(FATE_LAVF): CMD = lavftest

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

@ -0,0 +1,28 @@
FATE_PIXFMT-$(CONFIG_SCALE_FILTER) = bgr24 \
gray \
monob \
monow \
rgb24 \
rgb32 \
rgb555 \
rgb565 \
yuv410p \
yuv411p \
yuv420p \
yuv422p \
yuv440p \
yuv444p \
yuvj420p \
yuvj422p \
yuvj440p \
yuvj444p \
yuyv422 \
FATE_PIXFMT := $(FATE_PIXFMT-yes:%=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

@ -209,19 +209,3 @@ fi
if [ -n "$do_smjpeg" ] ; then
do_lavf smjpeg "" "-f smjpeg"
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 -vcodec 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
6bb61113e7b70eb09dbcec356122a0e2 *./tests/data/pixfmt/rgb24.yuv
304128 ./tests/data/pixfmt/rgb24.yuv
6bb61113e7b70eb09dbcec356122a0e2 *./tests/data/pixfmt/bgr24.yuv
304128 ./tests/data/pixfmt/bgr24.yuv
6bb61113e7b70eb09dbcec356122a0e2 *./tests/data/pixfmt/rgb32.yuv
304128 ./tests/data/pixfmt/rgb32.yuv
efa7c0337cc00c796c6df615223716f1 *./tests/data/pixfmt/rgb565.yuv
304128 ./tests/data/pixfmt/rgb565.yuv
0df2a477af1415a1b8fbf2a3e552bc39 *./tests/data/pixfmt/rgb555.yuv
304128 ./tests/data/pixfmt/rgb555.yuv
1e080c12bd9755c41ecb8e19b756f406 *./tests/data/pixfmt/gray.yuv
304128 ./tests/data/pixfmt/gray.yuv
d87cf0c2e7a13cc693fe6ece22461c83 *./tests/data/pixfmt/monow.yuv
304128 ./tests/data/pixfmt/monow.yuv
d87cf0c2e7a13cc693fe6ece22461c83 *./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 @@
6bb61113e7b70eb09dbcec356122a0e2 *tests/data/pixfmt/bgr24.yuv
304128 tests/data/pixfmt/bgr24.yuv

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

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

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

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

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

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

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

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

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

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

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

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

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

@ -0,0 +1,2 @@
efa7c0337cc00c796c6df615223716f1 *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