Commit 7289f1e5 authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf
Browse files

Use VLC_CODEC for ADPCM_IMA_WAV

parent 723b7b01
......@@ -306,7 +306,7 @@ wave_format_tag_to_fourcc[] =
{ 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" },
{ WAVE_FORMAT_IMA_ADPCM, VLC_FOURCC( 'm', 's', 0x00,0x11), "Ima-ADPCM" },
{ WAVE_FORMAT_IMA_ADPCM, VLC_CODEC_ADPCM_IMA_WAV, "Ima-ADPCM" },
{ WAVE_FORMAT_TRUESPEECH, VLC_FOURCC(0x22, 0x0, 0x0, 0x0 ), "Truespeech" },
{ WAVE_FORMAT_GSM610, VLC_CODEC_GSM_MS, "Microsoft WAV GSM" },
{ WAVE_FORMAT_G726, VLC_CODEC_ADPCM_G726, "G.726 ADPCM" },
......
......@@ -218,10 +218,11 @@
#define VLC_CODEC_ADPCM_XA VLC_FOURCC('x','a',' ',' ')
#define VLC_CODEC_ADPCM_ADX VLC_FOURCC('a','d','x',' ')
#define VLC_CODEC_ADPCM_IMA_WS VLC_FOURCC('A','I','W','S')
#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_ADPCM_IMA_WAV VLC_FOURCC('m','s',0x00,0x11)
#define VLC_CODEC_VMDAUDIO VLC_FOURCC('v','m','d','a')
#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')
......
......@@ -174,7 +174,7 @@ static int OpenDecoder( vlc_object_t *p_this )
case VLC_FOURCC('i','m','a', '4'): /* IMA ADPCM */
p_sys->codec = ADPCM_IMA_QT;
break;
case VLC_FOURCC('m','s',0x00,0x11): /* IMA ADPCM */
case VLC_CODEC_ADPCM_IMA_WAV: /* IMA ADPCM */
p_sys->codec = ADPCM_IMA_WAV;
break;
case VLC_CODEC_ADPCM_MS: /* MS ADPCM */
......
......@@ -323,7 +323,7 @@ static int Open( vlc_object_t * p_this )
&p_sys->fmt ) )
goto error;
break;
case VLC_FOURCC( 'm', 's', 0x00, 0x11 ):
case VLC_CODEC_ADPCM_IMA_WAV:
if( FrameInfo_IMA_ADPCM( &p_sys->i_frame_size, &p_sys->i_frame_samples,
&p_sys->fmt ) )
goto error;
......
......@@ -909,6 +909,8 @@ static const entry_t p_list_audio[] = {
B(VLC_CODEC_ADPCM_SWF, "Flash ADPCM Audio"),
A("SWFa"),
B(VLC_CODEC_ADPCM_IMA_WAV, "IMA WAV ADPCM Audio"),
A("ms\x00\x11"),
/* AMR */
B(VLC_CODEC_AMR_NB, "AMR narrow band"),
......
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