[vlc-commits] visual: use vlc_alloc helper

[Thomas Guillem]

vlc | branch: master | Thomas Guillem <thomas at gllm.fr> | Sat Nov 11 18:53:18 2017 +0100| [a0f51665ee38ec8f4df842777385756622ac848a] | committer: Thomas Guillem

visual: use vlc_alloc helper

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

 modules/visualization/visual/effects.c | 18 +++++++++---------
 modules/visualization/visual/window.c  |  2 +-
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/modules/visualization/visual/effects.c b/modules/visualization/visual/effects.c
index 56d493247e..10e0130bb6 100644
--- a/modules/visualization/visual/effects.c
+++ b/modules/visualization/visual/effects.c
@@ -146,9 +146,9 @@ static int spectrum_Run(visual_effect_t * p_effect, vlc_object_t *p_aout,
     if( p_buffer->i_nb_samples != p_data->i_prev_nb_samples )
     {
         free( p_data->p_prev_s16_buff );
-        p_data->p_prev_s16_buff = malloc( p_buffer->i_nb_samples *
-                                          p_effect->i_nb_chans *
-                                          sizeof(int16_t));
+        p_data->p_prev_s16_buff = vlc_alloc( p_buffer->i_nb_samples *
+                                             p_effect->i_nb_chans,
+                                             sizeof(int16_t));
         p_data->i_prev_nb_samples = p_buffer->i_nb_samples;
         if( !p_data->p_prev_s16_buff )
             return -1;
@@ -169,7 +169,7 @@ static int spectrum_Run(visual_effect_t * p_effect, vlc_object_t *p_aout,
         i_nb_bands = 20;
     }
 
-    height = malloc( i_nb_bands * sizeof(int) );
+    height = vlc_alloc( i_nb_bands, sizeof(int) );
     if( !height )
     {
         return -1;
@@ -485,9 +485,9 @@ static int spectrometer_Run(visual_effect_t * p_effect, vlc_object_t *p_aout,
     if( p_buffer->i_nb_samples != p_data->i_prev_nb_samples )
     {
         free( p_data->p_prev_s16_buff );
-        p_data->p_prev_s16_buff = malloc( p_buffer->i_nb_samples *
-                                          p_effect->i_nb_chans *
-                                          sizeof(int16_t));
+        p_data->p_prev_s16_buff = vlc_alloc( p_buffer->i_nb_samples *
+                                             p_effect->i_nb_chans,
+                                             sizeof(int16_t));
         p_data->i_prev_nb_samples = p_buffer->i_nb_samples;
         if( !p_data->p_prev_s16_buff )
             return -1;
@@ -518,7 +518,7 @@ static int spectrometer_Run(visual_effect_t * p_effect, vlc_object_t *p_aout,
         i_nb_bands = 20;
     }
 
-    height = malloc( i_nb_bands * sizeof(int) );
+    height = vlc_alloc( i_nb_bands, sizeof(int) );
     if( !height)
         return -1;
 
@@ -976,7 +976,7 @@ static int vuMeter_Run(visual_effect_t * p_effect, vlc_object_t *p_aout,
     if( !p_effect->p_data )
     {
         /* Allocate memory to save hand positions */
-        p_effect->p_data = malloc( 2 * sizeof(float) );
+        p_effect->p_data = vlc_alloc( 2, sizeof(float) );
         i_value = p_effect->p_data;
         i_value[0] = i_value_l;
         i_value[1] = i_value_r;
diff --git a/modules/visualization/visual/window.c b/modules/visualization/visual/window.c
index 49861238ca..1b3df6d36e 100644
--- a/modules/visualization/visual/window.c
+++ b/modules/visualization/visual/window.c
@@ -126,7 +126,7 @@ bool window_init( int i_buffer_size, window_param * p_param,
         goto exit;
     }
 
-    pf_table = malloc( i_buffer_size * sizeof( *pf_table ) );
+    pf_table = vlc_alloc( i_buffer_size, sizeof( *pf_table ) );
     if( !pf_table )
     {
         /* Memory allocation failed */