@@ -203,7 +203,8 @@ enc_dec_pcm(){
ffmpeg -auto_conversion_filters -bitexact -i ${encfile} -c:a pcm_${pcm_fmt} -fflags +bitexact -f ${dec_fmt} -
}
-FLAGS="-flags +bitexact -sws_flags +accurate_rnd+bitexact -fflags +bitexact"
+SCALE_FLAGS="+accurate_rnd+bitexact"
+FLAGS="-flags +bitexact -sws_flags $SCALE_FLAGS -fflags +bitexact"
DEC_OPTS="-threads $threads -thread_type $thread_type -idct simple $FLAGS"
ENC_OPTS="-threads 1 -idct simple -dct fastint"
@@ -335,7 +336,7 @@ echov(){
}
AVCONV_OPTS="-nostdin -nostats -noauto_conversion_filters -y -cpuflags $cpuflags -filter_threads $threads"
-COMMON_OPTS="-flags +bitexact -idct simple -sws_flags +accurate_rnd+bitexact -fflags +bitexact"
+COMMON_OPTS="-flags +bitexact -idct simple -sws_flags $SCALE_FLAGS -fflags +bitexact"
DEC_OPTS="$COMMON_OPTS -threads $threads"
ENC_OPTS="$COMMON_OPTS -threads 1 -dct fastint"
@@ -505,14 +506,15 @@ pixfmt_conversion(){
pixfmt_conversion_ext(){
prefix=$1
+ suffix=$2
color_range="${test#pixfmt-}"
color_range=${color_range%-*}
conversion="${test#pixfmt-$color_range-}"
outdir="tests/data/pixfmt"
file=${outdir}/${color_range}-${conversion}.yuv
cleanfiles="$cleanfiles $file"
- do_avconv $file $DEC_OPTS -lavfi ${prefix}testsrc=s=352x288,format=${color_range},scale,format=$conversion \
- $ENC_OPTS -t 1 -f rawvideo -s 352x288 -pix_fmt ${color_range}le -color_range mpeg
+ do_avconv $file $DEC_OPTS -lavfi ${prefix}testsrc=s=352x288,format=${color_range},scale=flags=$SCALE_FLAGS,format=$conversion \
+ $ENC_OPTS -t 1 -f rawvideo -s 352x288 -pix_fmt ${color_range}${suffix} -color_range mpeg
}
pixdesc(){
@@ -1,4 +1,4 @@
-FATE_PIXFMT-$(CONFIG_SCALE_FILTER) = bgr24 \
+PIXFMT_8_LIST = bgr24 \
gray \
monob \
monow \
@@ -19,12 +19,24 @@ FATE_PIXFMT-$(CONFIG_SCALE_FILTER) = bgr24 \
yuvj444p \
yuyv422 \
-FATE_PIXFMT := $(FATE_PIXFMT-yes:%=fate-pixfmt-%)
+FATE_PIXFMT := $(PIXFMT_8_LIST:%=fate-pixfmt-%)
$(FATE_PIXFMT): CMD = pixfmt_conversion
$(FATE_PIXFMT): REF = $(SRC_PATH)/tests/ref/pixfmt/$(@:fate-pixfmt-%=%)
$(FATE_PIXFMT): $(VREF)
+FATE_PIXFMT_8-YUV-$(call ALLYES, SCALE_FILTER YUVTESTSRC_FILTER LAVFI_INDEV) += $(PIXFMT_8_LIST)
+FATE_PIXFMT_8-RGB-$(call ALLYES, SCALE_FILTER RGBTESTSRC_FILTER LAVFI_INDEV) += $(PIXFMT_8_LIST)
+
+FATE_PIXFMT_8-YUV := $(FATE_PIXFMT_8-YUV-yes:%=fate-pixfmt-yuv444p-%)
+FATE_PIXFMT_8-RGB := $(FATE_PIXFMT_8-RGB-yes:%=fate-pixfmt-gbrp-%)
+
+$(FATE_PIXFMT_8-YUV): CMD = pixfmt_conversion_ext "yuv"
+$(FATE_PIXFMT_8-RGB): CMD = pixfmt_conversion_ext "rgb"
+
+FATE_PIXFMT_8 := $(FATE_PIXFMT_8-YUV) $(FATE_PIXFMT_8-RGB)
+$(FATE_PIXFMT_8): REF = $(SRC_PATH)/tests/ref/pixfmt/$(@:fate-pixfmt-%=%)
+
PIXFMT_10_LIST = gray10le \
gray10be \
yuv420p10le \
@@ -55,8 +67,8 @@ FATE_PIXFMT_10-RGB-$(call ALLYES, SCALE_FILTER RGBTESTSRC_FILTER LAVFI_INDEV) +=
FATE_PIXFMT_10-YUV := $(FATE_PIXFMT_10-YUV-yes:%=fate-pixfmt-yuv444p10-%)
FATE_PIXFMT_10-RGB := $(FATE_PIXFMT_10-RGB-yes:%=fate-pixfmt-gbrp10-%)
-$(FATE_PIXFMT_10-YUV): CMD = pixfmt_conversion_ext "yuv"
-$(FATE_PIXFMT_10-RGB): CMD = pixfmt_conversion_ext "rgb"
+$(FATE_PIXFMT_10-YUV): CMD = pixfmt_conversion_ext "yuv" "le"
+$(FATE_PIXFMT_10-RGB): CMD = pixfmt_conversion_ext "rgb" "le"
FATE_PIXFMT_10 := $(FATE_PIXFMT_10-YUV) $(FATE_PIXFMT_10-RGB)
$(FATE_PIXFMT_10): REF = $(SRC_PATH)/tests/ref/pixfmt/$(@:fate-pixfmt-%=%)
@@ -89,8 +101,8 @@ FATE_PIXFMT_12-RGB-$(call ALLYES, SCALE_FILTER RGBTESTSRC_FILTER LAVFI_INDEV) +=
FATE_PIXFMT_12-YUV := $(FATE_PIXFMT_12-YUV-yes:%=fate-pixfmt-yuv444p12-%)
FATE_PIXFMT_12-RGB := $(FATE_PIXFMT_12-RGB-yes:%=fate-pixfmt-gbrp12-%)
-$(FATE_PIXFMT_12-YUV): CMD = pixfmt_conversion_ext "yuv"
-$(FATE_PIXFMT_12-RGB): CMD = pixfmt_conversion_ext "rgb"
+$(FATE_PIXFMT_12-YUV): CMD = pixfmt_conversion_ext "yuv" "le"
+$(FATE_PIXFMT_12-RGB): CMD = pixfmt_conversion_ext "rgb" "le"
FATE_PIXFMT_12 := $(FATE_PIXFMT_12-YUV) $(FATE_PIXFMT_12-RGB)
$(FATE_PIXFMT_12): REF = $(SRC_PATH)/tests/ref/pixfmt/$(@:fate-pixfmt-%=%)
@@ -122,8 +134,8 @@ FATE_PIXFMT_16-RGB-$(call ALLYES, SCALE_FILTER RGBTESTSRC_FILTER LAVFI_INDEV) +=
FATE_PIXFMT_16-YUV := $(FATE_PIXFMT_16-YUV-yes:%=fate-pixfmt-yuv444p16-%)
FATE_PIXFMT_16-RGB := $(FATE_PIXFMT_16-RGB-yes:%=fate-pixfmt-gbrp16-%)
-$(FATE_PIXFMT_16-YUV): CMD = pixfmt_conversion_ext "yuv"
-$(FATE_PIXFMT_16-RGB): CMD = pixfmt_conversion_ext "rgb"
+$(FATE_PIXFMT_16-YUV): CMD = pixfmt_conversion_ext "yuv" "le"
+$(FATE_PIXFMT_16-RGB): CMD = pixfmt_conversion_ext "rgb" "le"
FATE_PIXFMT_16 := $(FATE_PIXFMT_16-YUV) $(FATE_PIXFMT_16-RGB)
$(FATE_PIXFMT_16): REF = $(SRC_PATH)/tests/ref/pixfmt/$(@:fate-pixfmt-%=%)
new file mode 100644
@@ -0,0 +1,2 @@
+b47e4ab6d421bb8a7f911787aa7ca753 *tests/data/pixfmt/gbrp-bgr24.yuv
+7603200 tests/data/pixfmt/gbrp-bgr24.yuv
new file mode 100644
@@ -0,0 +1,2 @@
+a93e1b942688baa9b1033f3501f8d454 *tests/data/pixfmt/gbrp-gray.yuv
+7603200 tests/data/pixfmt/gbrp-gray.yuv
new file mode 100644
@@ -0,0 +1,2 @@
+03573be7429bc9bc4b966fe35f7861fe *tests/data/pixfmt/gbrp-monob.yuv
+7603200 tests/data/pixfmt/gbrp-monob.yuv
new file mode 100644
@@ -0,0 +1,2 @@
+03573be7429bc9bc4b966fe35f7861fe *tests/data/pixfmt/gbrp-monow.yuv
+7603200 tests/data/pixfmt/gbrp-monow.yuv
new file mode 100644
@@ -0,0 +1,2 @@
+b47e4ab6d421bb8a7f911787aa7ca753 *tests/data/pixfmt/gbrp-rgb24.yuv
+7603200 tests/data/pixfmt/gbrp-rgb24.yuv
new file mode 100644
@@ -0,0 +1,2 @@
+b47e4ab6d421bb8a7f911787aa7ca753 *tests/data/pixfmt/gbrp-rgb32.yuv
+7603200 tests/data/pixfmt/gbrp-rgb32.yuv
new file mode 100644
@@ -0,0 +1,2 @@
+5d64e03cfb2aa21f625bdee163ab2cdb *tests/data/pixfmt/gbrp-rgb555.yuv
+7603200 tests/data/pixfmt/gbrp-rgb555.yuv
new file mode 100644
@@ -0,0 +1,2 @@
+213fa622818b37865c0f3cb187922127 *tests/data/pixfmt/gbrp-rgb565.yuv
+7603200 tests/data/pixfmt/gbrp-rgb565.yuv
new file mode 100644
@@ -0,0 +1,2 @@
+86b542ae625ef5a61cef6b0b703f553f *tests/data/pixfmt/gbrp-xyz12le.yuv
+7603200 tests/data/pixfmt/gbrp-xyz12le.yuv
new file mode 100644
@@ -0,0 +1,2 @@
+a8dd9c61dbb48585d292b2c8757c16cf *tests/data/pixfmt/gbrp-yuv410p.yuv
+7603200 tests/data/pixfmt/gbrp-yuv410p.yuv
new file mode 100644
@@ -0,0 +1,2 @@
+228dfe5d09263ccfd9d485a1c2b240e0 *tests/data/pixfmt/gbrp-yuv411p.yuv
+7603200 tests/data/pixfmt/gbrp-yuv411p.yuv
new file mode 100644
@@ -0,0 +1,2 @@
+13f8be3ed2a4a1a8a419e8eb837fbef9 *tests/data/pixfmt/gbrp-yuv420p.yuv
+7603200 tests/data/pixfmt/gbrp-yuv420p.yuv
new file mode 100644
@@ -0,0 +1,2 @@
+a41ccfab2d42cc3204b78a7fce5143a9 *tests/data/pixfmt/gbrp-yuv422p.yuv
+7603200 tests/data/pixfmt/gbrp-yuv422p.yuv
new file mode 100644
@@ -0,0 +1,2 @@
+fc87f8cb284cc53d4306a709d3795655 *tests/data/pixfmt/gbrp-yuv440p.yuv
+7603200 tests/data/pixfmt/gbrp-yuv440p.yuv
new file mode 100644
@@ -0,0 +1,2 @@
+d7ed2c3b0af84bbdc71f04acbe9b6f28 *tests/data/pixfmt/gbrp-yuv444p.yuv
+7603200 tests/data/pixfmt/gbrp-yuv444p.yuv
new file mode 100644
@@ -0,0 +1,2 @@
+d994e8c1d29fcabc7c79d9401623c5a1 *tests/data/pixfmt/gbrp-yuvj420p.yuv
+7603200 tests/data/pixfmt/gbrp-yuvj420p.yuv
new file mode 100644
@@ -0,0 +1,2 @@
+349322ade87e23ccf47b603d81100029 *tests/data/pixfmt/gbrp-yuvj422p.yuv
+7603200 tests/data/pixfmt/gbrp-yuvj422p.yuv
new file mode 100644
@@ -0,0 +1,2 @@
+de5f4ad61b2c0ae7f35cf38044ad2f91 *tests/data/pixfmt/gbrp-yuvj440p.yuv
+7603200 tests/data/pixfmt/gbrp-yuvj440p.yuv
new file mode 100644
@@ -0,0 +1,2 @@
+e87f13a66f0a93301f2962da1075f7b8 *tests/data/pixfmt/gbrp-yuvj444p.yuv
+7603200 tests/data/pixfmt/gbrp-yuvj444p.yuv
new file mode 100644
@@ -0,0 +1,2 @@
+a41ccfab2d42cc3204b78a7fce5143a9 *tests/data/pixfmt/gbrp-yuyv422.yuv
+7603200 tests/data/pixfmt/gbrp-yuyv422.yuv
new file mode 100644
@@ -0,0 +1,2 @@
+abf45693d7faa2e6ad9bc3319a0e4d2d *tests/data/pixfmt/yuv444p-bgr24.yuv
+7603200 tests/data/pixfmt/yuv444p-bgr24.yuv
new file mode 100644
@@ -0,0 +1,2 @@
+20b27d4336d38a6a4a082f7e929a5c25 *tests/data/pixfmt/yuv444p-gray.yuv
+7603200 tests/data/pixfmt/yuv444p-gray.yuv
new file mode 100644
@@ -0,0 +1,2 @@
+3988749a5157074ab6dda717acb9cc88 *tests/data/pixfmt/yuv444p-monob.yuv
+7603200 tests/data/pixfmt/yuv444p-monob.yuv
new file mode 100644
@@ -0,0 +1,2 @@
+3988749a5157074ab6dda717acb9cc88 *tests/data/pixfmt/yuv444p-monow.yuv
+7603200 tests/data/pixfmt/yuv444p-monow.yuv
new file mode 100644
@@ -0,0 +1,2 @@
+abf45693d7faa2e6ad9bc3319a0e4d2d *tests/data/pixfmt/yuv444p-rgb24.yuv
+7603200 tests/data/pixfmt/yuv444p-rgb24.yuv
new file mode 100644
@@ -0,0 +1,2 @@
+abf45693d7faa2e6ad9bc3319a0e4d2d *tests/data/pixfmt/yuv444p-rgb32.yuv
+7603200 tests/data/pixfmt/yuv444p-rgb32.yuv
new file mode 100644
@@ -0,0 +1,2 @@
+e2fe4fb593dc65eb7b92710717c68cdd *tests/data/pixfmt/yuv444p-rgb555.yuv
+7603200 tests/data/pixfmt/yuv444p-rgb555.yuv
new file mode 100644
@@ -0,0 +1,2 @@
+0151a12feb607ae3dc9d176d63dfa2e5 *tests/data/pixfmt/yuv444p-rgb565.yuv
+7603200 tests/data/pixfmt/yuv444p-rgb565.yuv
new file mode 100644
@@ -0,0 +1,2 @@
+a0acdd9c25a84c8698d0dc1e52950c8d *tests/data/pixfmt/yuv444p-xyz12le.yuv
+7603200 tests/data/pixfmt/yuv444p-xyz12le.yuv
new file mode 100644
@@ -0,0 +1,2 @@
+7c75a87e091fd30b3196563fb48bb683 *tests/data/pixfmt/yuv444p-yuv410p.yuv
+7603200 tests/data/pixfmt/yuv444p-yuv410p.yuv
new file mode 100644
@@ -0,0 +1,2 @@
+5cac17a17ddd3e8a39e45d0cce0fb4a6 *tests/data/pixfmt/yuv444p-yuv411p.yuv
+7603200 tests/data/pixfmt/yuv444p-yuv411p.yuv
new file mode 100644
@@ -0,0 +1,2 @@
+a1950c9102daff4e84a469baefc1e8f6 *tests/data/pixfmt/yuv444p-yuv420p.yuv
+7603200 tests/data/pixfmt/yuv444p-yuv420p.yuv
new file mode 100644
@@ -0,0 +1,2 @@
+84e2d8da47290d76073bfed3496fa4ff *tests/data/pixfmt/yuv444p-yuv422p.yuv
+7603200 tests/data/pixfmt/yuv444p-yuv422p.yuv
new file mode 100644
@@ -0,0 +1,2 @@
+30e9915a8e4476015214149d5a7f1a97 *tests/data/pixfmt/yuv444p-yuv440p.yuv
+7603200 tests/data/pixfmt/yuv444p-yuv440p.yuv
new file mode 100644
@@ -0,0 +1,2 @@
+e41775e4a6798bc545ab3212a0d88544 *tests/data/pixfmt/yuv444p-yuv444p.yuv
+7603200 tests/data/pixfmt/yuv444p-yuv444p.yuv
new file mode 100644
@@ -0,0 +1,2 @@
+231709437c88659f4799d23a852e9a5e *tests/data/pixfmt/yuv444p-yuvj420p.yuv
+7603200 tests/data/pixfmt/yuv444p-yuvj420p.yuv
new file mode 100644
@@ -0,0 +1,2 @@
+1dd3db7826cd0a08f99f6f43424ac3a4 *tests/data/pixfmt/yuv444p-yuvj422p.yuv
+7603200 tests/data/pixfmt/yuv444p-yuvj422p.yuv
new file mode 100644
@@ -0,0 +1,2 @@
+40eba7ccd535f819dffa1baa0108b4bf *tests/data/pixfmt/yuv444p-yuvj440p.yuv
+7603200 tests/data/pixfmt/yuv444p-yuvj440p.yuv
new file mode 100644
@@ -0,0 +1,2 @@
+754c5309c258ecefab46388da7ba2b05 *tests/data/pixfmt/yuv444p-yuvj444p.yuv
+7603200 tests/data/pixfmt/yuv444p-yuvj444p.yuv
new file mode 100644
@@ -0,0 +1,2 @@
+84e2d8da47290d76073bfed3496fa4ff *tests/data/pixfmt/yuv444p-yuyv422.yuv
+7603200 tests/data/pixfmt/yuv444p-yuyv422.yuv
Signed-off-by: James Almer <jamrial@gmail.com> --- tests/fate-run.sh | 10 ++++++---- tests/fate/pixfmt.mak | 28 ++++++++++++++++++++-------- tests/ref/pixfmt/gbrp-bgr24 | 2 ++ tests/ref/pixfmt/gbrp-gray | 2 ++ tests/ref/pixfmt/gbrp-monob | 2 ++ tests/ref/pixfmt/gbrp-monow | 2 ++ tests/ref/pixfmt/gbrp-rgb24 | 2 ++ tests/ref/pixfmt/gbrp-rgb32 | 2 ++ tests/ref/pixfmt/gbrp-rgb555 | 2 ++ tests/ref/pixfmt/gbrp-rgb565 | 2 ++ tests/ref/pixfmt/gbrp-xyz12le | 2 ++ tests/ref/pixfmt/gbrp-yuv410p | 2 ++ tests/ref/pixfmt/gbrp-yuv411p | 2 ++ tests/ref/pixfmt/gbrp-yuv420p | 2 ++ tests/ref/pixfmt/gbrp-yuv422p | 2 ++ tests/ref/pixfmt/gbrp-yuv440p | 2 ++ tests/ref/pixfmt/gbrp-yuv444p | 2 ++ tests/ref/pixfmt/gbrp-yuvj420p | 2 ++ tests/ref/pixfmt/gbrp-yuvj422p | 2 ++ tests/ref/pixfmt/gbrp-yuvj440p | 2 ++ tests/ref/pixfmt/gbrp-yuvj444p | 2 ++ tests/ref/pixfmt/gbrp-yuyv422 | 2 ++ tests/ref/pixfmt/yuv444p-bgr24 | 2 ++ tests/ref/pixfmt/yuv444p-gray | 2 ++ tests/ref/pixfmt/yuv444p-monob | 2 ++ tests/ref/pixfmt/yuv444p-monow | 2 ++ tests/ref/pixfmt/yuv444p-rgb24 | 2 ++ tests/ref/pixfmt/yuv444p-rgb32 | 2 ++ tests/ref/pixfmt/yuv444p-rgb555 | 2 ++ tests/ref/pixfmt/yuv444p-rgb565 | 2 ++ tests/ref/pixfmt/yuv444p-xyz12le | 2 ++ tests/ref/pixfmt/yuv444p-yuv410p | 2 ++ tests/ref/pixfmt/yuv444p-yuv411p | 2 ++ tests/ref/pixfmt/yuv444p-yuv420p | 2 ++ tests/ref/pixfmt/yuv444p-yuv422p | 2 ++ tests/ref/pixfmt/yuv444p-yuv440p | 2 ++ tests/ref/pixfmt/yuv444p-yuv444p | 2 ++ tests/ref/pixfmt/yuv444p-yuvj420p | 2 ++ tests/ref/pixfmt/yuv444p-yuvj422p | 2 ++ tests/ref/pixfmt/yuv444p-yuvj440p | 2 ++ tests/ref/pixfmt/yuv444p-yuvj444p | 2 ++ tests/ref/pixfmt/yuv444p-yuyv422 | 2 ++ 42 files changed, 106 insertions(+), 12 deletions(-) create mode 100644 tests/ref/pixfmt/gbrp-bgr24 create mode 100644 tests/ref/pixfmt/gbrp-gray create mode 100644 tests/ref/pixfmt/gbrp-monob create mode 100644 tests/ref/pixfmt/gbrp-monow create mode 100644 tests/ref/pixfmt/gbrp-rgb24 create mode 100644 tests/ref/pixfmt/gbrp-rgb32 create mode 100644 tests/ref/pixfmt/gbrp-rgb555 create mode 100644 tests/ref/pixfmt/gbrp-rgb565 create mode 100644 tests/ref/pixfmt/gbrp-xyz12le create mode 100644 tests/ref/pixfmt/gbrp-yuv410p create mode 100644 tests/ref/pixfmt/gbrp-yuv411p create mode 100644 tests/ref/pixfmt/gbrp-yuv420p create mode 100644 tests/ref/pixfmt/gbrp-yuv422p create mode 100644 tests/ref/pixfmt/gbrp-yuv440p create mode 100644 tests/ref/pixfmt/gbrp-yuv444p create mode 100644 tests/ref/pixfmt/gbrp-yuvj420p create mode 100644 tests/ref/pixfmt/gbrp-yuvj422p create mode 100644 tests/ref/pixfmt/gbrp-yuvj440p create mode 100644 tests/ref/pixfmt/gbrp-yuvj444p create mode 100644 tests/ref/pixfmt/gbrp-yuyv422 create mode 100644 tests/ref/pixfmt/yuv444p-bgr24 create mode 100644 tests/ref/pixfmt/yuv444p-gray create mode 100644 tests/ref/pixfmt/yuv444p-monob create mode 100644 tests/ref/pixfmt/yuv444p-monow create mode 100644 tests/ref/pixfmt/yuv444p-rgb24 create mode 100644 tests/ref/pixfmt/yuv444p-rgb32 create mode 100644 tests/ref/pixfmt/yuv444p-rgb555 create mode 100644 tests/ref/pixfmt/yuv444p-rgb565 create mode 100644 tests/ref/pixfmt/yuv444p-xyz12le create mode 100644 tests/ref/pixfmt/yuv444p-yuv410p create mode 100644 tests/ref/pixfmt/yuv444p-yuv411p create mode 100644 tests/ref/pixfmt/yuv444p-yuv420p create mode 100644 tests/ref/pixfmt/yuv444p-yuv422p create mode 100644 tests/ref/pixfmt/yuv444p-yuv440p create mode 100644 tests/ref/pixfmt/yuv444p-yuv444p create mode 100644 tests/ref/pixfmt/yuv444p-yuvj420p create mode 100644 tests/ref/pixfmt/yuv444p-yuvj422p create mode 100644 tests/ref/pixfmt/yuv444p-yuvj440p create mode 100644 tests/ref/pixfmt/yuv444p-yuvj444p create mode 100644 tests/ref/pixfmt/yuv444p-yuyv422