[vlc-commits] Added Ulead DV audio codecs and wave format tags.

[Laurent Aimar]

vlc | branch: master | Laurent Aimar <fenrir at videolan.org> | Fri Jun  1 20:39:02 2012 +0200| [21ad4798d719050dd00d8f7f379164d1090cf352] | committer: Laurent Aimar

Added Ulead DV audio codecs and wave format tags.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=21ad4798d719050dd00d8f7f379164d1090cf352
---

 include/vlc_codecs.h |    5 +++++
 include/vlc_fourcc.h |    2 ++
 src/misc/fourcc.c    |    5 +++++
 3 files changed, 12 insertions(+)

diff --git a/include/vlc_codecs.h b/include/vlc_codecs.h
index 9694974..f2ef74f 100644
--- a/include/vlc_codecs.h
+++ b/include/vlc_codecs.h
@@ -244,6 +244,9 @@ ATTR_PACKED
 #define WAVE_FORMAT_WMAP                0x0162 /* WMA 9 Professional */
 #define WAVE_FORMAT_WMAL                0x0163 /* WMA 9 Lossless */
 
+#define WAVE_FORMAT_ULEAD_DV_AUDIO_NTSC 0x0215 /* Ulead */
+#define WAVE_FORMAT_ULEAD_DV_AUDIO_PAL  0x0216 /* Ulead */
+
 #define WAVE_FORMAT_ATRAC3              0x0270 /* Atrac3, != from MSDN doc */
 #define WAVE_FORMAT_SONY_ATRAC3         0x0272 /* Atrac3, != from MSDN doc */
 
@@ -381,6 +384,8 @@ wave_format_tag_to_fourcc[] =
     { WAVE_FORMAT_FLAC,       VLC_CODEC_FLAC,                   "FLAC Audio" },
     { WAVE_FORMAT_GSM_AMR_FIXED, VLC_CODEC_AMR_NB,              "GSM-AMR Audio CBR, no SID" },
     { WAVE_FORMAT_GSM_AMR,    VLC_CODEC_AMR_NB,                 "GSM-AMR Audio VBR, SID" },
+    { 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_UNKNOWN,    VLC_FOURCC( 'u', 'n', 'd', 'f' ), "Unknown" }
 };
 
diff --git a/include/vlc_fourcc.h b/include/vlc_fourcc.h
index 8ba492d..19b08fa 100644
--- a/include/vlc_fourcc.h
+++ b/include/vlc_fourcc.h
@@ -330,6 +330,8 @@
 #define VLC_CODEC_FI32      VLC_FOURCC('f','i','3','2')
 #define VLC_CODEC_TWINVQ    VLC_FOURCC('T','W','I','N')
 #define VLC_CODEC_BMVAUDIO  VLC_FOURCC('B','M','V','A')
+#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)
 
 /* Subtitle */
 #define VLC_CODEC_SPU       VLC_FOURCC('s','p','u',' ')
diff --git a/src/misc/fourcc.c b/src/misc/fourcc.c
index 40d4fce..87bbe93 100644
--- a/src/misc/fourcc.c
+++ b/src/misc/fourcc.c
@@ -1285,6 +1285,11 @@ static const entry_t p_list_audio[] = {
     B(VLC_CODEC_BMVAUDIO, "Discworld II BMV audio"),
         A("BMVA"),
 
+    B(VLC_CODEC_ULEAD_DV_AUDIO_NTSC, "Ulead DV audio NTSC"),
+        A("ms\x02\x15"),
+    B(VLC_CODEC_ULEAD_DV_AUDIO_PAL, "Ulead DV audio PAL"),
+        A("ms\x02\x16"),
+
     B(0, "")
 };
 static const entry_t p_list_spu[] = {