From 275131628d12392d6ea40aa63e557290d13088e4 Mon Sep 17 00:00:00 2001 From: Aurelien Jacobs Date: Mon, 29 Dec 2008 17:14:30 +0000 Subject: Remove duplicated dot product code. Use dsputil's scalarproduct instead. Patch by Aurelien Jacobs. Originally committed as revision 16391 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavcodec/acelp_pitch_delay.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'libavcodec/acelp_pitch_delay.c') diff --git a/libavcodec/acelp_pitch_delay.c b/libavcodec/acelp_pitch_delay.c index 3db5ea3b20..ac929c4689 100644 --- a/libavcodec/acelp_pitch_delay.c +++ b/libavcodec/acelp_pitch_delay.c @@ -21,6 +21,7 @@ */ #include "avcodec.h" +#include "dsputil.h" #include "acelp_pitch_delay.h" #include "celp_math.h" @@ -87,6 +88,7 @@ void ff_acelp_update_past_gain( } int16_t ff_acelp_decode_gain_code( + DSPContext *dsp, int gain_corr_factor, const int16_t* fc_v, int mr_energy, @@ -103,7 +105,7 @@ int16_t ff_acelp_decode_gain_code( mr_energy += quant_energy[i] * ma_prediction_coeff[i]; #ifdef G729_BITEXACT - mr_energy += (((-6165LL * ff_log2(dot_product(fc_v, fc_v, subframe_size, 0))) >> 3) & ~0x3ff); + mr_energy += (((-6165LL * ff_log2(dsp->scalarproduct_int16(fc_v, fc_v, subframe_size, 0))) >> 3) & ~0x3ff); mr_energy = (5439 * (mr_energy >> 15)) >> 8; // (0.15) = (0.15) * (7.23) @@ -113,7 +115,7 @@ int16_t ff_acelp_decode_gain_code( ); #else mr_energy = gain_corr_factor * exp(M_LN10 / (20 << 23) * mr_energy) / - sqrt(dot_product(fc_v, fc_v, subframe_size, 0)); + sqrt(dsp->scalarproduct_int16(fc_v, fc_v, subframe_size, 0)); return mr_energy >> 12; #endif } -- cgit v1.2.3