eden-emu/opus
19
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Updating only the L-best entries in alg_quant() that are useful.

Browse source
This commit is contained in:
Jean-Marc Valin 2008-02-12 17:21:14 +11:00
parent fe41983619
commit cab576ec9b
1 changed files with 15 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

28
libcelt/vq.c
View file

@ -92,18 +92,20 @@ void alg_quant(float *x, float *W, int N, int K, float *p, float alpha, ec_enc *
while (pulsesLeft > 0) while (pulsesLeft > 0)
{ {
int pulsesAtOnce=1; int pulsesAtOnce=1;
int Lupdate = L;
int L2 = L; int L2 = L;
if (L>maxL) pulsesAtOnce = pulsesLeft/N;
if (pulsesAtOnce<1)
pulsesAtOnce = 1;
if (pulsesLeft-pulsesAtOnce > 3 || N > 30)
Lupdate = 1;
//printf ("%d %d %d/%d %d\n", Lupdate, pulsesAtOnce, pulsesLeft, K, N);
L2 = Lupdate;
if (L2>maxL)
{ {
L2 = maxL; L2 = maxL;
maxL *= N; maxL *= N;
} }
if (pulsesLeft > 5)
L2 = 1;
pulsesAtOnce = pulsesLeft/N;
if (pulsesAtOnce<1)
pulsesAtOnce = 1;
for (m=0;m<L;m++) for (m=0;m<L;m++)
best_scores[m] = -1e10; best_scores[m] = -1e10;
@ -131,19 +133,19 @@ void alg_quant(float *x, float *W, int N, int K, float *p, float alpha, ec_enc *
g = (sqrt(tmp_yp*tmp_yp + tmp_yy - tmp_yy*Rpp) - tmp_yp)/tmp_yy; g = (sqrt(tmp_yp*tmp_yp + tmp_yy - tmp_yy*Rpp) - tmp_yp)/tmp_yy;
score = 2*g*tmp_xy - g*g*tmp_yy; score = 2*g*tmp_xy - g*g*tmp_yy;
if (score>best_scores[L-1]) if (score>best_scores[Lupdate-1])
{ {
int k, n; int k, n;
int id = L-1; int id = Lupdate-1;
float *tmp_ny; float *tmp_ny;
int *tmp_iny; int *tmp_iny;
tmp_ny = ny[L-1]; tmp_ny = ny[Lupdate-1];
tmp_iny = iny[L-1]; tmp_iny = iny[Lupdate-1];
while (id > 0 && score > best_scores[id-1]) while (id > 0 && score > best_scores[id-1])
id--; id--;
for (k=L-1;k>id;k--) for (k=Lupdate-1;k>id;k--)
{ {
nxy[k] = nxy[k-1]; nxy[k] = nxy[k-1];
nyy[k] = nyy[k-1]; nyy[k] = nyy[k-1];
@ -181,7 +183,7 @@ void alg_quant(float *x, float *W, int N, int K, float *p, float alpha, ec_enc *
} }
int k; int k;
for (k=0;k<L;k++) for (k=0;k<Lupdate;k++)
{ {
float *tmp_ny; float *tmp_ny;
int *tmp_iny; int *tmp_iny;