From 84daf8cefd493990c4936764e00bba46e77409e5 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Kempf Date: Sat, 5 Dec 2009 19:06:20 +0100 Subject: [PATCH] Support for AMV video files. It seems that .mtv files don't work though --- NEWS | 2 +- include/vlc_fourcc.h | 2 ++ include/vlc_interface.h | 2 +- modules/codec/avcodec/fourcc.c | 3 +++ src/misc/fourcc.c | 4 ++++ 5 files changed, 11 insertions(+), 2 deletions(-) diff --git a/NEWS b/NEWS index c198527085..5a8bd6c1d5 100644 --- a/NEWS +++ b/NEWS @@ -19,7 +19,7 @@ Demuxers: * Support for ADPCM in .flv streams * EXPERIMENTAL support for .aob files from DVD-Audio (MLP and LPCM) (Full disc support is NOT present yet) - * Support for TwinVQ (.vqf) files + * Support for TwinVQ (.vqf) and AMV (.amv) files * Various EGP improvements Playlist: diff --git a/include/vlc_fourcc.h b/include/vlc_fourcc.h index dc025802cc..aec513dc5f 100644 --- a/include/vlc_fourcc.h +++ b/include/vlc_fourcc.h @@ -111,6 +111,7 @@ #define VLC_CODEC_VMDVIDEO VLC_FOURCC('V','M','D','V') #define VLC_CODEC_CDG VLC_FOURCC('C','D','G',' ') #define VLC_CODEC_FRWU VLC_FOURCC('F','R','W','U') +#define VLC_CODEC_AMV VLC_FOURCC('A','M','V',' ') /* Planar YUV 4:2:0 Y:V:U */ @@ -270,6 +271,7 @@ #define VLC_CODEC_FL32 VLC_FOURCC('f','l','3','2') #define VLC_CODEC_FL64 VLC_FOURCC('f','l','6','4') #define VLC_CODEC_TWINVQ VLC_FOURCC('T','W','I','N') +#define VLC_CODEC_ADPCM_IMA_AMV VLC_FOURCC('i','m','a','v') /* Subtitle */ #define VLC_CODEC_SPU VLC_FOURCC('s','p','u',' ') diff --git a/include/vlc_interface.h b/include/vlc_interface.h index 4e455391e1..e94222007c 100644 --- a/include/vlc_interface.h +++ b/include/vlc_interface.h @@ -173,7 +173,7 @@ typedef enum vlc_dialog { "*.oga;*.ogg;*.oma;*.s3m;*.spx;" \ "*.vqf;*.w64;*.wav;*.wma;*.wv;*.xm" -#define EXTENSIONS_VIDEO "*.asf;*.avi;*.divx;*.dv;*.flv;*.gxf;*.iso;*.m1v;*.m2v;" \ +#define EXTENSIONS_VIDEO "*.amv;*.asf;*.avi;*.divx;*.dv;*.flv;*.gxf;*.iso;*.m1v;*.m2v;" \ "*.m2t;*.m2ts;*.m4v;*.mkv;*.mov;*.mp2;*.mp4;*.mpeg;*.mpeg1;" \ "*.mpeg2;*.mpeg4;*.mpg;*.mts;*.mxf;*.nuv;" \ "*.ogg;*.ogm;*.ogv;*.ogx;*.ps;" \ diff --git a/modules/codec/avcodec/fourcc.c b/modules/codec/avcodec/fourcc.c index 94b5d8f89a..bd751bf91d 100644 --- a/modules/codec/avcodec/fourcc.c +++ b/modules/codec/avcodec/fourcc.c @@ -213,6 +213,8 @@ static const struct { VLC_CODEC_VMDVIDEO, CODEC_ID_VMDVIDEO, VIDEO_ES }, + { VLC_CODEC_AMV, CODEC_ID_AMV, VIDEO_ES }, + #if 0 /* UNTESTED VideoGames*/ { VLC_FOURCC('W','C','3','V'), CODEC_ID_XAN_WC3, @@ -299,6 +301,7 @@ static const struct { VLC_CODEC_ADPCM_IMA_WS, CODEC_ID_ADPCM_IMA_WS, AUDIO_ES }, { VLC_CODEC_ADPCM_MS, CODEC_ID_ADPCM_MS, AUDIO_ES }, { VLC_CODEC_ADPCM_IMA_WAV, CODEC_ID_ADPCM_IMA_WAV, AUDIO_ES }, + { VLC_CODEC_ADPCM_IMA_AMV, CODEC_ID_ADPCM_IMA_AMV, AUDIO_ES }, { VLC_CODEC_VMDAUDIO, CODEC_ID_VMDAUDIO, AUDIO_ES }, diff --git a/src/misc/fourcc.c b/src/misc/fourcc.c index 2ffbe22f51..04af41a2eb 100644 --- a/src/misc/fourcc.c +++ b/src/misc/fourcc.c @@ -591,6 +591,8 @@ static const entry_t p_list_video[] = { A("AVs2"), A("avs2"), + B(VLC_CODEC_AMV, "AMV"), + /* */ B(VLC_CODEC_DNXHD, "DNxHD"), A("AVdn"), @@ -920,6 +922,8 @@ static const entry_t p_list_audio[] = { B(VLC_CODEC_ADPCM_IMA_WAV, "IMA WAV ADPCM Audio"), A("ms\x00\x11"), + B(VLC_CODEC_ADPCM_IMA_AMV, "IMA AMV ADPCM Audio"), + /* AMR */ B(VLC_CODEC_AMR_NB, "AMR narrow band"), A("samr"), -- 2.39.2