return VLC_ENOMEM;
p_sys->p_es = NULL;
- p_sys->b_chan_reorder = 0;
+ p_sys->b_chan_reorder = false;
p_sys->i_channel_mask = 0;
/* skip riff header */
if( p_wf_ext == NULL )
goto error;
- p_wf = (WAVEFORMATEX *)p_wf_ext;
+ p_wf = &p_wf_ext->Format;
p_wf->cbSize = 0;
i_size -= 2;
if( stream_Read( p_demux->s, p_wf, i_size ) != (int)i_size ||
i_channel_mask = GetDWLE( &p_wf_ext->dwChannelMask );
if( i_channel_mask )
{
- for( i = 0; i < sizeof(pi_channels_src)/sizeof(uint32_t); i++ )
+ int i_match = 0;
+ for( i = 0; i < sizeof(pi_channels_src)/sizeof(*pi_channels_src); i++ )
{
if( i_channel_mask & pi_channels_src[i] )
+ {
+ if( !( p_sys->i_channel_mask & pi_channels_in[i] ) )
+ i_match++;
+
+ i_channel_mask &= ~pi_channels_src[i];
p_sys->i_channel_mask |= pi_channels_in[i];
+
+ if( i_match >= p_sys->fmt.audio.i_channels )
+ break;
+ }
+ }
+ if( i_channel_mask )
+ msg_Warn( p_demux, "Some channels are unrecognized or uselessly specified (0x%x)", i_channel_mask );
+ if( i_match < p_sys->fmt.audio.i_channels )
+ {
+ int i_missing = p_sys->fmt.audio.i_channels - i_match;
+ msg_Warn( p_demux, "Trying to fill up unspecified position for %d channels", p_sys->fmt.audio.i_channels - i_match );
+
+ 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 }; */
+
+ /* Try to complete with pair */
+ for( unsigned i = 0; i < sizeof(pi_pair)/sizeof(*pi_pair); i++ )
+ {
+ if( i_missing >= 2 && !(p_sys->i_channel_mask & pi_pair[i] ) )
+ {
+ i_missing -= 2;
+ p_sys->i_channel_mask |= pi_pair[i];
+ }
+ }
+ /* Well fill up with what we can */
+ for( unsigned i = 0; i < sizeof(pi_channels_in)/sizeof(*pi_channels_in) && i_missing > 0; i++ )
+ {
+ if( !( p_sys->i_channel_mask & pi_channels_in[i] ) )
+ {
+ p_sys->i_channel_mask |= pi_channels_in[i];
+ i_missing--;
+
+ if( i_missing <= 0 )
+ break;
+ }
+ }
+
+ i_match = p_sys->fmt.audio.i_channels - i_missing;
+ }
+ if( i_match < p_sys->fmt.audio.i_channels )
+ {
+ msg_Err( p_demux, "Invalid/unsupported channel mask" );
+ p_sys->i_channel_mask = 0;
}
}
}
case VLC_FOURCC( 'a', 'r', 'a', 'w' ):
case VLC_FOURCC( 'a', 'f', 'l', 't' ):
case VLC_FOURCC( 'u', 'l', 'a', 'w' ):
- case VLC_FOURCC( 'a', 'l', 'a', 'w' ):
- case VLC_FOURCC( 'm', 'l', 'a', 'w' ):
+ case VLC_CODEC_ALAW:
+ case VLC_CODEC_MULAW:
case VLC_FOURCC( 'p', 'c', 'm', ' ' ):
if( FrameInfo_PCM( &p_sys->i_frame_size, &p_sys->i_frame_samples,
&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;
&p_sys->fmt ) )
goto error;
break;
- case VLC_FOURCC( 'm', 'p', 'g', 'a' ):
- case VLC_FOURCC( 'a', '5', '2', ' ' ):
+ case VLC_CODEC_MPGA:
+ case VLC_CODEC_A52:
/* FIXME set end of area FIXME */
goto error;
- case VLC_FOURCC( 'a', 'g', 's', 'm' ):
+ 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;
}