Commit 469bc90f authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

Channel mixer: drop FI32

parent 9b925784
......@@ -65,8 +65,7 @@ static int Create( vlc_object_t *p_this )
== p_filter->fmt_out.audio.i_original_channels)
|| p_filter->fmt_in.audio.i_format != p_filter->fmt_out.audio.i_format
|| p_filter->fmt_in.audio.i_rate != p_filter->fmt_out.audio.i_rate
|| (p_filter->fmt_in.audio.i_format != VLC_CODEC_FL32
&& p_filter->fmt_in.audio.i_format != VLC_CODEC_FI32) )
|| p_filter->fmt_in.audio.i_format != VLC_CODEC_FL32 )
{
return VLC_EGENERIC;
}
......@@ -78,7 +77,7 @@ static int Create( vlc_object_t *p_this )
/*****************************************************************************
* SparseCopy: trivially downmix or upmix a buffer
*****************************************************************************/
static void SparseCopy( int32_t * p_dest, const int32_t * p_src, size_t i_len,
static void SparseCopy( float * p_dest, const float * p_src, size_t i_len,
int i_output_stride, int i_input_stride )
{
int i;
......@@ -120,8 +119,8 @@ static block_t *DoWork( filter_t * p_filter, block_t * p_in_buf )
p_out_buf->i_length = p_in_buf->i_length;
}
int32_t * p_dest = (int32_t *)p_out_buf->p_buffer;
const int32_t * p_src = (int32_t *)p_in_buf->p_buffer;
float * p_dest = (float *)p_out_buf->p_buffer;
const float * p_src = (float *)p_in_buf->p_buffer;
if ( (p_filter->fmt_out.audio.i_original_channels & AOUT_CHAN_PHYSMASK)
!= (p_filter->fmt_in.audio.i_original_channels & AOUT_CHAN_PHYSMASK)
......@@ -164,7 +163,7 @@ static block_t *DoWork( filter_t * p_filter, block_t * p_in_buf )
int i;
for ( i = p_in_buf->i_nb_samples; i--; )
{
int32_t i_tmp = p_src[0];
float i_tmp = p_src[0];
p_dest[0] = p_src[1];
p_dest[1] = i_tmp;
......
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