Commit c8316702 authored by vitor's avatar vitor

Yet more table renaming

git-svn-id: file:///var/local/repositories/ffmpeg/trunk@13827 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent 1e667586
...@@ -130,7 +130,7 @@ static void add_wav(int n, int skip_first, int *m, const int16_t *s1, ...@@ -130,7 +130,7 @@ static void add_wav(int n, int skip_first, int *m, const int16_t *s1,
v[0] = 0; v[0] = 0;
for (i=!skip_first; i<3; i++) for (i=!skip_first; i<3; i++)
v[i] = (wavtable1[n][i] * m[i]) >> (wavtable2[n][i] + 1); v[i] = (gain_val_tab[n][i] * m[i]) >> (gain_exp_tab[n][i] + 1);
for (i=0; i < BLOCKSIZE; i++) for (i=0; i < BLOCKSIZE; i++)
dest[i] = ((*(s1++))*v[0] + (*(s2++))*v[1] + (*(s3++))*v[2]) >> 12; dest[i] = ((*(s1++))*v[0] + (*(s2++))*v[1] + (*(s3++))*v[2]) >> 12;
......
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
#include <stdint.h> #include <stdint.h>
/* 14.4 data tables */ /* 14.4 data tables */
static const int16_t wavtable1[256][9] = { static const int16_t gain_val_tab[256][9] = {
{ 541, 956, 768, -1011, -811, -717, -571, -893, -576}, { 541, 956, 768, -1011, -811, -717, -571, -893, -576},
{ 877, 581, 568, -997, -975, -646, -752, -661, -632}, { 877, 581, 568, -997, -975, -646, -752, -661, -632},
{ 675, 787, 635, -519, -838, -977, -890, -605, -789}, { 675, 787, 635, -519, -838, -977, -890, -605, -789},
...@@ -284,7 +284,7 @@ static const int16_t wavtable1[256][9] = { ...@@ -284,7 +284,7 @@ static const int16_t wavtable1[256][9] = {
{ 814, 744, 543, -592, -865, -790, -648, -541, -577} { 814, 744, 543, -592, -865, -790, -648, -541, -577}
}; };
static const uint8_t wavtable2[256][9] = { static const uint8_t gain_exp_tab[256][9] = {
{14, 14, 14, 20, 20, 19, 21, 20, 20}, {14, 14, 14, 20, 20, 19, 21, 20, 20},
{14, 14, 14, 20, 20, 20, 20, 21, 21}, {14, 14, 14, 20, 20, 20, 20, 21, 21},
{14, 13, 14, 18, 20, 19, 21, 18, 21}, {14, 13, 14, 18, 20, 19, 21, 18, 21},
......
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