diff options
| author | Vitor Sessak <vitor1001@gmail.com> | 2008-05-28 19:04:34 +0000 |
|---|---|---|
| committer | Vitor Sessak <vitor1001@gmail.com> | 2008-05-28 19:04:34 +0000 |
| commit | 31e15894d577e6cb46ecdf737ebc722aaaf14900 (patch) | |
| tree | 1c042a9f4ac2b53a9f2839aa03f591c28ba4c825 | |
| parent | 594409a25cd7c29632d7f40a459103f285d835aa (diff) | |
| download | ffmpeg-31e15894d577e6cb46ecdf737ebc722aaaf14900.tar.gz | |
Use ff_acelp_weighted_vector_sum() instead of reimplementing it
Originally committed as revision 13500 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavcodec/Makefile | 2 | ||||
| -rw-r--r-- | libavcodec/ra144.c | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 29b34a6b61..d4f6d1cd89 100644 --- 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 04b39d8c78..104c260417 100644 --- 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 |