[vlc-commits] Channel mixer: drop FI32

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Wed Jul  4 22:29:34 2012 +0300| [469bc90f5ad203efa503ab9339e4806603c67f6d] | committer: Rémi Denis-Courmont

Channel mixer: drop FI32

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=469bc90f5ad203efa503ab9339e4806603c67f6d
---

 modules/audio_filter/channel_mixer/trivial.c |   11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/modules/audio_filter/channel_mixer/trivial.c b/modules/audio_filter/channel_mixer/trivial.c
index 9211751..645e6d9 100644
--- a/modules/audio_filter/channel_mixer/trivial.c
+++ b/modules/audio_filter/channel_mixer/trivial.c
@@ -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;