diff options
| author | Diego Biurrun <diego@biurrun.de> | 2012-08-26 11:29:39 +0200 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2012-08-27 20:37:49 +0200 |
| commit | dafcbfe44361b0d3caa22b15bc95e38ba80af7e6 (patch) | |
| tree | be178be68a80c2ee0a2251b52f4238b476994156 /libavcodec/acelp_pitch_delay.c | |
| parent | 55498543354335697bf1c5616a2ba94c64fbdcf1 (diff) | |
| download | ffmpeg-dafcbfe44361b0d3caa22b15bc95e38ba80af7e6.tar.gz | |
celp_math: Replace duplicate ff_dot_productf() by ff_scalarproduct_c()
Diffstat (limited to 'libavcodec/acelp_pitch_delay.c')
| -rw-r--r-- | libavcodec/acelp_pitch_delay.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/libavcodec/acelp_pitch_delay.c b/libavcodec/acelp_pitch_delay.c index 8aa500869b..1c8485047f 100644 --- a/libavcodec/acelp_pitch_delay.c +++ b/libavcodec/acelp_pitch_delay.c @@ -25,7 +25,6 @@ #include "avcodec.h" #include "dsputil.h" #include "acelp_pitch_delay.h" -#include "celp_math.h" int ff_acelp_decode_8bit_to_1st_delay3(int ac_index) { @@ -120,7 +119,7 @@ float ff_amr_set_fixed_gain(float fixed_gain_factor, float fixed_mean_energy, // Note 10^(0.05 * -10log(average x2)) = 1/sqrt((average x2)). float val = fixed_gain_factor * exp2f(M_LOG2_10 * 0.05 * - (ff_dot_productf(pred_table, prediction_error, 4) + + (ff_scalarproduct_float_c(pred_table, prediction_error, 4) + energy_mean)) / sqrtf(fixed_mean_energy); |