Use a VLC_CODEC_ADPCM_MS for MS ADPCM

diff --git a/include/vlc_codecs.h b/include/vlc_codecs.h
index 7dee806ae5b3dac4df6fd7e7b926d0081b48e618..dcf555c4e50dd7f1ad0981626690ee608dc275c8 100644 (file)
--- a/include/vlc_codecs.h
+++ b/include/vlc_codecs.h
@@ -302,7 +302,7 @@ static const struct
 wave_format_tag_to_fourcc[] =
 {
     { WAVE_FORMAT_PCM,        VLC_FOURCC( 'a', 'r', 'a', 'w' ), "Raw audio" },
-    { WAVE_FORMAT_ADPCM,      VLC_FOURCC( 'm', 's', 0x00,0x02), "ADPCM" },
+    { WAVE_FORMAT_ADPCM,      VLC_CODEC_ADPCM_MS,               "ADPCM" },
     { WAVE_FORMAT_IEEE_FLOAT, VLC_FOURCC( 'a', 'f', 'l', 't' ), "IEEE Float audio" },
     { WAVE_FORMAT_ALAW,       VLC_CODEC_ALAW,                   "A-Law" },
     { WAVE_FORMAT_MULAW,      VLC_CODEC_MULAW,                  "Mu-Law" },

diff --git a/include/vlc_fourcc.h b/include/vlc_fourcc.h
index aec860255c068f3ac2271323fa855ec5709c4c74..197451850139fc7ab117004cb9c1d0cbabb37bbe 100644 (file)
--- a/include/vlc_fourcc.h
+++ b/include/vlc_fourcc.h
@@ -221,6 +221,7 @@
 #define VLC_CODEC_VMDAUDIO  VLC_FOURCC('v','m','d','a')
 #define VLC_CODEC_ADPCM_G726 VLC_FOURCC('g','7','2','6')
 #define VLC_CODEC_ADPCM_SWF VLC_FOURCC('S','W','F','a')
+#define VLC_CODEC_ADPCM_MS  VLC_FOURCC('m','s',0x00,0x02)
 #define VLC_CODEC_AMR_NB    VLC_FOURCC('s','a','m','r')
 #define VLC_CODEC_AMR_WB    VLC_FOURCC('s','a','w','b')
 #define VLC_CODEC_ALAC      VLC_FOURCC('a','l','a','c')

diff --git a/modules/codec/adpcm.c b/modules/codec/adpcm.c
index 81ac8ea8c87cef60dd85bb36b51bac1fa8ee55f7..0639cee0f2cf05b91e1baaa3e2458d1cffa332a1 100644 (file)
--- a/modules/codec/adpcm.c
+++ b/modules/codec/adpcm.c
@@ -177,7 +177,7 @@ static int OpenDecoder( vlc_object_t *p_this )
         case VLC_FOURCC('m','s',0x00,0x11): /* IMA ADPCM */
             p_sys->codec = ADPCM_IMA_WAV;
             break;
-        case VLC_FOURCC('m','s',0x00,0x02): /* MS ADPCM */
+        case VLC_CODEC_ADPCM_MS: /* MS ADPCM */
             p_sys->codec = ADPCM_MS;
             break;
         case VLC_FOURCC('m','s',0x00,0x61): /* Duck DK4 ADPCM */

diff --git a/modules/demux/wav.c b/modules/demux/wav.c
index 30d10dc1c7049f5871db4be493593c5408a1140f..f06f83fe8018eabd06a396d7a5888a2a79e98636 100644 (file)
--- a/modules/demux/wav.c
+++ b/modules/demux/wav.c
@@ -318,7 +318,7 @@ static int Open( vlc_object_t * p_this )
                            &p_sys->fmt ) )
             goto error;
         break;
-    case VLC_FOURCC( 'm', 's', 0x00, 0x02 ):
+    case VLC_CODEC_ADPCM_MS:
         if( FrameInfo_MS_ADPCM( &p_sys->i_frame_size, &p_sys->i_frame_samples,
                                 &p_sys->fmt ) )
             goto error;

diff --git a/src/misc/fourcc.c b/src/misc/fourcc.c
index c473fa248e2f0dd6aa3cbbb079d99da4bf5adc41..ae9d3e17124cb4d4421c3e9cec65ac6c6ef8c335 100644 (file)
--- a/src/misc/fourcc.c
+++ b/src/misc/fourcc.c
@@ -893,6 +893,10 @@ static const entry_t p_list_audio[] = {
     B(VLC_CODEC_ADPCM_IMA_WS, "Westwood IMA ADPCM audio"),
         A("AIWS"),
 
+    /* MS ADPCM */
+    B(VLC_CODEC_ADPCM_MS, "MS ADPCM audio"),
+        A("ms\x00\x02"),
+
     /* Sierra VMD */
     B(VLC_CODEC_VMDAUDIO, "Sierra VMD Audio"),
         A("vmda"),