Merge commit 'e2bd03a1'

* commit 'e2bd03a1':
  fate: Avoid unnecessary pixel format conversions

Conflicts:
	tests/fate/image.mak
	tests/ref/fate/dds-ya
Merged-by: Michael Niedermayer <michaelni@gmx.at>

tests/fate/image.mak

@@ -32,9 +32,11 @@ fate-bmpparser: CMD = framecrc -f image2pipe -i $(TARGET_SAMPLES)/bmp/numbers.bm
 
 define FATE_IMGSUITE_DDS
 FATE_DDS += fate-dds-$(1)
-fate-dds-$(1): CMD = framecrc -i $(TARGET_SAMPLES)/dds/fate_$(1).dds -sws_flags +accurate_rnd+bitexact -pix_fmt rgba
+fate-dds-$(1): CMD = framecrc -i $(TARGET_SAMPLES)/dds/fate_$(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))))
 

tests/fate/video.mak

@@ -290,10 +290,10 @@ FATE_VIDEO-$(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

tests/ref/fate/dds-rgb16

 #tb 0: 1/25
-0,          0,          0,        1,    32768, 0x7991785d
+0,          0,          0,        1,    16384, 0xc8910265

tests/ref/fate/dds-rgb24

 #tb 0: 1/25
-0,          0,          0,        1,    32768, 0xcf0f7833
+0,          0,          0,        1,    24576, 0xef0f9653

tests/ref/fate/dds-uyvy

 #tb 0: 1/25
-0,          0,          0,        1,    16384, 0xd579a59e
+0,          0,          0,        1,     8192, 0x3c658750

tests/ref/fate/dds-xbgr

 #tb 0: 1/25
-0,          0,          0,        1,    16384, 0x702f6a28
+0,          0,          0,        1,    16384, 0x70336a28

tests/ref/fate/dds-y

 #tb 0: 1/25
-0,          0,          0,        1,    32768, 0xc51add1c
+0,          0,          0,        1,     8192, 0x56eca90f

tests/ref/fate/dds-ya

 #tb 0: 1/25
-0,          0,          0,        1,    56320, 0xa614eb1e
+0,          0,          0,        1,    28160, 0xd3981fcb

tests/ref/fate/dds-yuyv

 #tb 0: 1/25
-0,          0,          0,        1,    16384, 0xd579a59e
+0,          0,          0,        1,     8192, 0xc1108750

tests/ref/fate/txd-16bpp

 #tb 0: 1/5
-0,          0,          0,        1,    16384, 0x4c7bb4cb
-0,          1,          1,        1,    16384, 0x914e14b4
-0,          2,          2,        1,    16384, 0x81e293cb
-0,          3,          3,        1,    16384, 0xf733ed43
-0,          4,          4,        1,    16384, 0x739a6c21
-0,          5,          5,        1,    16384, 0x47f9184a
-0,          6,          6,        1,    16384, 0x329f9d3e
-0,          7,          7,        1,    16384, 0x231ffd9c
-0,          8,          8,        1,    16384, 0xe7c2c4c6
-0,          9,          9,        1,    16384, 0x880d8ffb
-0,         10,         10,        1,    16384, 0xf83238d2
+0,          0,          0,        1,    16384, 0x4d39b4cb
+0,          1,          1,        1,    16384, 0x2a8d14b4
+0,          2,          2,        1,    16384, 0xe26793cb
+0,          3,          3,        1,    16384, 0x62b5ed43
+0,          4,          4,        1,    16384, 0x5ae86c21
+0,          5,          5,        1,    16384, 0x416d184a
+0,          6,          6,        1,    16384, 0x33f59d3e
+0,          7,          7,        1,    16384, 0x3d0ffd9c
+0,          8,          8,        1,    16384, 0x35bac4c6
+0,          9,          9,        1,    16384, 0xa1cd8ffb
+0,         10,         10,        1,    16384, 0xf7dc38d2

tests/ref/fate/txd-odd

 #tb 0: 1/5
-0,          0,          0,        1,   385452, 0xb22514d6
+0,          0,          0,        1,   385452, 0x055a14d6