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/qcelpdec.c | |
| parent | 55498543354335697bf1c5616a2ba94c64fbdcf1 (diff) | |
| download | ffmpeg-dafcbfe44361b0d3caa22b15bc95e38ba80af7e6.tar.gz | |
celp_math: Replace duplicate ff_dot_productf() by ff_scalarproduct_c()
Diffstat (limited to 'libavcodec/qcelpdec.c')
| -rw-r--r-- | libavcodec/qcelpdec.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/libavcodec/qcelpdec.c b/libavcodec/qcelpdec.c index c598d6bf65..edb1d24603 100644 --- a/libavcodec/qcelpdec.c +++ b/libavcodec/qcelpdec.c @@ -32,10 +32,8 @@ #include "avcodec.h" #include "internal.h" #include "get_bits.h" - +#include "dsputil.h" #include "qcelpdata.h" - -#include "celp_math.h" #include "celp_filters.h" #include "acelp_filters.h" #include "acelp_vectors.h" @@ -401,8 +399,9 @@ static void apply_gain_ctrl(float *v_out, const float *v_ref, const float *v_in) for (i = 0; i < 160; i += 40) ff_scale_vector_to_given_sum_of_squares(v_out + i, v_in + i, - ff_dot_productf(v_ref + i, - v_ref + i, 40), + ff_scalarproduct_float_c(v_ref + i, + v_ref + i, + 40), 40); } @@ -678,8 +677,8 @@ static void postfilter(QCELPContext *q, float *samples, float *lpc) ff_tilt_compensation(&q->postfilter_tilt_mem, 0.3, pole_out + 10, 160); ff_adaptive_gain_control(samples, pole_out + 10, - ff_dot_productf(q->formant_mem + 10, - q->formant_mem + 10, 160), + ff_scalarproduct_float_c(q->formant_mem + 10, + q->formant_mem + 10, 160), 160, 0.9375, &q->postfilter_agc_mem); } |