Map Voxware MetaSound Codec IDs

diff --git a/include/vlc_codecs.h b/include/vlc_codecs.h
index f2b8daffc8c4aeefa2406fd16c63dcc5ee306540..91c2f03d1b98253d617ec279dcb3bc548ce53b0a 100644 (file)
--- a/include/vlc_codecs.h
+++ b/include/vlc_codecs.h
@@ -235,6 +235,7 @@ ATTR_PACKED
 #define WAVE_FORMAT_MPEGLAYER3          0x0055 /* ISO/MPEG Layer3 Format Tag */
 #define WAVE_FORMAT_AMR_NB              0x0057 /* AMR NB */
 #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_AAC                 0x00FF /* */
@@ -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_PAL, VLC_CODEC_ULEAD_DV_AUDIO_PAL, "Ulead DV audio PAL" },
     { 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" }
 };
 

diff --git a/include/vlc_fourcc.h b/include/vlc_fourcc.h
index 39e9737449b3b48caff88bfbae970c2b74d9fa09..70bc15e8f2b7946783e2cc53d34a0e630c55086e 100644 (file)
--- a/include/vlc_fourcc.h
+++ b/include/vlc_fourcc.h
@@ -364,6 +364,7 @@
 #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_INDEO_AUDIO                VLC_FOURCC('m','s',0x04,0x02)
+#define VLC_CODEC_METASOUND                  VLC_FOURCC('m','s',0x00,0x75)
 
 /* Subtitle */
 #define VLC_CODEC_SPU       VLC_FOURCC('s','p','u',' ')

diff --git a/modules/codec/avcodec/fourcc.c b/modules/codec/avcodec/fourcc.c
index 34bc509e770e0c8439b0528c3560b03ebf422bb7..3746ac84b7cb07136318726052196e04687b9a10 100644 (file)
--- a/modules/codec/avcodec/fourcc.c
+++ b/modules/codec/avcodec/fourcc.c
@@ -414,6 +414,10 @@ static const struct
     { VLC_CODEC_INDEO_AUDIO, AV_CODEC_ID_IAC, AUDIO_ES },
 #endif
 
+#if LIBAVCODEC_VERSION_CHECK( 55, 15, 0, 24, 100 )
+    { VLC_CODEC_METASOUND, AV_CODEC_ID_METASOUND, AUDIO_ES },
+#endif
+
     /* PCM */
     { VLC_CODEC_S8, AV_CODEC_ID_PCM_S8, AUDIO_ES },
     { VLC_CODEC_U8, AV_CODEC_ID_PCM_U8, AUDIO_ES },