Commit b9feb915 authored by Daniel Verkamp's avatar Daniel Verkamp Committed by Jean-Baptiste Kempf

avcodec: map GameCube THP video and audio

Sample:
http://samples.mplayerhq.hu/game-formats/thp/AfterCredits.thpSigned-off-by: Jean-Baptiste Kempf's avatarJean-Baptiste Kempf <jb@videolan.org>
parent 19092b04
......@@ -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')
......
......@@ -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 */
......
......@@ -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"),
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment