Commit dc8472ea authored by Laurent Aimar's avatar Laurent Aimar
Browse files

Fixed selection of simple mixer (close #1688)

This mixer can only downsample.
Let trivial mixer handles
Dual-Mono -> Stereo|Stereo-left|Stereo-right|Stereo-reverse.
(Please double check on your multiple channels sources)
parent 11097ec1
......@@ -282,13 +282,13 @@ static block_t *Filter( filter_t *p_filter, block_t *p_block )
*****************************************************************************/
static bool IsSupported( const audio_format_t *p_input, const audio_format_t *p_output )
{
if ( (p_input->i_physical_channels
== p_output->i_physical_channels
&& p_input->i_original_channels
== p_output->i_original_channels)
|| p_input->i_format != p_output->i_format
|| p_input->i_rate != p_output->i_rate
|| p_input->i_format != VLC_FOURCC('f','l','3','2') )
if( p_input->i_format != VLC_FOURCC('f','l','3','2') ||
p_input->i_format != p_output->i_format ||
p_input->i_rate != p_output->i_rate )
return false;
if( p_input->i_physical_channels == p_output->i_physical_channels &&
p_input->i_original_channels == p_output->i_original_channels )
{
return false;
}
......@@ -308,5 +308,11 @@ static bool IsSupported( const audio_format_t *p_input, const audio_format_t *p_
{
return false;
}
/* Only if we downmix */
if( aout_FormatNbChannels( p_input ) <= aout_FormatNbChannels( p_output ) )
return false;
return true;
}
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