Commit 03609aed authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf
Browse files

Use a VLC_CODEC_ADPCM_MS for MS ADPCM

parent e5fc0bfd
...@@ -302,7 +302,7 @@ static const struct ...@@ -302,7 +302,7 @@ static const struct
wave_format_tag_to_fourcc[] = wave_format_tag_to_fourcc[] =
{ {
{ WAVE_FORMAT_PCM, VLC_FOURCC( 'a', 'r', 'a', 'w' ), "Raw audio" }, { 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_IEEE_FLOAT, VLC_FOURCC( 'a', 'f', 'l', 't' ), "IEEE Float audio" },
{ WAVE_FORMAT_ALAW, VLC_CODEC_ALAW, "A-Law" }, { WAVE_FORMAT_ALAW, VLC_CODEC_ALAW, "A-Law" },
{ WAVE_FORMAT_MULAW, VLC_CODEC_MULAW, "Mu-Law" }, { WAVE_FORMAT_MULAW, VLC_CODEC_MULAW, "Mu-Law" },
......
...@@ -221,6 +221,7 @@ ...@@ -221,6 +221,7 @@
#define VLC_CODEC_VMDAUDIO VLC_FOURCC('v','m','d','a') #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_G726 VLC_FOURCC('g','7','2','6')
#define VLC_CODEC_ADPCM_SWF VLC_FOURCC('S','W','F','a') #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_NB VLC_FOURCC('s','a','m','r')
#define VLC_CODEC_AMR_WB VLC_FOURCC('s','a','w','b') #define VLC_CODEC_AMR_WB VLC_FOURCC('s','a','w','b')
#define VLC_CODEC_ALAC VLC_FOURCC('a','l','a','c') #define VLC_CODEC_ALAC VLC_FOURCC('a','l','a','c')
......
...@@ -177,7 +177,7 @@ static int OpenDecoder( vlc_object_t *p_this ) ...@@ -177,7 +177,7 @@ static int OpenDecoder( vlc_object_t *p_this )
case VLC_FOURCC('m','s',0x00,0x11): /* IMA ADPCM */ case VLC_FOURCC('m','s',0x00,0x11): /* IMA ADPCM */
p_sys->codec = ADPCM_IMA_WAV; p_sys->codec = ADPCM_IMA_WAV;
break; break;
case VLC_FOURCC('m','s',0x00,0x02): /* MS ADPCM */ case VLC_CODEC_ADPCM_MS: /* MS ADPCM */
p_sys->codec = ADPCM_MS; p_sys->codec = ADPCM_MS;
break; break;
case VLC_FOURCC('m','s',0x00,0x61): /* Duck DK4 ADPCM */ case VLC_FOURCC('m','s',0x00,0x61): /* Duck DK4 ADPCM */
......
...@@ -318,7 +318,7 @@ static int Open( vlc_object_t * p_this ) ...@@ -318,7 +318,7 @@ static int Open( vlc_object_t * p_this )
&p_sys->fmt ) ) &p_sys->fmt ) )
goto error; goto error;
break; 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, if( FrameInfo_MS_ADPCM( &p_sys->i_frame_size, &p_sys->i_frame_samples,
&p_sys->fmt ) ) &p_sys->fmt ) )
goto error; goto error;
......
...@@ -893,6 +893,10 @@ static const entry_t p_list_audio[] = { ...@@ -893,6 +893,10 @@ static const entry_t p_list_audio[] = {
B(VLC_CODEC_ADPCM_IMA_WS, "Westwood IMA ADPCM audio"), B(VLC_CODEC_ADPCM_IMA_WS, "Westwood IMA ADPCM audio"),
A("AIWS"), A("AIWS"),
/* MS ADPCM */
B(VLC_CODEC_ADPCM_MS, "MS ADPCM audio"),
A("ms\x00\x02"),
/* Sierra VMD */ /* Sierra VMD */
B(VLC_CODEC_VMDAUDIO, "Sierra VMD Audio"), B(VLC_CODEC_VMDAUDIO, "Sierra VMD Audio"),
A("vmda"), A("vmda"),
......
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