TDSC decoder

Signed-off-by: NVittorio Giovara <vittorio.giovara@gmail.com>

Changelog

@@ -22,6 +22,7 @@ version <next>:
 - Canopus HQX decoder
 - RTP depacketization of T.140 text (RFC 4103)
 - VP9 RTP payload format (draft 0) experimental depacketizer
+- TDSC decoder
 
 
 version 11:

configure

@@ -1906,6 +1906,8 @@ svq1_encoder_select="aandcttables hpeldsp me_cmp mpegvideoenc"
 svq3_decoder_select="h264_decoder hpeldsp tpeldsp"
 svq3_decoder_suggest="zlib"
 tak_decoder_select="audiodsp"
+tdsc_decoder_deps="zlib"
+tdsc_decoder_select="mjpeg_decoder"
 theora_decoder_select="vp3_decoder"
 thp_decoder_select="mjpeg_decoder"
 tiff_decoder_suggest="zlib"

doc/general.texi

@@ -409,6 +409,7 @@ library:
 @item Sony Wave64 (W64)         @tab   @tab X
 @item SoX native format         @tab X @tab X
 @item SUN AU format             @tab X @tab X
+@item TDSC                      @tab   @tab X
 @item Text files                @tab   @tab X
 @item THP                       @tab   @tab X
     @tab Used on the Nintendo GameCube.

libavcodec/Makefile

@@ -377,6 +377,7 @@ OBJS-$(CONFIG_SVQ3_DECODER)            += svq3.o svq13.o mpegutils.o
 OBJS-$(CONFIG_TAK_DECODER)             += takdec.o tak.o
 OBJS-$(CONFIG_TARGA_DECODER)           += targa.o
 OBJS-$(CONFIG_TARGA_ENCODER)           += targaenc.o rle.o
+OBJS-$(CONFIG_TDSC_DECODER)            += tdsc.o
 OBJS-$(CONFIG_TIERTEXSEQVIDEO_DECODER) += tiertexseqv.o
 OBJS-$(CONFIG_TIFF_DECODER)            += tiff.o lzw.o faxcompr.o
 OBJS-$(CONFIG_TIFF_ENCODER)            += tiffenc.o rle.o lzwenc.o

libavcodec/allcodecs.c

@@ -243,6 +243,7 @@ void avcodec_register_all(void)
     REGISTER_ENCDEC (SVQ1,              svq1);
     REGISTER_DECODER(SVQ3,              svq3);
     REGISTER_ENCDEC (TARGA,             targa);
+    REGISTER_DECODER(TDSC,              tdsc);
     REGISTER_DECODER(THEORA,            theora);
     REGISTER_DECODER(THP,               thp);
     REGISTER_DECODER(TIERTEXSEQVIDEO,   tiertexseqvideo);

libavcodec/avcodec.h

@@ -294,6 +294,7 @@ enum AVCodecID {
     AV_CODEC_ID_MVC1,
     AV_CODEC_ID_MVC2,
     AV_CODEC_ID_HQX,
+    AV_CODEC_ID_TDSC,
 
     /* various PCM "codecs" */
     AV_CODEC_ID_FIRST_AUDIO = 0x10000,     ///< A dummy id pointing at the start of audio codecs

libavcodec/codec_desc.c

@@ -1285,6 +1285,13 @@ static const AVCodecDescriptor codec_descriptors[] = {
         .long_name = NULL_IF_CONFIG_SMALL("Truevision Targa image"),
         .props     = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSLESS,
     },
+    {
+        .id        = AV_CODEC_ID_TDSC,
+        .type      = AVMEDIA_TYPE_VIDEO,
+        .name      = "tdsc",
+        .long_name = NULL_IF_CONFIG_SMALL("TDSC"),
+        .props     = AV_CODEC_PROP_LOSSY,
+    },
     {
         .id        = AV_CODEC_ID_TIFF,
         .type      = AVMEDIA_TYPE_VIDEO,

libavcodec/version.h

@@ -29,7 +29,7 @@
 #include "libavutil/version.h"
 
 #define LIBAVCODEC_VERSION_MAJOR 56
-#define LIBAVCODEC_VERSION_MINOR 17
+#define LIBAVCODEC_VERSION_MINOR 18
 #define LIBAVCODEC_VERSION_MICRO  0
 
 #define LIBAVCODEC_VERSION_INT  AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \

libavformat/riff.c

@@ -352,6 +352,7 @@ const AVCodecTag ff_codec_bmp_tags[] = {
     { AV_CODEC_ID_PRORES,       MKTAG('A', 'P', 'C', 'H') },
     { AV_CODEC_ID_QTRLE,        MKTAG('r', 'l', 'e', ' ') },
     { AV_CODEC_ID_HQX,          MKTAG('C', 'H', 'Q', 'X') },
+    { AV_CODEC_ID_TDSC,         MKTAG('T', 'D', 'S', 'C') },
     { AV_CODEC_ID_NONE,         0 }
 };
 

tests/fate/video.mak

@@ -248,6 +248,9 @@ fate-sp5x: CMD = framecrc -idct simple -i $(TARGET_SAMPLES)/sp5x/sp5x_problem.av
 FATE_SAMPLES_AVCONV-$(call DEMDEC, SRT, SRT) += fate-sub-srt
 fate-sub-srt: CMD = md5 -i $(TARGET_SAMPLES)/sub/SubRip_capability_tester.srt -f ass
 
+FATE_SAMPLES_AVCONV-$(call DEMDEC, ASF, TDSC) += fate-tdsc
+fate-tdsc: CMD = framecrc -idct simple -i $(TARGET_SAMPLES)/tdsc/tdsc.asf -an -pix_fmt bgr24
+
 FATE_SAMPLES_AVCONV-$(call DEMDEC, THP, THP) += fate-thp
 fate-thp: CMD = framecrc -idct simple -i $(TARGET_SAMPLES)/thp/pikmin2-opening1-partial.thp -an
 

tests/ref/fate/tdsc

+#tb 0: 1/1000
+0,          0,          0,        0,  3888000, 0x9c498657
+0,        233,        233,        0,  3888000, 0x72a2ae22
+0,        266,        266,        0,  3888000, 0x72a2ae22
+0,        333,        333,        0,  3888000, 0x72a2ae22
+0,        533,        533,        0,  3888000, 0x72a2ae22
+0,        566,        566,        0,  3888000, 0x72a2ae22
+0,        666,        666,        0,  3888000, 0x550e417b
+0,        966,        966,        0,  3888000, 0x550e417b
+0,        999,        999,        0,  3888000, 0x550e417b
+0,       1033,       1033,        0,  3888000, 0x550e417b
+0,       1066,       1066,        0,  3888000, 0x550e417b
+0,       1133,       1133,        0,  3888000, 0x550e417b
+0,       1166,       1166,        0,  3888000, 0x38dcde13
+0,       1566,       1566,        0,  3888000, 0x2b7c0edd
+0,       1599,       1599,        0,  3888000, 0xaaaf3c7b
+0,       1633,       1633,        0,  3888000, 0x26d1710f
+0,       1666,       1666,        0,  3888000, 0xa6609f3f
+0,       1699,       1699,        0,  3888000, 0xaa41c6f3
+0,       1733,       1733,        0,  3888000, 0xc0ffd4d5
+0,       1766,       1766,        0,  3888000, 0x44d4f383
+0,       1833,       1833,        0,  3888000, 0x517047eb
+0,       1866,       1866,        0,  3888000, 0x1d5a4d5b
+0,       1899,       1899,        0,  3888000, 0x7d2da2f6
+0,       1933,       1933,        0,  3888000, 0x27f7a2f6
+0,       1966,       1966,        0,  3888000, 0x9de49edb
+0,       1999,       1999,        0,  3888000, 0x5ccb9f38
+0,       2033,       2033,        0,  3888000, 0x88069fb2
+0,       2066,       2066,        0,  3888000, 0x1d059fd3
+0,       2099,       2099,        0,  3888000, 0xe16d9fd3
+0,       2133,       2133,        0,  3888000, 0xb6a69fd3
+0,       2166,       2166,        0,  3888000, 0xb6a69fd3
+0,       2199,       2199,        0,  3888000, 0x61709fd3
+0,       2233,       2233,        0,  3888000, 0xb6f59fd3
+0,       2266,       2266,        0,  3888000, 0x5c7b9fd3
+0,       2299,       2299,        0,  3888000, 0x57869fd3
+0,       2333,       2333,        0,  3888000, 0x9d3f9fd3
+0,       2433,       2433,        0,  3888000, 0x5e6082a5
+0,       2466,       2466,        0,  3888000, 0x5e6082a5
+0,       2499,       2499,        0,  3888000, 0x5e6082a5
+0,       2533,       2533,        0,  3888000, 0x48ce82f3
+0,       2566,       2566,        0,  3888000, 0x4c5ebeaf