diff options
| author | Martin Storsjö <martin@martin.st> | 2015-06-30 22:35:44 +0300 |
|---|---|---|
| committer | Martin Storsjö <martin@martin.st> | 2015-06-30 23:10:29 +0300 |
| commit | e2bd03a14a4e3366df0b1ee8e284a97165be1f3c (patch) | |
| tree | 9658a6582e499870bec15891b8a080af8e7b5e20 /tests/fate | |
| parent | 271ce76d317c5432e151216cf23f12b77ed6cb7e (diff) | |
| download | ffmpeg-e2bd03a14a4e3366df0b1ee8e284a97165be1f3c.tar.gz | |
fate: Avoid unnecessary pixel format conversions
Most of the fate-dds-* and fate-txd-* tests already
output into the same pixel format regardless of
platform endianness, so there's no need to force
conversion to another format.
This fixes the tests fate-txd-16bpp, fate-txd-odd,
fate-dds-rgb16, fate-dds-rgb24 and fate-dds-xrgb on
big endian, where the tests seem to fail due to issues
with certain conversion codepaths in swscale.
Those conversion codepaths should of course be fixed, but
the individual decoder tests should use as little extra
conversion steps as possible.
Signed-off-by: Martin Storsjö <martin@martin.st>
Diffstat (limited to 'tests/fate')
| -rw-r--r-- | tests/fate/image.mak | 4 | ||||
| -rw-r--r-- | tests/fate/video.mak | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/tests/fate/image.mak b/tests/fate/image.mak index 5b8eb02ce7..272e023f4d 100644 --- a/tests/fate/image.mak +++ b/tests/fate/image.mak @@ -32,9 +32,11 @@ fate-bmpparser: CMD = framecrc -f image2pipe -i $(TARGET_SAMPLES)/bmp/libav_4x_c define FATE_IMGSUITE_DDS FATE_DDS += fate-dds-$(1) -fate-dds-$(1): CMD = framecrc -i $(TARGET_SAMPLES)/dds/libav_$(1).dds -sws_flags +accurate_rnd+bitexact -pix_fmt rgba +fate-dds-$(1): CMD = framecrc -i $(TARGET_SAMPLES)/dds/libav_$(1).dds $(DDS_OPTS_$(1)) endef +DDS_OPTS_pal = -sws_flags +accurate_rnd+bitexact -pix_fmt rgba +DDS_OPTS_pal-ati = -sws_flags +accurate_rnd+bitexact -pix_fmt rgba DDS_FMT = argb argb-aexp dx10-bc1 dx10-bc1a dx10-bc2 dx10-bc3 dx10-bc4 dx10-bc5 dxt1 dxt1a dxt1-normalmap dxt2 dxt3 dxt4 dxt5 dxt5-aexp dxt5-normalmap dxt5-normalmap-ati dxt5-rbxg dxt5-rgxb dxt5-rxbg dxt5-rxgb dxt5-xgbr dxt5-xgxr dxt5-xrbg dxt5-ycocg dxt5-ycocg-scaled pal pal-ati rgb16 rgb24 rgtc1s rgtc1u rgtc2s rgtc2u rgtc2u-xy uyvy xbgr xrgb y ya ycocg yuyv $(foreach FMT,$(DDS_FMT),$(eval $(call FATE_IMGSUITE_DDS,$(FMT)))) diff --git a/tests/fate/video.mak b/tests/fate/video.mak index 016df7c437..f1d8f2a9c6 100644 --- a/tests/fate/video.mak +++ b/tests/fate/video.mak @@ -282,10 +282,10 @@ FATE_SAMPLES_AVCONV-$(call DEMDEC, TMV, TMV) += fate-tmv fate-tmv: CMD = framecrc -i $(TARGET_SAMPLES)/tmv/pop-partial.tmv -pix_fmt rgb24 FATE_TXD += fate-txd-16bpp -fate-txd-16bpp: CMD = framecrc -i $(TARGET_SAMPLES)/txd/misc.txd -pix_fmt bgra -an +fate-txd-16bpp: CMD = framecrc -i $(TARGET_SAMPLES)/txd/misc.txd -an FATE_TXD += fate-txd-odd -fate-txd-odd: CMD = framecrc -i $(TARGET_SAMPLES)/txd/odd.txd -pix_fmt bgra -an +fate-txd-odd: CMD = framecrc -i $(TARGET_SAMPLES)/txd/odd.txd -an FATE_TXD += fate-txd-pal8 fate-txd-pal8: CMD = framecrc -i $(TARGET_SAMPLES)/txd/outro.txd -pix_fmt rgb24 -an |