From 85649b6523a69df390956e6739b691e17265e36e Mon Sep 17 00:00:00 2001 From: James Almer Date: Thu, 14 Mar 2019 17:07:15 -0300 Subject: fate/lavf-image: fix passed arguments for some high bit depth tests Should fix fate failures on big endian targets. Signed-off-by: James Almer --- tests/fate-run.sh | 4 ++-- tests/fate/lavf-image.mak | 40 ++++++++++++++++++++-------------------- tests/ref/lavf/gray16be.pam | 2 +- tests/ref/lavf/rgb48be.pam | 2 +- tests/ref/lavf/rgb48le_10.dpx | 2 +- 5 files changed, 25 insertions(+), 25 deletions(-) (limited to 'tests') diff --git a/tests/fate-run.sh b/tests/fate-run.sh index 4c77b2dc1b..5c2732b912 100755 --- a/tests/fate-run.sh +++ b/tests/fate-run.sh @@ -325,9 +325,9 @@ lavf_image(){ outdir="tests/data/images/$t" mkdir -p "$outdir" file=${outdir}/%02d.$t - run_avconv $DEC_OPTS $1 -f image2 -c:v pgmyuv -i $raw_src "$ENC_OPTS -metadata title=lavftest" $2 -frames 13 -y -qscale 10 $target_path/$file + run_avconv $DEC_OPTS -f image2 -c:v pgmyuv -i $raw_src $1 "$ENC_OPTS -metadata title=lavftest" -frames 13 -y -qscale 10 $target_path/$file do_md5sum ${outdir}/02.$t - do_avconv_crc $file $DEC_OPTS $2 -i $target_path/$file + do_avconv_crc $file $DEC_OPTS $2 -i $target_path/$file $2 echo $(wc -c ${outdir}/02.$t) } diff --git a/tests/fate/lavf-image.mak b/tests/fate/lavf-image.mak index f22d187d90..dbbd374301 100644 --- a/tests/fate/lavf-image.mak +++ b/tests/fate/lavf-image.mak @@ -38,27 +38,27 @@ $(FATE_LAVF_IMAGES): CMD = lavf_image $(FATE_LAVF_IMAGES): REF = $(SRC_PATH)/tests/ref/lavf/$(@:fate-lavf-%=%) $(FATE_LAVF_IMAGES): $(VREF) -fate-lavf-jpg: CMD = lavf_image "" "-pix_fmt yuvj420p" -fate-lavf-tiff: CMD = lavf_image "" "-pix_fmt rgb24" -fate-lavf-gbrp10le.dpx: CMD = lavf_image "" "-pix_fmt gbrp10le" -fate-lavf-gbrp12le.dpx: CMD = lavf_image "" "-pix_fmt gbrp12le" -fate-lavf-rgb48le.dpx: CMD = lavf_image "" "-pix_fmt rgb48le" +fate-lavf-jpg: CMD = lavf_image "-pix_fmt yuvj420p" +fate-lavf-tiff: CMD = lavf_image "-pix_fmt rgb24" +fate-lavf-gbrp10le.dpx: CMD = lavf_image "-pix_fmt gbrp10le" "-pix_fmt gbrp10le" +fate-lavf-gbrp12le.dpx: CMD = lavf_image "-pix_fmt gbrp12le" "-pix_fmt gbrp12le" +fate-lavf-rgb48le.dpx: CMD = lavf_image "-pix_fmt rgb48le" fate-lavf-rgb48le_10.dpx: CMD = lavf_image "-pix_fmt rgb48le -bits_per_raw_sample 10" "-pix_fmt rgb48le" -fate-lavf-rgba64le.dpx: CMD = lavf_image "" "-pix_fmt rgba64le" -fate-lavf-rgba.pam: CMD = lavf_image "" "-pix_fmt rgba" -fate-lavf-gray.pam: CMD = lavf_image "" "-pix_fmt gray" -fate-lavf-gray16be.pam: CMD = lavf_image "" "-pix_fmt gray16be" -fate-lavf-rgb48be.pam: CMD = lavf_image "" "-pix_fmt rgb48be" -fate-lavf-monob.pam: CMD = lavf_image "" "-pix_fmt monob" -fate-lavf-gray16be.png: CMD = lavf_image "" "-pix_fmt gray16be" -fate-lavf-rgb48be.png: CMD = lavf_image "" "-pix_fmt rgb48be" -fate-lavf-rgba.xwd: CMD = lavf_image "" "-pix_fmt rgba" -fate-lavf-rgb565be.xwd: CMD = lavf_image "" "-pix_fmt rgb565be" -fate-lavf-rgb555be.xwd: CMD = lavf_image "" "-pix_fmt rgb555be" -fate-lavf-rgb8.xwd: CMD = lavf_image "" "-pix_fmt rgb8" -fate-lavf-rgb4_byte.xwd: CMD = lavf_image "" "-pix_fmt rgb4_byte" -fate-lavf-gray.xwd: CMD = lavf_image "" "-pix_fmt gray" -fate-lavf-monow.xwd: CMD = lavf_image "" "-pix_fmt monow" +fate-lavf-rgba64le.dpx: CMD = lavf_image "-pix_fmt rgba64le" +fate-lavf-rgba.pam: CMD = lavf_image "-pix_fmt rgba" +fate-lavf-gray.pam: CMD = lavf_image "-pix_fmt gray" +fate-lavf-gray16be.pam: CMD = lavf_image "-pix_fmt gray16be" "-pix_fmt gray16be" +fate-lavf-rgb48be.pam: CMD = lavf_image "-pix_fmt rgb48be" "-pix_fmt rgb48be" +fate-lavf-monob.pam: CMD = lavf_image "-pix_fmt monob" +fate-lavf-gray16be.png: CMD = lavf_image "-pix_fmt gray16be" +fate-lavf-rgb48be.png: CMD = lavf_image "-pix_fmt rgb48be" +fate-lavf-rgba.xwd: CMD = lavf_image "-pix_fmt rgba" +fate-lavf-rgb565be.xwd: CMD = lavf_image "-pix_fmt rgb565be" +fate-lavf-rgb555be.xwd: CMD = lavf_image "-pix_fmt rgb555be" +fate-lavf-rgb8.xwd: CMD = lavf_image "-pix_fmt rgb8" +fate-lavf-rgb4_byte.xwd: CMD = lavf_image "-pix_fmt rgb4_byte" +fate-lavf-gray.xwd: CMD = lavf_image "-pix_fmt gray" +fate-lavf-monow.xwd: CMD = lavf_image "-pix_fmt monow" FATE_AVCONV += $(FATE_LAVF_IMAGES) fate-lavf-images fate-lavf: $(FATE_LAVF_IMAGES) diff --git a/tests/ref/lavf/gray16be.pam b/tests/ref/lavf/gray16be.pam index 3907d840a1..5038384bb8 100644 --- a/tests/ref/lavf/gray16be.pam +++ b/tests/ref/lavf/gray16be.pam @@ -1,3 +1,3 @@ 740eb42157af9e9eed46b70ba6a6cf4d *tests/data/images/gray16be.pam/02.gray16be.pam -tests/data/images/gray16be.pam/%02d.gray16be.pam CRC=0x879b10ef +tests/data/images/gray16be.pam/%02d.gray16be.pam CRC=0x893f10ef 202823 tests/data/images/gray16be.pam/02.gray16be.pam diff --git a/tests/ref/lavf/rgb48be.pam b/tests/ref/lavf/rgb48be.pam index bb3edbe8ea..13e5f77ac0 100644 --- a/tests/ref/lavf/rgb48be.pam +++ b/tests/ref/lavf/rgb48be.pam @@ -1,3 +1,3 @@ 032538f0313b4f240b44a5bef115f5bf *tests/data/images/rgb48be.pam/02.rgb48be.pam -tests/data/images/rgb48be.pam/%02d.rgb48be.pam CRC=0xe5b9c023 +tests/data/images/rgb48be.pam/%02d.rgb48be.pam CRC=0x5984c023 608321 tests/data/images/rgb48be.pam/02.rgb48be.pam diff --git a/tests/ref/lavf/rgb48le_10.dpx b/tests/ref/lavf/rgb48le_10.dpx index 9947eeb524..ce36e5079f 100644 --- a/tests/ref/lavf/rgb48le_10.dpx +++ b/tests/ref/lavf/rgb48le_10.dpx @@ -1,3 +1,3 @@ b9f22728f8ff393bf30cf6cbd624fa95 *tests/data/images/rgb48le_10.dpx/02.rgb48le_10.dpx -tests/data/images/rgb48le_10.dpx/%02d.rgb48le_10.dpx CRC=0xa150e4c9 +tests/data/images/rgb48le_10.dpx/%02d.rgb48le_10.dpx CRC=0xf38d5830 407168 tests/data/images/rgb48le_10.dpx/02.rgb48le_10.dpx -- cgit v1.2.3