Commit e79d4241 authored by vitor's avatar vitor

Do not reimplement ff_celp_lp_synthesis_filterf().


git-svn-id: file:///var/local/repositories/ffmpeg/trunk@17562 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent cd06d410
...@@ -173,7 +173,7 @@ OBJS-$(CONFIG_QPEG_DECODER) += qpeg.o ...@@ -173,7 +173,7 @@ OBJS-$(CONFIG_QPEG_DECODER) += qpeg.o
OBJS-$(CONFIG_QTRLE_DECODER) += qtrle.o OBJS-$(CONFIG_QTRLE_DECODER) += qtrle.o
OBJS-$(CONFIG_QTRLE_ENCODER) += qtrleenc.o OBJS-$(CONFIG_QTRLE_ENCODER) += qtrleenc.o
OBJS-$(CONFIG_RA_144_DECODER) += ra144.o celp_filters.o OBJS-$(CONFIG_RA_144_DECODER) += ra144.o celp_filters.o
OBJS-$(CONFIG_RA_288_DECODER) += ra288.o celp_math.o OBJS-$(CONFIG_RA_288_DECODER) += ra288.o celp_math.o celp_filters.o
OBJS-$(CONFIG_RAWVIDEO_DECODER) += rawdec.o OBJS-$(CONFIG_RAWVIDEO_DECODER) += rawdec.o
OBJS-$(CONFIG_RAWVIDEO_ENCODER) += rawenc.o OBJS-$(CONFIG_RAWVIDEO_ENCODER) += rawenc.o
OBJS-$(CONFIG_RL2_DECODER) += rl2.o OBJS-$(CONFIG_RL2_DECODER) += rl2.o
......
...@@ -25,6 +25,7 @@ ...@@ -25,6 +25,7 @@
#include "ra288.h" #include "ra288.h"
#include "lpc.h" #include "lpc.h"
#include "celp_math.h" #include "celp_math.h"
#include "celp_filters.h"
typedef struct { typedef struct {
float sp_lpc[36]; ///< LPC coefficients for speech data (spec: A) float sp_lpc[36]; ///< LPC coefficients for speech data (spec: A)
...@@ -68,7 +69,7 @@ static void convolve(float *tgt, const float *src, int len, int n) ...@@ -68,7 +69,7 @@ static void convolve(float *tgt, const float *src, int len, int n)
static void decode(RA288Context *ractx, float gain, int cb_coef) static void decode(RA288Context *ractx, float gain, int cb_coef)
{ {
int i, j; int i;
double sumsum; double sumsum;
float sum, buffer[5]; float sum, buffer[5];
float *block = ractx->sp_hist + 70 + 36; // current block float *block = ractx->sp_hist + 70 + 36; // current block
...@@ -100,11 +101,7 @@ static void decode(RA288Context *ractx, float gain, int cb_coef) ...@@ -100,11 +101,7 @@ static void decode(RA288Context *ractx, float gain, int cb_coef)
gain_block[9] = 10 * log10(sum) - 32; gain_block[9] = 10 * log10(sum) - 32;
for (i=0; i < 5; i++) { ff_celp_lp_synthesis_filterf(block, ractx->sp_lpc, buffer, 5, 36);
block[i] = buffer[i];
for (j=0; j < 36; j++)
block[i] -= block[i-1-j]*ractx->sp_lpc[j];
}
/* output */ /* output */
for (i=0; i < 5; i++) for (i=0; i < 5; i++)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment