Skip to content

V
vlc
Commit df325fb8 authored by Adrien Maglo's avatar Adrien Maglo Committed by Jean-Baptiste Kempf
Browse files
Options

Improve spectrum visualization. Change options : the number of bands for the... 

Improve spectrum visualization. Change options : the number of bands for the spectrum and spectrometer visualization is now set with a boolean. Ban some actions to avoid segfaults in visualizations.
Signed-off-by: default avatarJean-Baptiste Kempf <jb@videolan.org>
parent 7b3cb7d9
Show whitespace changes
Inline Side-by-side
Showing with 141 additions and 115 deletions
modules/visualization/visual/effects.c
View file @ df325fb8
...@@ -39,6 +39,7 @@ ...@@ -39,6 +39,7 @@
#include "fft.h" #include "fft.h"
#define PEAK_SPEED 1 #define PEAK_SPEED 1
#define BAR_DECREASE_SPEED 5
#define GRAD_ANGLE_MIN 0.2 #define GRAD_ANGLE_MIN 0.2
#define GRAD_ANGLE_MAX 0.5 #define GRAD_ANGLE_MAX 0.5
...@@ -61,13 +62,15 @@ int dummy_Run( visual_effect_t * p_effect, aout_instance_t *p_aout, ...@@ -61,13 +62,15 @@ int dummy_Run( visual_effect_t * p_effect, aout_instance_t *p_aout,
int spectrum_Run(visual_effect_t * p_effect, aout_instance_t *p_aout, int spectrum_Run(visual_effect_t * p_effect, aout_instance_t *p_aout,
aout_buffer_t * p_buffer , picture_t * p_picture) aout_buffer_t * p_buffer , picture_t * p_picture)
{ {
spectrum_data *p_data = p_effect->p_data;
float p_output[FFT_BUFFER_SIZE]; /* Raw FFT Result */ float p_output[FFT_BUFFER_SIZE]; /* Raw FFT Result */
int *height; /* Bar heights */ int *height; /* Bar heights */
int *peaks; /* Peaks */ int *peaks; /* Peaks */
int i_nb_bands; /* number of bands */ int *prev_heights; /* Previous bar heights */
int i_80_bands; /* number of bands : 80 if true else 20 */
int i_nb_bands; /* number of bands : 80 or 20 */
int i_band_width; /* width of bands */ int i_band_width; /* width of bands */
int i_separ; /* Should we let blanks ? */ int i_start; /* first band horizontal position */
int i_amp; /* Vertical amplification */
int i_peak; /* Should we draw peaks ? */ int i_peak; /* Should we draw peaks ? */
/* Horizontal scale for 20-band equalizer */ /* Horizontal scale for 20-band equalizer */
...@@ -82,7 +85,6 @@ int spectrum_Run(visual_effect_t * p_effect, aout_instance_t *p_aout, ...@@ -82,7 +85,6 @@ int spectrum_Run(visual_effect_t * p_effect, aout_instance_t *p_aout,
52,53,54,55,56,57,58,59,61,63,67,72,77,82,87,93,99,105, 52,53,54,55,56,57,58,59,61,63,67,72,77,82,87,93,99,105,
110,115,121,130,141,152,163,174,185,200,255}; 110,115,121,130,141,152,163,174,185,200,255};
const int *xscale; const int *xscale;
const double y_scale = 3.60673760222; /* (log 256) */
fft_state *p_state; /* internal FFT data */ fft_state *p_state; /* internal FFT data */
...@@ -105,39 +107,39 @@ int spectrum_Run(visual_effect_t * p_effect, aout_instance_t *p_aout, ...@@ -105,39 +107,39 @@ int spectrum_Run(visual_effect_t * p_effect, aout_instance_t *p_aout,
return -1; return -1;
p_buffs = p_s16_buff; p_buffs = p_s16_buff;
i_nb_bands = config_GetInt ( p_aout, "visual-nbbands" ); i_80_bands = config_GetInt ( p_aout, "visual-80-bands" );
i_separ = config_GetInt( p_aout, "visual-separ" );
i_amp = config_GetInt ( p_aout, "visual-amp" );
i_peak = config_GetInt ( p_aout, "visual-peaks" ); i_peak = config_GetInt ( p_aout, "visual-peaks" );
if( i_nb_bands == 20) if( i_80_bands != 0)
{ {
xscale = xscale1; xscale = xscale2;
i_nb_bands = 80;
} }
else else
{ {
i_nb_bands = 80; xscale = xscale1;
xscale = xscale2; i_nb_bands = 20;
} }
if( !p_effect->p_data ) if( !p_data )
{ {
p_effect->p_data = malloc(i_nb_bands * sizeof(int) ); p_effect->p_data = p_data = malloc( sizeof( spectrum_data ) );
if( !p_effect->p_data)
p_data->peaks = calloc( 80, sizeof(int) );
p_data->prev_heights = calloc( 80, sizeof(int) );
if( !p_data)
{ {
free( p_s16_buff ); free( p_s16_buff );
return -1; return -1;
} }
peaks = (int *)p_effect->p_data; peaks = ( int * )p_data->peaks;
for( i = 0 ; i < i_nb_bands ; i++) prev_heights = ( int * )p_data->prev_heights;
{
peaks[i] = 0;
}
} }
else else
{ {
peaks =(int *)p_effect->p_data; peaks = (int *)p_data->peaks;
prev_heights = (int *)p_data->prev_heights;
} }
...@@ -175,43 +177,43 @@ int spectrum_Run(visual_effect_t * p_effect, aout_instance_t *p_aout, ...@@ -175,43 +177,43 @@ int spectrum_Run(visual_effect_t * p_effect, aout_instance_t *p_aout,
p_buffs = p_buffs + p_effect->i_nb_chans; p_buffs = p_buffs + p_effect->i_nb_chans;
} }
fft_perform( p_buffer1, p_output, p_state); fft_perform( p_buffer1, p_output, p_state);
for(i= 0; i< FFT_BUFFER_SIZE ; i++ ) for( i = 0; i< FFT_BUFFER_SIZE ; i++ )
p_dest[i] = ( (int) sqrt( p_output [ i ] ) ) >> 8; p_dest[i] = p_output[i] * ( 2 ^ 16 ) / ( ( FFT_BUFFER_SIZE / 2 * 32768 ) ^ 2 );
for ( i = 0 ; i< i_nb_bands ;i++) /* Compute the horizontal position of the first band */
i_band_width = floor( p_effect->i_width / i_nb_bands);
i_start = ( p_effect->i_width - i_band_width * i_nb_bands ) / 2;
for ( i = 0 ; i < i_nb_bands ;i++)
{ {
/* We search the maximum on one scale */ /* We search the maximum on one scale */
for( j = xscale[i] , y=0 ; j< xscale[ i + 1 ] ; j++ ) for( j = xscale[i], y = 0; j< xscale[ i + 1 ]; j++ )
{ {
if ( p_dest[j] > y ) if ( p_dest[j] > y )
y = p_dest[j]; y = p_dest[j];
} }
/* Calculate the height of the bar */ /* Calculate the height of the bar */
y >>=7;/* remove some noise */ if( y != 0 )
if( y != 0)
{ {
height[i] = (int)log(y)* y_scale; height[i] = log( y ) * 30;
if(height[i] > 150) if( height[i] > 380 )
height[i] = 150; height[i] = 380;
} }
else else
{ height[ i ] = 0;
height[i] = 0 ;
}
/* Draw the bar now */ /* Draw the bar now */
i_band_width = floor( p_effect->i_width / i_nb_bands) ;
if( i_amp * height[i] > peaks[i]) if( height[i] > peaks[i] )
{ {
peaks[i] = i_amp * height[i]; peaks[i] = height[i];
} }
else if (peaks[i] > 0 ) else if( peaks[i] > 0 )
{ {
peaks[i] -= PEAK_SPEED; peaks[i] -= PEAK_SPEED;
if( peaks[i] < i_amp * height[i] ) if( peaks[i] < height[i] )
{ {
peaks[i] = i_amp * height[i]; peaks[i] = height[i];
} }
if( peaks[i] < 0 ) if( peaks[i] < 0 )
{ {
...@@ -219,93 +221,103 @@ int spectrum_Run(visual_effect_t * p_effect, aout_instance_t *p_aout, ...@@ -219,93 +221,103 @@ int spectrum_Run(visual_effect_t * p_effect, aout_instance_t *p_aout,
} }
} }
/* Decrease the bars if needed */
if( height[i] <= prev_heights[i] - BAR_DECREASE_SPEED )
{
height[i] = prev_heights[i];
height[i] -= BAR_DECREASE_SPEED;
}
prev_heights[i] = height[i];
if( peaks[i] > 0 && i_peak ) if( peaks[i] > 0 && i_peak )
{ {
if( peaks[i] >= p_effect->i_height ) if( peaks[i] >= p_effect->i_height )
peaks[i] = p_effect->i_height - 2; peaks[i] = p_effect->i_height - 2;
i_line = peaks[i]; i_line = peaks[i];
for( j = 0 ; j< i_band_width - i_separ; j++) for( j = 0; j < i_band_width - 1; j++ )
{ {
for( k = 0 ; k< 3 ; k ++) for( k = 0; k < 3; k ++ )
{ {
/* Draw the peak */ /* Draw the peak */
*(p_picture->p[0].p_pixels + *(p_picture->p[0].p_pixels +
(p_picture->p[0].i_lines - i_line -1 -k ) * ( p_effect->i_height - i_line -1 -k ) *
p_picture->p[0].i_pitch + (i_band_width*i +j) ) p_picture->p[0].i_pitch +
( i_start + i_band_width*i + j ) )
= 0xff; = 0xff;
*(p_picture->p[1].p_pixels + *(p_picture->p[1].p_pixels +
(p_picture->p[1].i_lines - i_line /2 -1 -k/2 ) * ( ( p_effect->i_height - i_line ) / 2 - 1 -k/2 ) *
p_picture->p[1].i_pitch + p_picture->p[1].i_pitch +
( ( i_band_width * i + j ) /2 ) ) ( ( i_start + i_band_width * i + j ) /2 ) )
= 0x00; = 0x00;
if( 0x04 * (i_line + k ) - 0x0f > 0 ) if( i_line + k - 0x0f > 0 )
{ {
if ( 0x04 * (i_line + k ) -0x0f < 0xff) if ( i_line + k - 0x0f < 0xff )
*(p_picture->p[2].p_pixels + *(p_picture->p[2].p_pixels +
(p_picture->p[2].i_lines - i_line /2 - 1 -k/2 ) * ( ( p_effect->i_height - i_line ) / 2 - 1 -k/2 ) *
p_picture->p[2].i_pitch + p_picture->p[2].i_pitch +
( ( i_band_width * i + j ) /2 ) ) ( ( i_start + i_band_width * i + j ) /2 ) )
= ( 0x04 * ( i_line + k ) ) -0x0f ; = ( i_line + k ) - 0x0f;
else else
*(p_picture->p[2].p_pixels + *(p_picture->p[2].p_pixels +
(p_picture->p[2].i_lines - i_line /2 - 1 -k/2 ) * ( ( p_effect->i_height - i_line ) / 2 - 1 -k/2 ) *
p_picture->p[2].i_pitch + p_picture->p[2].i_pitch +
( ( i_band_width * i + j ) /2 ) ) ( ( i_start + i_band_width * i + j ) /2 ) )
= 0xff; = 0xff;
} }
else else
{ {
*(p_picture->p[2].p_pixels + *(p_picture->p[2].p_pixels +
(p_picture->p[2].i_lines - i_line /2 - 1 -k/2 ) * ( ( p_effect->i_height - i_line ) / 2 - 1 -k/2 ) *
p_picture->p[2].i_pitch + p_picture->p[2].i_pitch +
( ( i_band_width * i + j ) /2 ) ) ( ( i_start + i_band_width * i + j ) /2 ) )
= 0x10 ; = 0x10 ;
} }
} }
} }
} }
if(height[i] * i_amp > p_effect->i_height) if(height[i] > p_effect->i_height)
height[i] = floor(p_effect->i_height / i_amp ); height[i] = floor(p_effect->i_height );
for(i_line = 0 ; i_line < i_amp * height[i]; i_line ++ ) for( i_line = 0; i_line < height[i]; i_line++ )
{ {
for( j = 0 ; j< i_band_width - i_separ ; j++) for( j = 0 ; j < i_band_width - 1; j++)
{ {
*(p_picture->p[0].p_pixels + *(p_picture->p[0].p_pixels +
(p_picture->p[0].i_lines - i_line -1) * (p_effect->i_height - i_line - 1) *
p_picture->p[0].i_pitch + (i_band_width*i +j) ) = 0xff; p_picture->p[0].i_pitch +
( i_start + i_band_width*i + j ) ) = 0xff;
*(p_picture->p[1].p_pixels + *(p_picture->p[1].p_pixels +
(p_picture->p[1].i_lines - i_line /2 -1) * ( ( p_effect->i_height - i_line ) / 2 - 1) *
p_picture->p[1].i_pitch + p_picture->p[1].i_pitch +
( ( i_band_width * i + j ) /2 ) ) = 0x00; ( ( i_start + i_band_width * i + j ) /2 ) ) = 0x00;
if( 0x04 * i_line - 0x0f > 0 ) if( i_line - 0x0f > 0 )
{ {
if( 0x04 * i_line - 0x0f < 0xff ) if( i_line - 0x0f < 0xff )
*(p_picture->p[2].p_pixels + *(p_picture->p[2].p_pixels +
(p_picture->p[2].i_lines - i_line /2 - 1) * ( ( p_effect->i_height - i_line ) / 2 - 1) *
p_picture->p[2].i_pitch + p_picture->p[2].i_pitch +
( ( i_band_width * i + j ) /2 ) ) = ( ( i_start + i_band_width * i + j ) /2 ) ) =
( 0x04 * i_line) -0x0f ; i_line - 0x0f;
else else
*(p_picture->p[2].p_pixels + *(p_picture->p[2].p_pixels +
(p_picture->p[2].i_lines - i_line /2 - 1) * ( ( p_effect->i_height - i_line ) / 2 - 1) *
p_picture->p[2].i_pitch + p_picture->p[2].i_pitch +
( ( i_band_width * i + j ) /2 ) ) = ( ( i_start + i_band_width * i + j ) /2 ) ) =
0xff; 0xff;
} }
else else
{ {
*(p_picture->p[2].p_pixels + *(p_picture->p[2].p_pixels +
(p_picture->p[2].i_lines - i_line /2 - 1) * ( ( p_effect->i_height - i_line ) / 2 - 1) *
p_picture->p[2].i_pitch + p_picture->p[2].i_pitch +
( ( i_band_width * i + j ) /2 ) ) = ( ( i_start + i_band_width * i + j ) /2 ) ) =
0x10 ; 0x10;
} }
} }
} }
...@@ -332,7 +344,8 @@ int spectrometer_Run(visual_effect_t * p_effect, aout_instance_t *p_aout, ...@@ -332,7 +344,8 @@ int spectrometer_Run(visual_effect_t * p_effect, aout_instance_t *p_aout,
float p_output[FFT_BUFFER_SIZE]; /* Raw FFT Result */ float p_output[FFT_BUFFER_SIZE]; /* Raw FFT Result */
int *height; /* Bar heights */ int *height; /* Bar heights */
int *peaks; /* Peaks */ int *peaks; /* Peaks */
int i_nb_bands; /* number of bands */ int i_80_bands; /* number of bands : 80 if true else 20 */
int i_nb_bands; /* number of bands : 80 or 20 */
int i_band_width; /* width of bands */ int i_band_width; /* width of bands */
int i_separ; /* Should we let blanks ? */ int i_separ; /* Should we let blanks ? */
int i_amp; /* Vertical amplification */ int i_amp; /* Vertical amplification */
...@@ -392,7 +405,7 @@ int spectrometer_Run(visual_effect_t * p_effect, aout_instance_t *p_aout, ...@@ -392,7 +405,7 @@ int spectrometer_Run(visual_effect_t * p_effect, aout_instance_t *p_aout,
p_buffs = p_s16_buff; p_buffs = p_s16_buff;
i_original = config_GetInt ( p_aout, "spect-show-original" ); i_original = config_GetInt ( p_aout, "spect-show-original" );
i_nb_bands = config_GetInt ( p_aout, "spect-nbbands" ); i_80_bands = config_GetInt ( p_aout, "spect-80-bands" );
i_separ = config_GetInt ( p_aout, "spect-separ" ); i_separ = config_GetInt ( p_aout, "spect-separ" );
i_amp = config_GetInt ( p_aout, "spect-amp" ); i_amp = config_GetInt ( p_aout, "spect-amp" );
i_peak = config_GetInt ( p_aout, "spect-show-peaks" ); i_peak = config_GetInt ( p_aout, "spect-show-peaks" );
...@@ -404,20 +417,20 @@ int spectrometer_Run(visual_effect_t * p_effect, aout_instance_t *p_aout, ...@@ -404,20 +417,20 @@ int spectrometer_Run(visual_effect_t * p_effect, aout_instance_t *p_aout,
i_peak_height = config_GetInt ( p_aout, "spect-peak-height" ); i_peak_height = config_GetInt ( p_aout, "spect-peak-height" );
color1 = config_GetInt ( p_aout, "spect-color" ); color1 = config_GetInt ( p_aout, "spect-color" );
if( i_nb_bands == 20) if( i_80_bands != 0)
{ {
xscale = xscale1; xscale = xscale2;
i_nb_bands = 80;
} }
else else
{ {
if( i_nb_bands > 80 ) xscale = xscale1;
i_nb_bands = 80; i_nb_bands = 20;
xscale = xscale2;
} }
if( !p_effect->p_data ) if( !p_effect->p_data )
{ {
p_effect->p_data=(void *)malloc( i_nb_bands * sizeof(int) ); p_effect->p_data=(void *)malloc( 80 * sizeof(int) );
if( !p_effect->p_data ) if( !p_effect->p_data )
{ {
free( p_s16_buff ); free( p_s16_buff );
...@@ -531,12 +544,12 @@ int spectrometer_Run(visual_effect_t * p_effect, aout_instance_t *p_aout, ...@@ -531,12 +544,12 @@ int spectrometer_Run(visual_effect_t * p_effect, aout_instance_t *p_aout,
{ {
//* Draw the peak //* Draw the peak
*(p_picture->p[0].p_pixels + *(p_picture->p[0].p_pixels +
(p_picture->p[0].i_lines - i_line -1 -k ) * (p_effect->i_height - i_line -1 -k ) *
p_picture->p[0].i_pitch + (i_band_width*i +j) ) p_picture->p[0].i_pitch + (i_band_width*i +j) )
= 0xff; = 0xff;
*(p_picture->p[1].p_pixels + *(p_picture->p[1].p_pixels +
(p_picture->p[1].i_lines - i_line /2 -1 -k/2 ) * ( ( p_effect->i_height - i_line ) / 2 -1 -k/2 ) *
p_picture->p[1].i_pitch + p_picture->p[1].i_pitch +
( ( i_band_width * i + j ) /2 ) ) ( ( i_band_width * i + j ) /2 ) )
= 0x00; = 0x00;
...@@ -545,13 +558,13 @@ int spectrometer_Run(visual_effect_t * p_effect, aout_instance_t *p_aout, ...@@ -545,13 +558,13 @@ int spectrometer_Run(visual_effect_t * p_effect, aout_instance_t *p_aout,
{ {
if ( 0x04 * (i_line + k ) -0x0f < 0xff) if ( 0x04 * (i_line + k ) -0x0f < 0xff)
*(p_picture->p[2].p_pixels + *(p_picture->p[2].p_pixels +
(p_picture->p[2].i_lines - i_line /2 - 1 -k/2 ) * ( ( p_effect->i_height - i_line ) / 2 - 1 -k/2 ) *
p_picture->p[2].i_pitch + p_picture->p[2].i_pitch +
( ( i_band_width * i + j ) /2 ) ) ( ( i_band_width * i + j ) /2 ) )
= ( 0x04 * ( i_line + k ) ) -0x0f ; = ( 0x04 * ( i_line + k ) ) -0x0f ;
else else
*(p_picture->p[2].p_pixels + *(p_picture->p[2].p_pixels +
(p_picture->p[2].i_lines - i_line /2 - 1 -k/2 ) * ( ( p_effect->i_height - i_line ) / 2 - 1 -k/2 ) *
p_picture->p[2].i_pitch + p_picture->p[2].i_pitch +
( ( i_band_width * i + j ) /2 ) ) ( ( i_band_width * i + j ) /2 ) )
= 0xff; = 0xff;
...@@ -559,7 +572,7 @@ int spectrometer_Run(visual_effect_t * p_effect, aout_instance_t *p_aout, ...@@ -559,7 +572,7 @@ int spectrometer_Run(visual_effect_t * p_effect, aout_instance_t *p_aout,
else else
{ {
*(p_picture->p[2].p_pixels + *(p_picture->p[2].p_pixels +
(p_picture->p[2].i_lines - i_line /2 - 1 -k/2 ) * ( ( p_effect->i_height - i_line ) / 2 - 1 -k/2 ) *
p_picture->p[2].i_pitch + p_picture->p[2].i_pitch +
( ( i_band_width * i + j ) /2 ) ) ( ( i_band_width * i + j ) /2 ) )
= 0x10 ; = 0x10 ;
...@@ -575,11 +588,11 @@ int spectrometer_Run(visual_effect_t * p_effect, aout_instance_t *p_aout, ...@@ -575,11 +588,11 @@ int spectrometer_Run(visual_effect_t * p_effect, aout_instance_t *p_aout,
for( j = 0 ; j< i_band_width - i_separ ; j++) for( j = 0 ; j< i_band_width - i_separ ; j++)
{ {
*(p_picture->p[0].p_pixels + *(p_picture->p[0].p_pixels +
(p_picture->p[0].i_lines - i_line -1) * (p_effect->i_height - i_line -1) *
p_picture->p[0].i_pitch + (i_band_width*i +j) ) = 0xff; p_picture->p[0].i_pitch + (i_band_width*i +j) ) = 0xff;
*(p_picture->p[1].p_pixels + *(p_picture->p[1].p_pixels +
(p_picture->p[1].i_lines - i_line /2 -1) * ( ( p_effect->i_height - i_line ) / 2 -1) *
p_picture->p[1].i_pitch + p_picture->p[1].i_pitch +
( ( i_band_width * i + j ) /2 ) ) = 0x00; ( ( i_band_width * i + j ) /2 ) ) = 0x00;
...@@ -587,13 +600,13 @@ int spectrometer_Run(visual_effect_t * p_effect, aout_instance_t *p_aout, ...@@ -587,13 +600,13 @@ int spectrometer_Run(visual_effect_t * p_effect, aout_instance_t *p_aout,
{ {
if( 0x04 * i_line - 0x0f < 0xff ) if( 0x04 * i_line - 0x0f < 0xff )
*(p_picture->p[2].p_pixels + *(p_picture->p[2].p_pixels +
(p_picture->p[2].i_lines - i_line /2 - 1) * ( ( p_effect->i_height - i_line ) / 2 - 1) *
p_picture->p[2].i_pitch + p_picture->p[2].i_pitch +
( ( i_band_width * i + j ) /2 ) ) = ( ( i_band_width * i + j ) /2 ) ) =
( 0x04 * i_line) -0x0f ; ( 0x04 * i_line) -0x0f ;
else else
*(p_picture->p[2].p_pixels + *(p_picture->p[2].p_pixels +
(p_picture->p[2].i_lines - i_line /2 - 1) * ( ( p_effect->i_height - i_line ) / 2 - 1) *
p_picture->p[2].i_pitch + p_picture->p[2].i_pitch +
( ( i_band_width * i + j ) /2 ) ) = ( ( i_band_width * i + j ) /2 ) ) =
0xff; 0xff;
...@@ -601,7 +614,7 @@ int spectrometer_Run(visual_effect_t * p_effect, aout_instance_t *p_aout, ...@@ -601,7 +614,7 @@ int spectrometer_Run(visual_effect_t * p_effect, aout_instance_t *p_aout,
else else
{ {
*(p_picture->p[2].p_pixels + *(p_picture->p[2].p_pixels +
(p_picture->p[2].i_lines - i_line /2 - 1) * ( ( p_effect->i_height - i_line ) / 2 - 1) *
p_picture->p[2].i_pitch + p_picture->p[2].i_pitch +
( ( i_band_width * i + j ) /2 ) ) = ( ( i_band_width * i + j ) /2 ) ) =
0x10 ; 0x10 ;
...@@ -615,7 +628,7 @@ int spectrometer_Run(visual_effect_t * p_effect, aout_instance_t *p_aout, ...@@ -615,7 +628,7 @@ int spectrometer_Run(visual_effect_t * p_effect, aout_instance_t *p_aout,
section_sep_angle = 360.0 / i_sections; section_sep_angle = 360.0 / i_sections;
if( i_peak_height < 1 ) if( i_peak_height < 1 )
i_peak_height = 1; i_peak_height = 1;
max_band_length = p_picture->p[0].i_lines / 2 - ( i_rad + i_peak_height + 1 ); max_band_length = p_effect->i_height / 2 - ( i_rad + i_peak_height + 1 );
i_band_width = floor( 360 / i_nb_bands - i_separ ); i_band_width = floor( 360 / i_nb_bands - i_separ );
if( i_band_width < 1 ) if( i_band_width < 1 )
...@@ -634,8 +647,9 @@ int spectrometer_Run(visual_effect_t * p_effect, aout_instance_t *p_aout, ...@@ -634,8 +647,9 @@ int spectrometer_Run(visual_effect_t * p_effect, aout_instance_t *p_aout,
/* circular line pattern(so color blend is more visible) */ /* circular line pattern(so color blend is more visible) */
for( j = 0 ; j < i_peak_height ; j++ ) for( j = 0 ; j < i_peak_height ; j++ )
{ {
x = p_picture->p[0].i_pitch / 2; //x = p_picture->p[0].i_pitch / 2;
y = p_picture->p[0].i_lines / 2; x = p_effect->i_width / 2;
y = p_effect->i_height / 2;
xx = x; xx = x;
yy = y; yy = y;
for( k = 0 ; k < (i_band_width + i_extra_width) ; k++ ) for( k = 0 ; k < (i_band_width + i_extra_width) ; k++ )
...@@ -680,8 +694,9 @@ int spectrometer_Run(visual_effect_t * p_effect, aout_instance_t *p_aout, ...@@ -680,8 +694,9 @@ int spectrometer_Run(visual_effect_t * p_effect, aout_instance_t *p_aout,
/* DO BASE OF BAND (mostly makes a circle) */ /* DO BASE OF BAND (mostly makes a circle) */
if( i_show_base != 0 ) if( i_show_base != 0 )
{ {
x = p_picture->p[0].i_pitch / 2; //x = p_picture->p[0].i_pitch / 2;
y = p_picture->p[0].i_lines / 2; x = p_effect->i_width / 2;
y = p_effect->i_height / 2;
a = ( (i+1) * band_sep_angle + section_sep_angle * (c+1) ) a = ( (i+1) * band_sep_angle + section_sep_angle * (c+1) )
* 3.141592 / 180.0; * 3.141592 / 180.0;
...@@ -717,8 +732,8 @@ int spectrometer_Run(visual_effect_t * p_effect, aout_instance_t *p_aout, ...@@ -717,8 +732,8 @@ int spectrometer_Run(visual_effect_t * p_effect, aout_instance_t *p_aout,
if( i_show_bands != 0 ) if( i_show_bands != 0 )
for( j = 0 ; j < i_band_width ; j++ ) for( j = 0 ; j < i_band_width ; j++ )
{ {
x = p_picture->p[0].i_pitch / 2; x = p_effect->i_width / 2;
y = p_picture->p[0].i_lines / 2; y = p_effect->i_height / 2;
xx = x; xx = x;
yy = y; yy = y;
a = ( (i+1) * band_sep_angle + section_sep_angle * (c+1) + j ) a = ( (i+1) * band_sep_angle + section_sep_angle * (c+1) + j )
......
modules/visualization/visual/visual.c
View file @ df325fb8
...@@ -51,11 +51,11 @@ ...@@ -51,11 +51,11 @@
#define HEIGHT_LONGTEXT N_( \ #define HEIGHT_LONGTEXT N_( \
"The height of the effects video window, in pixels." ) "The height of the effects video window, in pixels." )
#define NBBANDS_TEXT N_( "Number of bands" ) #define NBBANDS_TEXT N_( "More bands : 80 / 20" )
#define NBBANDS_LONGTEXT N_( \ #define NBBANDS_LONGTEXT N_( \
"Number of bands used by spectrum analyzer, should be 20 or 80." ) "More bands for the spectrum analyzer : 80 if enabled else 20." )
#define SPNBBANDS_LONGTEXT N_( \ #define SPNBBANDS_LONGTEXT N_( \
"Number of bands used by the spectrometer, from 20 to 80." ) "More bands for the spectrometer : 80 if enabled else 20." )
#define SEPAR_TEXT N_( "Band separator" ) #define SEPAR_TEXT N_( "Band separator" )
#define SEPAR_LONGTEXT N_( \ #define SEPAR_LONGTEXT N_( \
...@@ -121,12 +121,11 @@ vlc_module_begin () ...@@ -121,12 +121,11 @@ vlc_module_begin ()
add_integer("effect-height" , VOUT_HEIGHT , NULL, add_integer("effect-height" , VOUT_HEIGHT , NULL,
HEIGHT_TEXT, HEIGHT_LONGTEXT, false ) HEIGHT_TEXT, HEIGHT_LONGTEXT, false )
set_section( N_("Spectrum analyser") , NULL ) set_section( N_("Spectrum analyser") , NULL )
add_integer("visual-nbbands", 80, NULL, add_obsolete_integer( "visual-nbbands" ) /* Since 1.0.0 */
NBBANDS_TEXT, NBBANDS_LONGTEXT, true ) add_bool("visual-80-bands", 1, NULL,
add_integer("visual-separ", 1, NULL, NBBANDS_TEXT, NBBANDS_LONGTEXT, true );
SEPAR_TEXT, SEPAR_LONGTEXT, true ) add_obsolete_integer( "visual-separ" ) /* Since 1.0.0 */
add_integer("visual-amp", 3, NULL, add_obsolete_integer( "visual-amp" ) /* Since 1.0.0 */
AMP_TEXT, AMP_LONGTEXT, true )
add_bool("visual-peaks", true, NULL, add_bool("visual-peaks", true, NULL,
PEAKS_TEXT, PEAKS_LONGTEXT, true ) PEAKS_TEXT, PEAKS_LONGTEXT, true )
set_section( N_("Spectrometer") , NULL ) set_section( N_("Spectrometer") , NULL )
...@@ -141,8 +140,9 @@ vlc_module_begin () ...@@ -141,8 +140,9 @@ vlc_module_begin ()
add_integer("spect-color", 80, NULL, add_integer("spect-color", 80, NULL,
COLOR1_TEXT, COLOR1_LONGTEXT, true ) COLOR1_TEXT, COLOR1_LONGTEXT, true )
add_bool("spect-show-bands", true, NULL, add_bool("spect-show-bands", true, NULL,
BANDS_TEXT, BANDS_LONGTEXT, true ) BANDS_TEXT, BANDS_LONGTEXT, true );
add_integer("spect-nbbands", 32, NULL, add_obsolete_integer( "spect-nbbands" ) /* Since 1.0.0 */
add_bool("spect-80-bands", 1, NULL,
NBBANDS_TEXT, SPNBBANDS_LONGTEXT, true ) NBBANDS_TEXT, SPNBBANDS_LONGTEXT, true )
add_integer("spect-separ", 1, NULL, add_integer("spect-separ", 1, NULL,
SEPAR_TEXT, SEPAR_LONGTEXT, true ) SEPAR_TEXT, SEPAR_LONGTEXT, true )
...@@ -208,8 +208,8 @@ static int Open( vlc_object_t *p_this ) ...@@ -208,8 +208,8 @@ static int Open( vlc_object_t *p_this )
p_sys->i_height = config_GetInt( p_filter , "effect-height"); p_sys->i_height = config_GetInt( p_filter , "effect-height");
p_sys->i_width = config_GetInt( p_filter , "effect-width"); p_sys->i_width = config_GetInt( p_filter , "effect-width");
if( p_sys->i_height < 20 ) p_sys->i_height = 20; if( p_sys->i_height < 400 ) p_sys->i_height = 400;
if( p_sys->i_width < 20 ) p_sys->i_width = 20; if( p_sys->i_width < 532 ) p_sys->i_width = 532;
if( (p_sys->i_height % 2 ) != 0 ) p_sys->i_height--; if( (p_sys->i_height % 2 ) != 0 ) p_sys->i_height--;
if( (p_sys->i_width % 2 ) != 0 ) p_sys->i_width--; if( (p_sys->i_width % 2 ) != 0 ) p_sys->i_width--;
...@@ -394,6 +394,11 @@ static void Close( vlc_object_t *p_this ) ...@@ -394,6 +394,11 @@ static void Close( vlc_object_t *p_this )
for( i = 0; i < p_sys->i_effect; i++ ) for( i = 0; i < p_sys->i_effect; i++ )
{ {
#define p_effect p_sys->effect[i] #define p_effect p_sys->effect[i]
if( !strncmp( p_effect->psz_name, "spectrum", strlen( "spectrum" ) ) )
{
free( ( ( spectrum_data * )p_effect->p_data )->peaks );
free( ( ( spectrum_data * )p_effect->p_data )->prev_heights );
}
free( p_effect->p_data ); free( p_effect->p_data );
free( p_effect->psz_name ); free( p_effect->psz_name );
free( p_effect->psz_args ); free( p_effect->psz_args );
......
modules/visualization/visual/visual.h
View file @ df325fb8
...@@ -34,6 +34,12 @@ typedef struct visual_effect_t ...@@ -34,6 +34,12 @@ typedef struct visual_effect_t
int i_nb_chans; int i_nb_chans;
} visual_effect_t ; } visual_effect_t ;
typedef struct spectrum_data
{
int *peaks;
int *prev_heights;
} spectrum_data;
/***************************************************************************** /*****************************************************************************
* aout_filter_sys_t: visualizer audio filter method descriptor * aout_filter_sys_t: visualizer audio filter method descriptor
......
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