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

Fixes some stereo issues where the right channel wasn't taken into account

Browse source
This commit is contained in:
Jean-Marc Valin 2010-11-04 15:15:54 -04:00
parent 35095c6991
commit a3a066cb61
1 changed files with 11 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

16
libcelt/celt.c
View file

@ -454,6 +454,7 @@ static int tf_analysis(const CELTMode *m, celt_word16 *bandLogE, celt_word16 *ol
/* FIXME: Should check number of bytes *left* */ /* FIXME: Should check number of bytes *left* */
if (nbCompressedBytes<15*C) if (nbCompressedBytes<15*C)
{ {
*tf_sum = 0;
for (i=0;i<len;i++) for (i=0;i<len;i++)
tf_res[i] = isTransient; tf_res[i] = isTransient;
return 0; return 0;
@ -482,9 +483,9 @@ static int tf_analysis(const CELTMode *m, celt_word16 *bandLogE, celt_word16 *ol
for (j=0;j<N;j++) for (j=0;j<N;j++)
tmp[j] = X[j+(m->eBands[i]<<LM)]; tmp[j] = X[j+(m->eBands[i]<<LM)];
/* FIXME: Do something with the right channel */ /* FIXME: Do something with the right channel */
/*if (C==2) if (C==2)
for (j=0;j<N;j++) for (j=0;j<N;j++)
tmp[j] = ADD16(tmp[j],X[N0+j+(m->eBands[i]<<LM)]);*/ tmp[j] = ADD16(tmp[j],X[N0+j+(m->eBands[i]<<LM)]);
L1 = l1_metric(tmp, N, isTransient ? LM : 0, N>>LM); L1 = l1_metric(tmp, N, isTransient ? LM : 0, N>>LM);
best_L1 = L1; best_L1 = L1;
/*printf ("%f ", L1);*/ /*printf ("%f ", L1);*/
@ -899,7 +900,7 @@ int celt_encode_with_ec_float(CELTEncoder * restrict st, const celt_sig * pcm, i
offsets[i] = 0; offsets[i] = 0;
/* Dynamic allocation code */ /* Dynamic allocation code */
/* Make sure that dynamic allocation can't make us bust the budget */ /* Make sure that dynamic allocation can't make us bust the budget */
if (nbCompressedBytes > 30) if (nbCompressedBytes > 30 && LM>=1)
{ {
int t1, t2; int t1, t2;
if (LM <= 1) if (LM <= 1)
@ -912,9 +913,14 @@ int celt_encode_with_ec_float(CELTEncoder * restrict st, const celt_sig * pcm, i
} }
for (i=1;i<st->mode->nbEBands-1;i++) for (i=1;i<st->mode->nbEBands-1;i++)
{ {
if (2*bandLogE[i]-bandLogE[i-1]-bandLogE[i+1] > SHL16(t1,DB_SHIFT)) celt_word32 d2;
d2 = 2*bandLogE[i]-bandLogE[i-1]-bandLogE[i+1];
if (C==2)
d2 = HALF32(d2 + 2*bandLogE[i+st->mode->nbEBands]-
bandLogE[i-1+st->mode->nbEBands]-bandLogE[i+1+st->mode->nbEBands]);
if (d2 > SHL16(t1,DB_SHIFT))
offsets[i] += 1; offsets[i] += 1;
if (2*bandLogE[i]-bandLogE[i-1]-bandLogE[i+1] > SHL16(t2,DB_SHIFT)) if (d2 > SHL16(t2,DB_SHIFT))
offsets[i] += 1; offsets[i] += 1;
} }
} }