[FFmpeg-cvslog] r16391 - in trunk/libavcodec: acelp_pitch_delay.c acelp_pitch_delay.h celp_math.h

[reynaldo]

Author: reynaldo
Date: Mon Dec 29 18:14:30 2008
New Revision: 16391

Log:
Remove duplicated dot product code. Use dsputil's
scalarproduct instead. Patch by Aurelien Jacobs.

Modified:
   trunk/libavcodec/acelp_pitch_delay.c
   trunk/libavcodec/acelp_pitch_delay.h
   trunk/libavcodec/celp_math.h

Modified: trunk/libavcodec/acelp_pitch_delay.c
==============================================================================
--- trunk/libavcodec/acelp_pitch_delay.c	Mon Dec 29 17:56:02 2008	(r16390)
+++ trunk/libavcodec/acelp_pitch_delay.c	Mon Dec 29 18:14:30 2008	(r16391)
@@ -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
 }

Modified: trunk/libavcodec/acelp_pitch_delay.h
==============================================================================
--- trunk/libavcodec/acelp_pitch_delay.h	Mon Dec 29 17:56:02 2008	(r16390)
+++ trunk/libavcodec/acelp_pitch_delay.h	Mon Dec 29 18:14:30 2008	(r16391)
@@ -24,6 +24,7 @@
 #define AVCODEC_ACELP_PITCH_DELAY_H
 
 #include <stdint.h>
+#include "dsputil.h"
 
 #define PITCH_DELAY_MIN             20
 #define PITCH_DELAY_MAX             143
@@ -140,6 +141,7 @@ void ff_acelp_update_past_gain(
 /**
  * \brief Decode the adaptive codebook gain and add
  *        correction (4.1.5 and 3.9.1 of G.729).
+ * \param dsp initialized dsputil context
  * \param gain_corr_factor gain correction factor (2.13)
  * \param fc_v fixed-codebook vector (2.13)
  * \param mr_energy mean innovation energy and fixed-point correction (7.13)
@@ -209,6 +211,7 @@ void ff_acelp_update_past_gain(
  * \remark The routine is used in G.729 and AMR (all modes).
  */
 int16_t ff_acelp_decode_gain_code(
+    DSPContext *dsp,
     int gain_corr_factor,
     const int16_t* fc_v,
     int mr_energy,

Modified: trunk/libavcodec/celp_math.h
==============================================================================
--- trunk/libavcodec/celp_math.h	Mon Dec 29 17:56:02 2008	(r16390)
+++ trunk/libavcodec/celp_math.h	Mon Dec 29 18:14:30 2008	(r16391)
@@ -51,26 +51,6 @@ int ff_exp2(uint16_t power);
 int ff_log2(uint32_t value);
 
 /**
- * returns the dot product.
- * @param a input data array
- * @param b input data array
- * @param length number of elements
- * @param shift right shift by this value will be done after multiplication
- *
- * @return dot product = sum of elementwise products
- */
-static int dot_product(const int16_t* a, const int16_t* b, int length, int shift)
-{
-    int sum = 0;
-    int i;
-
-    for(i=0; i<length; i++)
-        sum += (a[i] * b[i]) >> shift;
-
-    return sum;
-}
-
-/**
  * Shift value left or right depending on sign of offset parameter.
  * @param value value to shift
  * @param offset shift offset