Mercurial > libavcodec.hg
changeset 6923:71bde6319fa4 libavcodec
Use ff_acelp_weighted_vector_sum() instead of reimplementing it
author | vitor |
---|---|
date | Wed, 28 May 2008 19:04:34 +0000 |
parents | 8b2d8d412558 |
children | e9b74daec9bb |
files | Makefile ra144.c |
diffstat | 2 files changed, 4 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile Wed May 28 19:02:16 2008 +0000 +++ b/Makefile Wed May 28 19:04:34 2008 +0000 @@ -152,7 +152,7 @@ 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
--- a/ra144.c Wed May 28 19:02:16 2008 +0000 +++ b/ra144.c Wed May 28 19:04:34 2008 +0000 @@ -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 @@ // 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