]> git.sesse.net Git - vlc/commitdiff
float32 mixer: small simplification
authorRémi Denis-Courmont <remi@remlab.net>
Mon, 30 May 2011 14:50:32 +0000 (17:50 +0300)
committerRémi Denis-Courmont <remi@remlab.net>
Mon, 30 May 2011 15:10:59 +0000 (18:10 +0300)
modules/audio_mixer/float32.c

index 435872f199ab28767c7c5862c0c9ce63e98333b8..a391cd43f01843bf87e1e69b23dd41573814795b 100644 (file)
@@ -77,7 +77,7 @@ static int Create( vlc_object_t *p_this )
 static void ScaleWords( float * p_out, const float * p_in, size_t i_nb_words,
                         float f_multiplier )
 {
-    for( size_t i = i_nb_words; i--; )
+    for( size_t i = 0; i < i_nb_words; i++ )
         *p_out++ = *p_in++ * f_multiplier;
 }
 
@@ -110,9 +110,7 @@ static void DoWork( aout_mixer_t * p_mixer, aout_buffer_t * p_buffer )
         {
             aout_buffer_t * p_old_buffer;
 
-            if( i_available_words > 0 )
-                ScaleWords( p_out, p_in, i_available_words, f_multiplier );
-
+            ScaleWords( p_out, p_in, i_available_words, f_multiplier );
             i_nb_words -= i_available_words;
             p_out += i_available_words;
 
@@ -128,8 +126,7 @@ static void DoWork( aout_mixer_t * p_mixer, aout_buffer_t * p_buffer )
         }
         else
         {
-            if( i_nb_words > 0 )
-                ScaleWords( p_out, p_in, i_nb_words, f_multiplier );
+            ScaleWords( p_out, p_in, i_nb_words, f_multiplier );
             p_input->begin = (void *)(p_in + i_nb_words);
             break;
         }