static const uint32_t pi_pair[] = { AOUT_CHAN_REARLEFT|AOUT_CHAN_REARRIGHT,
AOUT_CHAN_MIDDLELEFT|AOUT_CHAN_MIDDLERIGHT,
AOUT_CHAN_LEFT|AOUT_CHAN_RIGHT };
+ /* FIXME: Unused yet
static const uint32_t pi_center[] = { AOUT_CHAN_REARCENTER,
0,
- AOUT_CHAN_CENTER };
+ AOUT_CHAN_CENTER }; */
/* Try to complete with pair */
for( unsigned i = 0; i < sizeof(pi_pair)/sizeof(*pi_pair); i++ )
&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;
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;
/* FIXME set end of area FIXME */
goto error;
case VLC_CODEC_GSM_MS:
+ case VLC_CODEC_ADPCM_G726:
if( FrameInfo_MSGSM( &p_sys->i_frame_size, &p_sys->i_frame_samples,
&p_sys->fmt ) )
goto error;
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;
}
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;
}
return VLC_SUCCESS;
error:
+ msg_Err( p_demux, "An error occured during wav demuxing" );
free( p_wf );
free( p_sys );
return VLC_EGENERIC;
}
p_block->i_dts =
- p_block->i_pts = date_Increment( &p_sys->pts, p_sys->i_frame_samples );
+ p_block->i_pts = VLC_TS_0 + date_Get( &p_sys->pts );
/* set PCR */
es_out_Control( p_demux->out, ES_OUT_SET_PCR, p_block->i_pts );
es_out_Send( p_demux->out, p_sys->p_es, p_block );
+ date_Increment( &p_sys->pts, p_sys->i_frame_samples );
+
return 1;
}