[vlc-devel] commit: Fixed a bunch of invalid memory accesses in visual effects. ( Laurent Aimar )
git version control
git at videolan.org
Mon Jun 15 00:21:32 CEST 2009
vlc | branch: 1.0-bugfix | Laurent Aimar <fenrir at videolan.org> | Sun Jun 14 23:24:59 2009 +0200| [fae67547e7e787008f7afc096f214d940a66d73c] | committer: Laurent Aimar
Fixed a bunch of invalid memory accesses in visual effects.
(cherry picked from commit 1cfb626f6adf063e051af4f440f8e8c64b808c6e)
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=fae67547e7e787008f7afc096f214d940a66d73c
---
modules/visualization/visual/effects.c | 44 +++++++++++++++++++-------------
modules/visualization/visual/visual.c | 3 ++
modules/visualization/visual/visual.h | 4 +++
3 files changed, 33 insertions(+), 18 deletions(-)
diff --git a/modules/visualization/visual/effects.c b/modules/visualization/visual/effects.c
index 7e70d71..267611a 100644
--- a/modules/visualization/visual/effects.c
+++ b/modules/visualization/visual/effects.c
@@ -100,9 +100,7 @@ int spectrum_Run(visual_effect_t * p_effect, aout_instance_t *p_aout,
int16_t *p_buffs; /* int16_t converted buffer */
int16_t *p_s16_buff; /* int16_t converted buffer */
- p_s16_buff = malloc(
- p_buffer->i_nb_samples * p_effect->i_nb_chans * sizeof(int16_t));
-
+ p_s16_buff = malloc( p_buffer->i_nb_samples * p_effect->i_nb_chans * sizeof(int16_t));
if( !p_s16_buff )
return -1;
@@ -174,7 +172,11 @@ int spectrum_Run(visual_effect_t * p_effect, aout_instance_t *p_aout,
{
p_output[i] = 0;
p_buffer1[i] = *p_buffs;
- p_buffs = p_buffs + p_effect->i_nb_chans;
+
+ p_buffs += p_effect->i_nb_chans;
+ if( p_buffs >= &p_s16_buff[p_buffer->i_nb_samples * p_effect->i_nb_chans] )
+ p_buffs = p_s16_buff;
+
}
fft_perform( p_buffer1, p_output, p_state);
for( i = 0; i< FFT_BUFFER_SIZE ; i++ )
@@ -393,13 +395,11 @@ int spectrometer_Run(visual_effect_t * p_effect, aout_instance_t *p_aout,
(float*)p_buffer->p_buffer;
int16_t *p_buffs; /* int16_t converted buffer */
- int16_t *p_s16_buff = NULL; /* int16_t converted buffer */
+ int16_t *p_s16_buff; /* int16_t converted buffer */
i_line = 0;
- p_s16_buff = (int16_t*)malloc(
- p_buffer->i_nb_samples * p_effect->i_nb_chans * sizeof(int16_t));
-
+ p_s16_buff = malloc( p_buffer->i_nb_samples * p_effect->i_nb_chans * sizeof(int16_t) );
if( !p_s16_buff )
return -1;
@@ -477,11 +477,14 @@ int spectrometer_Run(visual_effect_t * p_effect, aout_instance_t *p_aout,
return -1;
}
p_buffs = p_s16_buff;
- for ( i = 0 ; i < FFT_BUFFER_SIZE ; i++)
+ for ( i = 0 ; i < FFT_BUFFER_SIZE; i++)
{
p_output[i] = 0;
p_buffer1[i] = *p_buffs;
- p_buffs = p_buffs + p_effect->i_nb_chans;
+
+ p_buffs += p_effect->i_nb_chans;
+ if( p_buffs >= &p_s16_buff[p_buffer->i_nb_samples * p_effect->i_nb_chans] )
+ p_buffs = p_s16_buff;
}
fft_perform( p_buffer1, p_output, p_state);
for(i= 0; i< FFT_BUFFER_SIZE ; i++ )
@@ -809,13 +812,13 @@ int scope_Run(visual_effect_t * p_effect, aout_instance_t *p_aout,
}
for( i_index = 0, p_sample = (float *)p_buffer->p_buffer;
- i_index < p_effect->i_width;
+ i_index < __MIN( p_effect->i_width, p_buffer->i_nb_samples );
i_index++ )
{
uint8_t i_value;
/* Left channel */
- i_value = (*p_sample++ +1) * 127;
+ i_value = p_sample[p_effect->i_idx_left] * 127;
*(ppp_area[0][0]
+ p_picture->p[0].i_pitch * i_index / p_effect->i_width
+ p_picture->p[0].i_lines * i_value / 512
@@ -827,7 +830,7 @@ int scope_Run(visual_effect_t * p_effect, aout_instance_t *p_aout,
/* Right channel */
- i_value = ( *p_sample++ +1 ) * 127;
+ i_value = p_sample[p_effect->i_idx_right] * 127;
*(ppp_area[1][0]
+ p_picture->p[0].i_pitch * i_index / p_effect->i_width
+ p_picture->p[0].i_lines * i_value / 512
@@ -836,6 +839,8 @@ int scope_Run(visual_effect_t * p_effect, aout_instance_t *p_aout,
+ p_picture->p[2].i_pitch * i_index / p_effect->i_width
+ p_picture->p[2].i_lines * i_value / 512
* p_picture->p[2].i_pitch) = 0xdd;
+
+ p_sample += p_effect->i_nb_chans;
}
return 0;
}
@@ -849,21 +854,24 @@ int vuMeter_Run(visual_effect_t * p_effect, aout_instance_t *p_aout,
{
VLC_UNUSED(p_aout);
int i, j;
- float *p_sample = (float *)p_buffer->p_buffer;
float i_value_l = 0;
float i_value_r = 0;
- float ch;
/* Compute the peack values */
- for ( i = 0 ; i < 1024; i++ )
+ for ( i = 0 ; i < p_buffer->i_nb_samples; i++ )
{
- ch = (*p_sample++) * 256;
+ const float *p_sample = (float *)p_buffer->p_buffer;
+ float ch;
+
+ ch = p_sample[p_effect->i_idx_left] * 256;
if (ch > i_value_l)
i_value_l = ch;
- ch = (*p_sample++) * 256;
+ ch = p_sample[p_effect->i_idx_right] * 256;
if (ch > i_value_r)
i_value_r = ch;
+
+ p_sample += p_effect->i_nb_chans;
}
i_value_l = abs(i_value_l);
diff --git a/modules/visualization/visual/visual.c b/modules/visualization/visual/visual.c
index 4702a98..bf4cb03 100644
--- a/modules/visualization/visual/visual.c
+++ b/modules/visualization/visual/visual.c
@@ -229,6 +229,9 @@ static int Open( vlc_object_t *p_this )
p_effect->i_width = p_sys->i_width;
p_effect->i_height= p_sys->i_height;
p_effect->i_nb_chans = aout_FormatNbChannels( &p_filter->input);
+ p_effect->i_idx_left = 0;
+ p_effect->i_idx_right = __MIN( 1, p_effect->i_nb_chans-1 );
+
p_effect->psz_args = NULL;
p_effect->p_data = NULL;
diff --git a/modules/visualization/visual/visual.h b/modules/visualization/visual/visual.h
index 415d69f..532abc1 100644
--- a/modules/visualization/visual/visual.h
+++ b/modules/visualization/visual/visual.h
@@ -32,6 +32,10 @@ typedef struct visual_effect_t
int i_height;
char * psz_args;
int i_nb_chans;
+
+ /* Channels index */
+ int i_idx_left;
+ int i_idx_right;
} visual_effect_t ;
typedef struct spectrum_data
More information about the vlc-devel
mailing list