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/sipr16k.c | |
| parent | 55498543354335697bf1c5616a2ba94c64fbdcf1 (diff) | |
| download | ffmpeg-dafcbfe44361b0d3caa22b15bc95e38ba80af7e6.tar.gz | |
celp_math: Replace duplicate ff_dot_productf() by ff_scalarproduct_c()
Diffstat (limited to 'libavcodec/sipr16k.c')
| -rw-r--r-- | libavcodec/sipr16k.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/libavcodec/sipr16k.c b/libavcodec/sipr16k.c index bd0600c7b3..bff739e44f 100644 --- a/libavcodec/sipr16k.c +++ b/libavcodec/sipr16k.c @@ -26,8 +26,9 @@ #include "sipr.h" #include "libavutil/common.h" #include "libavutil/mathematics.h" +#include "dsputil.h" #include "lsp.h" -#include "celp_math.h" +#include "celp_filters.h" #include "acelp_vectors.h" #include "acelp_pitch_delay.h" #include "acelp_filters.h" @@ -163,10 +164,10 @@ static float acelp_decode_gain_codef(float gain_corr_factor, const float *fc_v, int subframe_size, int ma_pred_order) { mr_energy += - ff_dot_productf(quant_energy, ma_prediction_coeff, ma_pred_order); + ff_scalarproduct_float_c(quant_energy, ma_prediction_coeff, ma_pred_order); mr_energy = gain_corr_factor * exp(M_LN10 / 20. * mr_energy) / - sqrt((0.01 + ff_dot_productf(fc_v, fc_v, subframe_size))); + sqrt((0.01 + ff_scalarproduct_float_c(fc_v, fc_v, subframe_size))); return mr_energy; } |