Commit dff2e068 authored by Ronald Wright's avatar Ronald Wright Committed by Jean-Baptiste Kempf

equalizer: Optimize calculations of alpha, beta, and gamma constants

It is easy to see that the computation of the alpha constant is slightly
inefficient, as the root value can be close to 1 for the lower frequencies,
which would result in significant roundoff error if this value is subtracted
from 1.  In this patch, the computation of the alpha, beta, and gamma constants
has been simplified and refactored.
Acked-by: default avatarIlkka Ollakka <ileoo@videolan.org>
Signed-off-by: default avatarJean-Baptiste Kempf <jb@videolan.org>
parent 5b5d8570
...@@ -254,20 +254,15 @@ static void EqzCoeffs( int i_rate, float f_octave_percent, ...@@ -254,20 +254,15 @@ static void EqzCoeffs( int i_rate, float f_octave_percent,
{ {
float f_theta_1 = ( 2.0 * M_PI * f_freq ) / f_rate; float f_theta_1 = ( 2.0 * M_PI * f_freq ) / f_rate;
float f_theta_2 = f_theta_1 / f_octave_factor; float f_theta_2 = f_theta_1 / f_octave_factor;
float f_sin = sin( f_theta_2 ) * 0.5; float f_sin = sin( f_theta_2 );
float f_sin_prd = sin( f_theta_2 * f_octave_factor_1 ) float f_sin_prd = sin( f_theta_2 * f_octave_factor_1 )
* sin( f_theta_2 * f_octave_factor_2 ); * sin( f_theta_2 * f_octave_factor_2 );
/* The equation from equ-xmms simplifies to something similar to float f_sin_hlf = f_sin * 0.5;
* this when you restrict the domain to all valid frequencies at or float f_den = f_sin_hlf + f_sin_prd;
* below the Nyquist frequency (the interval 0 <= f_theta_1 <= Pi).
* (This result for the root is twice that returned by equ-xmms, p_eqz_config->band[i].f_alpha = f_sin_prd / f_den;
* but the more efficient calculations for alpha, beta, and gamma p_eqz_config->band[i].f_beta = ( f_sin_hlf - f_sin_prd ) / f_den;
* below compensate for this.) */ p_eqz_config->band[i].f_gamma = f_sin * cos( f_theta_1 ) / f_den;
float f_root = ( f_sin - f_sin_prd ) / ( f_sin + f_sin_prd );
p_eqz_config->band[i].f_alpha = ( 1.0 - f_root ) * 0.5;
p_eqz_config->band[i].f_beta = f_root;
p_eqz_config->band[i].f_gamma = ( 1.0 + f_root ) * cos( f_theta_1 );
} }
else else
{ {
......
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