Commit 645a6be1 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge the 2 lpc loops.

This changes the output by (stddev:    0.21 PSNR:109.51, file:ddinterview28.ra),
the changes are due to float rounding inaccuracies and do not happen if doubles
are used.

Originally committed as revision 15394 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 571bbaf8
...@@ -103,16 +103,14 @@ static void decode(RA288Context *ractx, float gain, int cb_coef) ...@@ -103,16 +103,14 @@ 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++) { for (i=0; i < 5; i++) {
block[i] = 0; block[i] = buffer[i];
for (j=0; j < 36; j++) for (j=0; j < 36; j++)
block[i] -= block[i-1-j]*ractx->sp_lpc[j]; block[i] -= block[i-1-j]*ractx->sp_lpc[j];
for (j=0; j < i; j++)
buffer[i] -= buffer[i-1-j]*ractx->sp_lpc[j];
} }
/* output */ /* output */
for (i=0; i < 5; i++) for (i=0; i < 5; i++)
block[i] = av_clipf(block[i] + buffer[i], -4095, 4095); block[i] = av_clipf(block[i], -4095, 4095);
} }
static void convolve(float *tgt, const float *src, int len, int n) static void convolve(float *tgt, const float *src, int len, int n)
......
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