Commit 1d341492 authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf

Decode G.726 in Wav

parent d2bf9548
...@@ -339,6 +339,7 @@ static int Open( vlc_object_t * p_this ) ...@@ -339,6 +339,7 @@ static int Open( vlc_object_t * p_this )
/* FIXME set end of area FIXME */ /* FIXME set end of area FIXME */
goto error; goto error;
case VLC_CODEC_GSM_MS: case VLC_CODEC_GSM_MS:
case VLC_CODEC_ADPCM_G726:
if( FrameInfo_MSGSM( &p_sys->i_frame_size, &p_sys->i_frame_samples, if( FrameInfo_MSGSM( &p_sys->i_frame_size, &p_sys->i_frame_samples,
&p_sys->fmt ) ) &p_sys->fmt ) )
goto error; goto error;
...@@ -351,12 +352,13 @@ static int Open( vlc_object_t * p_this ) ...@@ -351,12 +352,13 @@ static int Open( vlc_object_t * p_this )
if( p_sys->i_frame_size <= 0 || p_sys->i_frame_samples <= 0 ) if( p_sys->i_frame_size <= 0 || p_sys->i_frame_samples <= 0 )
{ {
msg_Dbg( p_demux, "invalid frame size" ); msg_Dbg( p_demux, "invalid frame size: %i %i", p_sys->i_frame_size,
p_sys->i_frame_samples );
goto error; goto error;
} }
if( p_sys->fmt.audio.i_rate <= 0 ) if( p_sys->fmt.audio.i_rate <= 0 )
{ {
msg_Dbg( p_demux, "invalid sample rate" ); msg_Dbg( p_demux, "invalid sample rate: %i", p_sys->fmt.audio.i_rate );
goto error; goto error;
} }
...@@ -385,6 +387,7 @@ static int Open( vlc_object_t * p_this ) ...@@ -385,6 +387,7 @@ static int Open( vlc_object_t * p_this )
return VLC_SUCCESS; return VLC_SUCCESS;
error: error:
msg_Err( p_demux, "An error occured during wav demuxing" );
free( p_wf ); free( p_wf );
free( p_sys ); free( p_sys );
return VLC_EGENERIC; return VLC_EGENERIC;
......
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