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

More recombining "infrastructure"

Browse source
This commit is contained in:
Jean-Marc Valin 2010-05-25 23:54:56 -04:00
parent cee66b512e
commit 9d069846ee
1 changed files with 15 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

15
libcelt/bands.c
View file

@ -492,7 +492,7 @@ static void quant_band(int encode, const CELTMode *m, int i, celt_norm *X, celt_
if (!stereo && spread > 1 && level == 0 && tf_change>0) if (!stereo && spread > 1 && level == 0 && tf_change>0)
{ {
while (spread>1 && recombine<2) while (spread>1 && tf_change>0)
{ {
spread>>=1; spread>>=1;
N_B<<=1; N_B<<=1;
@ -501,6 +501,7 @@ static void quant_band(int encode, const CELTMode *m, int i, celt_norm *X, celt_
if (lowband) if (lowband)
haar1(lowband, N_B, spread); haar1(lowband, N_B, spread);
recombine++; recombine++;
tf_change--;
} }
spread0=spread; spread0=spread;
N_B0 = N_B; N_B0 = N_B;
@ -508,23 +509,27 @@ static void quant_band(int encode, const CELTMode *m, int i, celt_norm *X, celt_
if (!stereo && spread>1 && level==0) if (!stereo && spread>1 && level==0)
{ {
if ((N_B&1) == 0 && tf_change<0) while ((N_B&1) == 0 && tf_change<0 && spread <= (1<<LM))
{ {
if (encode) if (encode)
haar1(X, N_B0, spread0); haar1(X, N_B, spread);
if (lowband) if (lowband)
haar1(lowband, N_B0, spread0); haar1(lowband, N_B, spread);
spread <<= 1; spread <<= 1;
N_B >>= 1; N_B >>= 1;
time_divide++; time_divide++;
tf_change++;
}
spread0 = spread; spread0 = spread;
N_B0 = N_B; N_B0 = N_B;
} if (spread0>1)
{
if (encode) if (encode)
deinterleave_vector(X, N_B, spread0); deinterleave_vector(X, N_B, spread0);
if (lowband) if (lowband)
deinterleave_vector(lowband, N_B, spread0); deinterleave_vector(lowband, N_B, spread0);
} }
}
/* If we need more than 32 bits, try splitting the band in two. */ /* If we need more than 32 bits, try splitting the band in two. */
if (!stereo && LM != -1 && b > 32<<BITRES) if (!stereo && LM != -1 && b > 32<<BITRES)