Commit 7bd9d66e authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf
Browse files

Map Voxware MetaSound Codec IDs

parent 6283a220
...@@ -235,6 +235,7 @@ ATTR_PACKED ...@@ -235,6 +235,7 @@ ATTR_PACKED
#define WAVE_FORMAT_MPEGLAYER3 0x0055 /* ISO/MPEG Layer3 Format Tag */ #define WAVE_FORMAT_MPEGLAYER3 0x0055 /* ISO/MPEG Layer3 Format Tag */
#define WAVE_FORMAT_AMR_NB 0x0057 /* AMR NB */ #define WAVE_FORMAT_AMR_NB 0x0057 /* AMR NB */
#define WAVE_FORMAT_AMR_WB 0x0058 /* AMR Wideband */ #define WAVE_FORMAT_AMR_WB 0x0058 /* AMR Wideband */
#define WAVE_FORMAT_VOXWARE_RT29 0x0075 /* VoxWare MetaSound */
#define WAVE_FORMAT_DOLBY_AC3_SPDIF 0x0092 /* Sonic Foundry */ #define WAVE_FORMAT_DOLBY_AC3_SPDIF 0x0092 /* Sonic Foundry */
#define WAVE_FORMAT_AAC 0x00FF /* */ #define WAVE_FORMAT_AAC 0x00FF /* */
...@@ -396,6 +397,8 @@ wave_format_tag_to_fourcc[] = ...@@ -396,6 +397,8 @@ wave_format_tag_to_fourcc[] =
{ WAVE_FORMAT_ULEAD_DV_AUDIO_NTSC, VLC_CODEC_ULEAD_DV_AUDIO_NTSC, "Ulead DV audio NTSC" }, { WAVE_FORMAT_ULEAD_DV_AUDIO_NTSC, VLC_CODEC_ULEAD_DV_AUDIO_NTSC, "Ulead DV audio NTSC" },
{ WAVE_FORMAT_ULEAD_DV_AUDIO_PAL, VLC_CODEC_ULEAD_DV_AUDIO_PAL, "Ulead DV audio PAL" }, { WAVE_FORMAT_ULEAD_DV_AUDIO_PAL, VLC_CODEC_ULEAD_DV_AUDIO_PAL, "Ulead DV audio PAL" },
{ WAVE_FORMAT_INDEO_AUDIO, VLC_CODEC_INDEO_AUDIO, "Indeo Audio Coder" }, { WAVE_FORMAT_INDEO_AUDIO, VLC_CODEC_INDEO_AUDIO, "Indeo Audio Coder" },
{ WAVE_FORMAT_VOXWARE_RT29,VLC_CODEC_METASOUND, "VoxWare MetaSound" },
{ WAVE_FORMAT_UNKNOWN, VLC_FOURCC( 'u', 'n', 'd', 'f' ), "Unknown" } { WAVE_FORMAT_UNKNOWN, VLC_FOURCC( 'u', 'n', 'd', 'f' ), "Unknown" }
}; };
......
...@@ -364,6 +364,7 @@ ...@@ -364,6 +364,7 @@
#define VLC_CODEC_ULEAD_DV_AUDIO_NTSC VLC_FOURCC('m','s',0x02,0x15) #define VLC_CODEC_ULEAD_DV_AUDIO_NTSC VLC_FOURCC('m','s',0x02,0x15)
#define VLC_CODEC_ULEAD_DV_AUDIO_PAL VLC_FOURCC('m','s',0x02,0x16) #define VLC_CODEC_ULEAD_DV_AUDIO_PAL VLC_FOURCC('m','s',0x02,0x16)
#define VLC_CODEC_INDEO_AUDIO VLC_FOURCC('m','s',0x04,0x02) #define VLC_CODEC_INDEO_AUDIO VLC_FOURCC('m','s',0x04,0x02)
#define VLC_CODEC_METASOUND VLC_FOURCC('m','s',0x00,0x75)
/* Subtitle */ /* Subtitle */
#define VLC_CODEC_SPU VLC_FOURCC('s','p','u',' ') #define VLC_CODEC_SPU VLC_FOURCC('s','p','u',' ')
......
...@@ -414,6 +414,10 @@ static const struct ...@@ -414,6 +414,10 @@ static const struct
{ VLC_CODEC_INDEO_AUDIO, AV_CODEC_ID_IAC, AUDIO_ES }, { VLC_CODEC_INDEO_AUDIO, AV_CODEC_ID_IAC, AUDIO_ES },
#endif #endif
#if LIBAVCODEC_VERSION_CHECK( 55, 15, 0, 24, 100 )
{ VLC_CODEC_METASOUND, AV_CODEC_ID_METASOUND, AUDIO_ES },
#endif
/* PCM */ /* PCM */
{ VLC_CODEC_S8, AV_CODEC_ID_PCM_S8, AUDIO_ES }, { VLC_CODEC_S8, AV_CODEC_ID_PCM_S8, AUDIO_ES },
{ VLC_CODEC_U8, AV_CODEC_ID_PCM_U8, AUDIO_ES }, { VLC_CODEC_U8, AV_CODEC_ID_PCM_U8, AUDIO_ES },
......
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