- if( p_sys->fmt.i_codec == VLC_FOURCC('a','r','a','w') ||
- p_sys->fmt.i_codec == VLC_FOURCC('a','f','l','t') )
+ 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;
+ }
+ }
+ }
+ else if( GetWLE( &p_wf->wFormatTag ) == WAVE_FORMAT_PCM &&
+ p_sys->fmt.audio.i_channels > 2 && p_sys->fmt.audio.i_channels <= 9 )
+ {
+ for( int i = 0; i < p_sys->fmt.audio.i_channels; i++ )
+ p_sys->i_channel_mask |= pi_channels_in[i];
+ }