Use ff_acelp_weighted_vector_sum() instead of reimplementing it

Originally committed as revision 13500 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index 29b34a6..d4f6d1c 100644 (file)
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -152,7 +152,7 @@ OBJS-$(CONFIG_QDRAW_DECODER)           += qdrw.o
 OBJS-$(CONFIG_QPEG_DECODER)            += qpeg.o
 OBJS-$(CONFIG_QTRLE_DECODER)           += qtrle.o
 OBJS-$(CONFIG_QTRLE_ENCODER)           += qtrleenc.o
-OBJS-$(CONFIG_RA_144_DECODER)          += ra144.o
+OBJS-$(CONFIG_RA_144_DECODER)          += ra144.o acelp_vectors.o
 OBJS-$(CONFIG_RA_288_DECODER)          += ra288.o
 OBJS-$(CONFIG_RAWVIDEO_DECODER)        += rawdec.o
 OBJS-$(CONFIG_RAWVIDEO_ENCODER)        += rawenc.o

diff --git a/libavcodec/ra144.c b/libavcodec/ra144.c
index 04b39d8..104c260 100644 (file)
--- a/libavcodec/ra144.c
+++ b/libavcodec/ra144.c
@@ -21,6 +21,7 @@
 
 #include "avcodec.h"
 #include "bitstream.h"
+#include "acelp_vectors.h"
 #include "ra144.h"
 
 #define NBLOCKS         4       /* number of segments within a block */
@@ -304,8 +305,8 @@ static int dec2(RA144Context *ractx, int16_t *decsp, int block_num,
 
     // Interpolate block coefficients from the this frame forth block and
     // last frame forth block
-    for (x=0; x<30; x++)
-        decsp[x] = (a * ractx->lpc_coef[x] + b * ractx->lpc_coef_old[x])>> 2;
+    ff_acelp_weighted_vector_sum(decsp, ractx->lpc_coef, ractx->lpc_coef_old,
+                                 a, b, 0, 2, 30);
 
     if (eq(decsp, work)) {
         // The interpolated coefficients are unstable, copy either new or old