avcodec: map GameCube THP video and audio

Sample:
http://samples.mplayerhq.hu/game-formats/thp/AfterCredits.thp

Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

diff --git a/include/vlc_fourcc.h b/include/vlc_fourcc.h
index 3f108bf1dbf01abe14a809c235df247ef27a3c15..dcce5b2396281d87c10afd80f946a8140ac3e396 100644 (file)
--- a/include/vlc_fourcc.h
+++ b/include/vlc_fourcc.h
@@ -142,6 +142,7 @@
 #define VLC_CODEC_XAN_WC4         VLC_FOURCC('X','x','a','n')
 #define VLC_CODEC_LCL_MSZH        VLC_FOURCC('M','S','Z','H')
 #define VLC_CODEC_LCL_ZLIB        VLC_FOURCC('Z','L','I','B')
+#define VLC_CODEC_THP             VLC_FOURCC('T','H','P','0')
 
 /* Planar YUV 4:1:0 Y:V:U */
 #define VLC_CODEC_YV9             VLC_FOURCC('Y','V','U','9')
@@ -317,6 +318,7 @@
 #define VLC_CODEC_ADPCM_YAMAHA               VLC_FOURCC('m','s',0x00,0x20)
 #define VLC_CODEC_ADPCM_DK3                  VLC_FOURCC('m','s',0x00,0x62)
 #define VLC_CODEC_ADPCM_DK4                  VLC_FOURCC('m','s',0x00,0x61)
+#define VLC_CODEC_ADPCM_THP                  VLC_FOURCC('T','H','P','A')
 #define VLC_CODEC_G723_1                     VLC_FOURCC('g','7','2', 0x31)
 #define VLC_CODEC_G729                       VLC_FOURCC('g','7','2','9')
 #define VLC_CODEC_VMDAUDIO                   VLC_FOURCC('v','m','d','a')

diff --git a/modules/codec/avcodec/fourcc.c b/modules/codec/avcodec/fourcc.c
index 28fc1428f171331acc54474265adf499f94469ba..dd3411c36014ba549bdee5707b0204ea766ea82c 100644 (file)
--- a/modules/codec/avcodec/fourcc.c
+++ b/modules/codec/avcodec/fourcc.c
@@ -153,7 +153,7 @@ static const struct
     { VLC_CODEC_GIF, AV_CODEC_ID_GIF, VIDEO_ES },
     /* AV_CODEC_ID_DXA */
     { VLC_CODEC_DNXHD, AV_CODEC_ID_DNXHD, VIDEO_ES },
-    /* AV_CODEC_ID_THP */
+    { VLC_CODEC_THP, AV_CODEC_ID_THP, VIDEO_ES },
     { VLC_CODEC_SGI, AV_CODEC_ID_SGI, VIDEO_ES },
     /* AV_CODEC_ID_C93 */
     /* AV_CODEC_ID_BETHSOFTVID */
@@ -331,7 +331,7 @@ static const struct
     /* AV_CODEC_ID_ADPCM_SBPRO_4 */
     /* AV_CODEC_ID_ADPCM_SBPRO_3 */
     /* AV_CODEC_ID_ADPCM_SBPRO_2 */
-    /* AV_CODEC_ID_ADPCM_THP */
+    { VLC_CODEC_ADPCM_THP, AV_CODEC_ID_ADPCM_THP, AUDIO_ES },
     { VLC_CODEC_ADPCM_IMA_AMV, AV_CODEC_ID_ADPCM_IMA_AMV, AUDIO_ES },
     /* AV_CODEC_ID_ADPCM_EA_R1 */
     /* AV_CODEC_ID_ADPCM_EA_R3 */

diff --git a/src/misc/fourcc.c b/src/misc/fourcc.c
index ba600a2e8d4e4ef4f65f7017d2b8e9b7cde39099..4252e6b51661ef9c1b63198f554039be0897277a 100644 (file)
--- a/src/misc/fourcc.c
+++ b/src/misc/fourcc.c
@@ -1008,6 +1008,8 @@ static const staticentry_t p_list_video[] = {
     B(VLC_CODEC_LCL_ZLIB, "Loss-Less Codec Library AVIzlib"),
         A("ZLIB"),
 
+    B(VLC_CODEC_THP, "GameCube THP video"),
+
     B(0, "")
 };
 static const staticentry_t p_list_audio[] = {
@@ -1193,6 +1195,8 @@ static const staticentry_t p_list_audio[] = {
     B(VLC_CODEC_ADPCM_DK4, "Duck DK4 ADPCM"),
         A("ms\x00\x61"),
 
+    B(VLC_CODEC_ADPCM_THP, "GameCube THP ADPCM"),
+
     /* AMR */
     B(VLC_CODEC_AMR_NB, "AMR narrow band"),
         A("samr"),