Merge commit '5c018ee1'

* commit '5c018ee1':
  DirectDraw Surface image decoder

Conflicts:
	Changelog
	configure
	doc/general.texi
	libavcodec/Makefile
	libavcodec/version.h
	tests/fate/image.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Changelog

@@ -5,6 +5,7 @@ version <next>:
 - colorkey video filter
 - BFSTM/BCSTM demuxer
 - little-endian ADPCM_THP decoder
+- DirectDraw Surface image/texture decoder
 
 
 version 2.7:

configure

@@ -2158,6 +2158,7 @@ cook_decoder_select="audiodsp mdct sinewin"
 cscd_decoder_select="lzo"
 cscd_decoder_suggest="zlib"
 dca_decoder_select="fmtconvert mdct"
+dds_decoder_select="texturedsp"
 dirac_decoder_select="dwt golomb videodsp mpegvideoenc"
 dnxhd_decoder_select="blockdsp idctdsp"
 dnxhd_encoder_select="aandcttables blockdsp fdctdsp idctdsp mpegvideoenc pixblockdsp"

doc/general.texi

@@ -275,6 +275,7 @@ library:
 @item Deluxe Paint Animation    @tab   @tab X
 @item DFA                       @tab   @tab X
     @tab This format is used in Chronomaster game
+@item DirectDraw Surface        @tab   @tab X
 @item DSD Stream File (DSF)     @tab   @tab X
 @item DV video                  @tab X @tab X
 @item DXA                       @tab   @tab X

libavcodec/Makefile

@@ -205,6 +205,7 @@ OBJS-$(CONFIG_DCA_DECODER)             += dcadec.o dca.o dcadsp.o      \
                                           dcadata.o dca_exss.o         \
                                           dca_xll.o synth_filter.o
 OBJS-$(CONFIG_DCA_ENCODER)             += dcaenc.o dca.o dcadata.o
+OBJS-$(CONFIG_DDS_DECODER)             += dds.o
 OBJS-$(CONFIG_DIRAC_DECODER)           += diracdec.o dirac.o diracdsp.o \
                                           dirac_arith.o mpeg12data.o dirac_dwt.o
 OBJS-$(CONFIG_DFA_DECODER)             += dfa.o

libavcodec/allcodecs.c

@@ -140,6 +140,7 @@ void avcodec_register_all(void)
     REGISTER_DECODER(CPIA,              cpia);
     REGISTER_DECODER(CSCD,              cscd);
     REGISTER_DECODER(CYUV,              cyuv);
+    REGISTER_DECODER(DDS,               dds);
     REGISTER_DECODER(DFA,               dfa);
     REGISTER_DECODER(DIRAC,             dirac);
     REGISTER_ENCDEC (DNXHD,             dnxhd);

libavcodec/avcodec.h

@@ -294,6 +294,7 @@ enum AVCodecID {
     AV_CODEC_ID_TDSC,
     AV_CODEC_ID_HQ_HQA,
     AV_CODEC_ID_HAP,
+    AV_CODEC_ID_DDS,
 
     AV_CODEC_ID_BRENDER_PIX= MKBETAG('B','P','I','X'),
     AV_CODEC_ID_Y41P       = MKBETAG('Y','4','1','P'),

libavcodec/codec_desc.c

@@ -1282,6 +1282,14 @@ static const AVCodecDescriptor codec_descriptors[] = {
         .long_name = NULL_IF_CONFIG_SMALL("BRender PIX image"),
         .props     = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSLESS,
     },
+    {
+        .id        = AV_CODEC_ID_DDS,
+        .type      = AVMEDIA_TYPE_VIDEO,
+        .name      = "dds",
+        .long_name = NULL_IF_CONFIG_SMALL("DirectDraw Surface image decoder"),
+        .props     = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSY |
+                     AV_CODEC_PROP_LOSSLESS,
+    },
     {
         .id        = AV_CODEC_ID_DPX,
         .type      = AVMEDIA_TYPE_VIDEO,

libavcodec/version.h

@@ -29,7 +29,7 @@
 #include "libavutil/version.h"
 
 #define LIBAVCODEC_VERSION_MAJOR 56
-#define LIBAVCODEC_VERSION_MINOR  43
+#define LIBAVCODEC_VERSION_MINOR  44
 #define LIBAVCODEC_VERSION_MICRO 100
 
 #define LIBAVCODEC_VERSION_INT  AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \

libavformat/img2.c

@@ -45,6 +45,7 @@ static const IdStrMap img_tags[] = {
     { AV_CODEC_ID_PBM,        "pbm"      },
     { AV_CODEC_ID_PAM,        "pam"      },
     { AV_CODEC_ID_ALIAS_PIX,  "pix"      },
+    { AV_CODEC_ID_DDS,        "dds"      },
     { AV_CODEC_ID_MPEG1VIDEO, "mpg1-img" },
     { AV_CODEC_ID_MPEG2VIDEO, "mpg2-img" },
     { AV_CODEC_ID_MPEG4,      "mpg4-img" },

tests/fate/image.mak

@@ -30,6 +30,18 @@ fate-brenderpix: $(FATE_BRENDERPIX-yes)
 FATE_IMAGE-$(call PARSERDEMDEC, BMP, IMAGE2PIPE, BMP) += fate-bmpparser
 fate-bmpparser: CMD = framecrc -f image2pipe -i $(TARGET_SAMPLES)/bmp/numbers.bmp -pix_fmt rgb24
 
+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
+endef
+
+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))))
+
+FATE_DDS-$(call DEMDEC, IMAGE2, DDS) += $(FATE_DDS)
+FATE_IMAGE += $(FATE_DDS-yes)
+fate-dds: $(FATE_DDS-yes)
+
 FATE_IMAGE-$(call DEMDEC, IMAGE2, DPX) += fate-dpx
 fate-dpx: CMD = framecrc -i $(TARGET_SAMPLES)/dpx/lighthouse_rgb48.dpx
 

tests/ref/fate/dds-argb

+#tb 0: 1/25
+0,          0,          0,        1,    56320, 0xfcaa920b

tests/ref/fate/dds-argb-aexp

+#tb 0: 1/25
+0,          0,          0,        1,    16384, 0xfdd37c43

tests/ref/fate/dds-dx10-bc1

+#tb 0: 1/25
+0,          0,          0,        1,    16384, 0xed2f850f

tests/ref/fate/dds-dx10-bc1a

+#tb 0: 1/25
+0,          0,          0,        1,    16384, 0x473b484b

tests/ref/fate/dds-dx10-bc2

+#tb 0: 1/25
+0,          0,          0,        1,    16384, 0x2bce3baa

tests/ref/fate/dds-dx10-bc3

+#tb 0: 1/25
+0,          0,          0,        1,    16384, 0xb91d3c62

tests/ref/fate/dds-dx10-bc4

+#tb 0: 1/25
+0,          0,          0,        1,    16384, 0xfdfd1751

tests/ref/fate/dds-dx10-bc5

+#tb 0: 1/25
+0,          0,          0,        1,    16384, 0x79bd207e

tests/ref/fate/dds-dxt1

+#tb 0: 1/25
+0,          0,          0,        1,    32768, 0xf52adc80

tests/ref/fate/dds-dxt1-normalmap

+#tb 0: 1/25
+0,          0,          0,        1,    16384, 0x2b411855

tests/ref/fate/dds-dxt1a

+#tb 0: 1/25
+0,          0,          0,        1,    16384, 0xcabb50ea

tests/ref/fate/dds-dxt2

+#tb 0: 1/25
+0,          0,          0,        1,    16384, 0x11cebeb0

tests/ref/fate/dds-dxt3

+#tb 0: 1/25
+0,          0,          0,        1,    16384, 0x729b74ba

tests/ref/fate/dds-dxt4

+#tb 0: 1/25
+0,          0,          0,        1,    16384, 0x31aaacd6

tests/ref/fate/dds-dxt5

+#tb 0: 1/25
+0,          0,          0,        1,    16384, 0xfd3166aa

tests/ref/fate/dds-dxt5-aexp

+#tb 0: 1/25
+0,          0,          0,        1,    16384, 0x3c987914

tests/ref/fate/dds-dxt5-normalmap

+#tb 0: 1/25
+0,          0,          0,        1,    16384, 0xd29b1ea1

tests/ref/fate/dds-dxt5-normalmap-ati

+#tb 0: 1/25
+0,          0,          0,        1,    16384, 0x54cb212f

tests/ref/fate/dds-dxt5-rbxg

+#tb 0: 1/25
+0,          0,          0,        1,    16384, 0x37588d12

tests/ref/fate/dds-dxt5-rgxb

+#tb 0: 1/25
+0,          0,          0,        1,    16384, 0xfb6b91cf

tests/ref/fate/dds-dxt5-rxbg

+#tb 0: 1/25
+0,          0,          0,        1,    16384, 0xc6cb8cbe

tests/ref/fate/dds-dxt5-rxgb

+#tb 0: 1/25
+0,          0,          0,        1,    16384, 0xb67d936a

tests/ref/fate/dds-dxt5-xgbr

+#tb 0: 1/25
+0,          0,          0,        1,    16384, 0xb0e69293

tests/ref/fate/dds-dxt5-xgxr

+#tb 0: 1/25
+0,          0,          0,        1,    16384, 0xa93de1ad

tests/ref/fate/dds-dxt5-xrbg

+#tb 0: 1/25
+0,          0,          0,        1,    16384, 0xf20d8b69

tests/ref/fate/dds-dxt5-ycocg

+#tb 0: 1/25
+0,          0,          0,        1,    16384, 0x0d0c8d20

tests/ref/fate/dds-dxt5-ycocg-scaled

+#tb 0: 1/25
+0,          0,          0,        1,    16384, 0x5a089973

tests/ref/fate/dds-pal

+#tb 0: 1/25
+0,          0,          0,        1,    65536, 0xbffee5cd

tests/ref/fate/dds-pal-ati

+#tb 0: 1/25
+0,          0,          0,        1,    16384, 0x23068060

tests/ref/fate/dds-rgb16

+#tb 0: 1/25
+0,          0,          0,        1,    32768, 0x1ec4fed2

tests/ref/fate/dds-rgb24

+#tb 0: 1/25
+0,          0,          0,        1,    32768, 0xcf0f7833

tests/ref/fate/dds-rgtc1s

+#tb 0: 1/25
+0,          0,          0,        1,    16384, 0xcda652a4

tests/ref/fate/dds-rgtc1u

+#tb 0: 1/25
+0,          0,          0,        1,    16384, 0x629a1b44

tests/ref/fate/dds-rgtc2s

+#tb 0: 1/25
+0,          0,          0,        1,    16384, 0xa0135ca8

tests/ref/fate/dds-rgtc2u

+#tb 0: 1/25
+0,          0,          0,        1,    16384, 0x38cb221a

tests/ref/fate/dds-rgtc2u-xy

+#tb 0: 1/25
+0,          0,          0,        1,    16384, 0x79bd207e

tests/ref/fate/dds-uyvy

+#tb 0: 1/25
+0,          0,          0,        1,    16384, 0xd579a59e

tests/ref/fate/dds-xbgr

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

tests/ref/fate/dds-xrgb

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

tests/ref/fate/dds-y

+#tb 0: 1/25
+0,          0,          0,        1,    32768, 0xc51add1c

tests/ref/fate/dds-ya

+#tb 0: 1/25
+0,          0,          0,        1,    56320, 0xa614eb1e

tests/ref/fate/dds-ycocg

+#tb 0: 1/25
+0,          0,          0,        1,    16384, 0x4cb08d0a

tests/ref/fate/dds-yuyv

+#tb 0: 1/25
+0,          0,          0,        1,    16384, 0xd579a59e