+
+ 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];
+ }