diff acelp_pitch_delay.c @ 7186:ff5ef7becd94 libavcodec

make sum_of_squares() more generic
author michael
date Thu, 03 Jul 2008 11:50:44 +0000
parents 04da42c2b7b4
children ecb1962c12f3
line wrap: on
line diff
--- a/acelp_pitch_delay.c	Wed Jul 02 22:28:47 2008 +0000
+++ b/acelp_pitch_delay.c	Thu Jul 03 11:50:44 2008 +0000
@@ -103,7 +103,7 @@
         mr_energy += quant_energy[i] * ma_prediction_coeff[i];
 
 #ifdef G729_BITEXACT
-    mr_energy += (((-6165LL * ff_log2(sum_of_squares(fc_v, subframe_size, 0, 0))) >> 3) & ~0x3ff);
+    mr_energy += (((-6165LL * ff_log2(dot_product(fc_v, fc_v, subframe_size, 0))) >> 3) & ~0x3ff);
 
     mr_energy = (5439 * (mr_energy >> 15)) >> 8;           // (0.15) = (0.15) * (7.23)
 
@@ -113,7 +113,7 @@
            );
 #else
     mr_energy = gain_corr_factor * exp(M_LN10 / (20 << 23) * mr_energy) /
-                sqrt(sum_of_squares(fc_v, subframe_size, 0, 0));
+                sqrt(dot_product(fc_v, fc_v, subframe_size, 0));
     return mr_energy >> 12;
 #endif
 }