/*****************************************************************************
* Preamble
*****************************************************************************/
-#include <math.h>
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
-#include <vlc/vlc.h>
+#include <math.h>
+
+#include <vlc_common.h>
#include <vlc_plugin.h>
#include "vlc_aout.h"
#define PREAMP_TEXT N_("Global gain" )
#define PREAMP_LONGTEXT N_("Set the global gain in dB (-20 ... 20)." )
-vlc_module_begin();
- set_description( N_("Equalizer with 10 bands") );
- set_shortname( N_("Equalizer" ) );
- set_capability( "audio filter", 0 );
- set_category( CAT_AUDIO );
- set_subcategory( SUBCAT_AUDIO_AFILTER );
+vlc_module_begin ()
+ set_description( N_("Equalizer with 10 bands") )
+ set_shortname( N_("Equalizer" ) )
+ set_capability( "audio filter", 0 )
+ set_category( CAT_AUDIO )
+ set_subcategory( SUBCAT_AUDIO_AFILTER )
add_string( "equalizer-preset", "flat", NULL, PRESET_TEXT,
- PRESET_LONGTEXT, false );
- change_string_list( preset_list, preset_list_text, 0 );
+ PRESET_LONGTEXT, false )
+ change_string_list( preset_list, preset_list_text, 0 )
add_string( "equalizer-bands", NULL, NULL, BANDS_TEXT,
- BANDS_LONGTEXT, true );
+ BANDS_LONGTEXT, true )
add_bool( "equalizer-2pass", 0, NULL, TWOPASS_TEXT,
- TWOPASS_LONGTEXT, true );
+ TWOPASS_LONGTEXT, true )
add_float( "equalizer-preamp", 12.0, NULL, PREAMP_TEXT,
- PREAMP_LONGTEXT, true );
- set_callbacks( Open, Close );
- add_shortcut( "equalizer" );
-vlc_module_end();
+ PREAMP_LONGTEXT, true )
+ set_callbacks( Open, Close )
+ add_shortcut( "equalizer" )
+vlc_module_end ()
/*****************************************************************************
* Local prototypes
*****************************************************************************/
-typedef struct aout_filter_sys_t
+struct aout_filter_sys_t
{
/* Filter static config */
int i_band;
float x2[32][2];
float y2[32][128][2];
-} aout_filter_sys_t;
+};
static void DoWork( aout_instance_t *, aout_filter_t *,
aout_buffer_t *, aout_buffer_t * );
/* Allocate structure */
p_sys = p_filter->p_sys = malloc( sizeof( aout_filter_sys_t ) );
+ if( !p_sys )
+ return VLC_ENOMEM;
- if( EqzInit( p_filter, p_filter->input.i_rate ) )
+ if( EqzInit( p_filter, p_filter->input.i_rate ) != VLC_SUCCESS )
+ {
+ free( p_sys );
return VLC_EGENERIC;
+ }
return VLC_SUCCESS;
}
p_sys->f_alpha = malloc( p_sys->i_band * sizeof(float) );
p_sys->f_beta = malloc( p_sys->i_band * sizeof(float) );
p_sys->f_gamma = malloc( p_sys->i_band * sizeof(float) );
+ if( !p_sys->f_alpha || !p_sys->f_beta || !p_sys->f_gamma )
+ {
+ free( p_sys->f_alpha );
+ free( p_sys->f_beta );
+ free( p_sys->f_gamma );
+ return VLC_ENOMEM;
+ }
+
for( i = 0; i < p_sys->i_band; i++ )
{
p_sys->f_alpha[i] = p_cfg->band[i].f_alpha;
/* Filter dyn config */
p_sys->b_2eqz = false;
p_sys->f_gamp = 1.0;
- p_sys->f_amp = malloc( p_sys->i_band * sizeof(float) );
+ p_sys->f_amp = malloc( p_sys->i_band * sizeof(float) );
+ if( !p_sys->f_amp )
+ {
+ free( p_sys->f_alpha );
+ free( p_sys->f_beta );
+ free( p_sys->f_gamma );
+ return VLC_ENOMEM;
+ }
for( i = 0; i < p_sys->i_band; i++ )
{
p_sys->f_amp[i] = 0.0;
}
}
- var_CreateGetString( p_aout,"equalizer-bands" );
- var_CreateGetString( p_aout, "equalizer-preset" );
+ var_Create( p_aout, "equalizer-bands", VLC_VAR_STRING | VLC_VAR_DOINHERIT );
+ var_Create( p_aout, "equalizer-preset", VLC_VAR_STRING | VLC_VAR_DOINHERIT );
p_sys->b_2eqz = var_CreateGetBool( p_aout, "equalizer-2pass" );
- var_CreateGetFloat( p_aout, "equalizer-preamp" );
+ var_Create( p_aout, "equalizer-preamp", VLC_VAR_FLOAT | VLC_VAR_DOINHERIT );
/* Get initial values */
var_Get( p_aout, "equalizer-preset", &val1 );
PreampCallback( VLC_OBJECT( p_aout ), NULL, val3, val3, p_sys );
p_sys->b_first = false;
+ free( val1.psz_string );
+
/* Register preset bands (for intf) if : */
/* We have no bands info --> the preset info must be given to the intf */
/* or The bands info matches the preset */
if (p_sys->psz_newbands == NULL)
{
msg_Err(p_filter, "No preset selected");
- return (VLC_EGENERIC);
+ free( val2.psz_string );
+ free( p_sys->f_amp );
+ free( p_sys->f_alpha );
+ free( p_sys->f_beta );
+ free( p_sys->f_gamma );
+ return VLC_EGENERIC;
}
if( ( *(val2.psz_string) &&
strstr( p_sys->psz_newbands, val2.psz_string ) ) || !*val2.psz_string )
if( p_sys->f_newpreamp == p_sys->f_gamp )
var_SetFloat( p_aout, "equalizer-preamp", p_sys->f_newpreamp );
}
+ free( val2.psz_string );
/* Add our own callbacks */
var_AddCallback( p_aout, "equalizer-preset", PresetCallback, p_sys );
free( p_sys->f_gamma );
free( p_sys->f_amp );
+ free( p_sys->psz_newbands );
}
aout_instance_t *p_aout = (aout_instance_t *)p_this;
char *psz_preset = newval.psz_string;
- char psz_newbands[120];
- memset( psz_newbands, 0, 120 );
+ if( !*psz_preset || p_sys->i_band != 10 )
+ return VLC_SUCCESS;
- if( *psz_preset && p_sys->i_band == 10 )
+ for( unsigned i = 0; eqz_preset_10b[i] != NULL; i++ )
{
- int i;
- /* */
- for( i = 0; eqz_preset_10b[i] != NULL; i++ )
+ if( !strcasecmp( eqz_preset_10b[i]->psz_name, psz_preset ) )
{
- if( !strcasecmp( eqz_preset_10b[i]->psz_name, psz_preset ) )
+ char *psz_newbands = NULL;
+
+ p_sys->f_gamp *= pow( 10, eqz_preset_10b[i]->f_preamp / 20.0 );
+ for( int j = 0; j < p_sys->i_band; j++ )
{
- int j;
- p_sys->f_gamp *= pow( 10, eqz_preset_10b[i]->f_preamp / 20.0 );
- for( j = 0; j < p_sys->i_band; j++ )
- {
- lldiv_t div;
- p_sys->f_amp[j] = EqzConvertdB(
- eqz_preset_10b[i]->f_amp[j] );
- div = lldiv( eqz_preset_10b[i]->f_amp[j] * 10000000,
- 10000000 );
- sprintf( psz_newbands, "%s %"PRId64".%07u", psz_newbands,
- (int64_t)div.quot, (unsigned int) div.rem );
- }
- if( p_sys->b_first == false )
+ lldiv_t d;
+ char *psz;
+
+ p_sys->f_amp[j] = EqzConvertdB( eqz_preset_10b[i]->f_amp[j] );
+ d = lldiv( eqz_preset_10b[i]->f_amp[j] * 10000000, 10000000 );
+ if( asprintf( &psz, "%s %lld.%07llu",
+ psz_newbands ? psz_newbands : "",
+ d.quot, d.rem ) == -1 )
{
- var_SetString( p_aout, "equalizer-bands", psz_newbands );
- var_SetFloat( p_aout, "equalizer-preamp",
- eqz_preset_10b[i]->f_preamp );
+ free( psz_newbands );
+ return VLC_ENOMEM;
}
- else
- {
- p_sys->psz_newbands = strdup( psz_newbands );
- p_sys->f_newpreamp = eqz_preset_10b[i]->f_preamp;
- }
- break;
+ psz_newbands = psz;
}
- }
- if( eqz_preset_10b[i] == NULL )
- {
- msg_Err( p_aout, "equalizer preset '%s' not found", psz_preset );
- msg_Dbg( p_aout, "full list:" );
- for( i = 0; eqz_preset_10b[i] != NULL; i++ )
- msg_Dbg( p_aout, " - '%s'", eqz_preset_10b[i]->psz_name );
+ if( p_sys->b_first == false )
+ {
+ var_SetString( p_aout, "equalizer-bands", psz_newbands );
+ var_SetFloat( p_aout, "equalizer-preamp",
+ eqz_preset_10b[i]->f_preamp );
+ free( psz_newbands );
+ }
+ else
+ {
+ p_sys->psz_newbands = psz_newbands;
+ p_sys->f_newpreamp = eqz_preset_10b[i]->f_preamp;
+ }
+ return VLC_SUCCESS;
}
}
+ msg_Err( p_aout, "equalizer preset '%s' not found", psz_preset );
+ msg_Info( p_aout, "full list:" );
+ for( unsigned i = 0; eqz_preset_10b[i] != NULL; i++ )
+ msg_Info( p_aout, " - '%s'", eqz_preset_10b[i]->psz_name );
return VLC_SUCCESS;
}
VLC_UNUSED(p_this); VLC_UNUSED(psz_cmd); VLC_UNUSED(oldval);
aout_filter_sys_t *p_sys = (aout_filter_sys_t *)p_data;
char *psz_bands = newval.psz_string;
+ char *psz_next;
+ char *p = psz_bands;
+ int i;
/* Same thing for bands */
- if( *psz_bands )
+ for( i = 0; i < p_sys->i_band; i++ )
{
- char *p = psz_bands, *p_next;
- int i;
+ float f;
- for( i = 0; i < p_sys->i_band; i++ )
- {
- /* Read dB -20/20 */
+ if( *psz_bands == '\0' )
+ break;
+
+ /* Read dB -20/20 */
#ifdef HAVE_STRTOF
- float f = strtof( p, &p_next );
+ f = strtof( p, &psz_next );
#else
- float f = (float) strtod( p, &p_next );
+ f = (float)strtod( p, &psz_next );
#endif
- if( !p_next || p_next == p ) break; /* strtof() failed */
+ if( psz_next == p )
+ break; /* no conversion */
- p_sys->f_amp[i] = EqzConvertdB( f );
+ p_sys->f_amp[i] = EqzConvertdB( f );
- if( !*p ) break; /* end of line */
- p=p_next+1;
- }
+ if( *psz_next == '\0' )
+ break; /* end of line */
+ p = &psz_next[1];
}
-
return VLC_SUCCESS;
}
+
projects / vlc / blobdiff