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

Minor simplification to the transient code

Browse source
This commit is contained in:
Jean-Marc Valin 2009-06-18 23:33:04 -04:00
parent 0dd2cd4958
commit 2014ca380e
1 changed files with 25 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

55
libcelt/celt.c
View file

@ -568,44 +568,37 @@ int celt_encode_float(CELTEncoder * restrict st, const celt_sig_t * pcm, celt_si
CELT_COPY(st->in_mem, in+C*(2*N-2*N4-st->overlap), C*st->overlap); CELT_COPY(st->in_mem, in+C*(2*N-2*N4-st->overlap), C*st->overlap);
/* Transient handling */ /* Transient handling */
if (st->mode->nbShortMdcts > 1) transient_time = -1;
transient_shift = 0;
shortBlocks = 0;
if (st->mode->nbShortMdcts > 1 && transient_analysis(in, N+st->overlap, C, &transient_time, &transient_shift))
{ {
if (transient_analysis(in, N+st->overlap, C, &transient_time, &transient_shift))
{
#ifndef FIXED_POINT #ifndef FIXED_POINT
float gain_1; float gain_1;
#endif #endif
/* Apply the inverse shaping window */ /* Apply the inverse shaping window */
if (transient_shift) if (transient_shift)
{ {
#ifdef FIXED_POINT #ifdef FIXED_POINT
for (c=0;c<C;c++) for (c=0;c<C;c++)
for (i=0;i<16;i++) for (i=0;i<16;i++)
in[C*(transient_time+i-16)+c] = MULT16_32_Q15(EXTRACT16(SHR32(celt_rcp(Q15ONE+MULT16_16(transientWindow[i],((1<<transient_shift)-1))),1)), in[C*(transient_time+i-16)+c]); in[C*(transient_time+i-16)+c] = MULT16_32_Q15(EXTRACT16(SHR32(celt_rcp(Q15ONE+MULT16_16(transientWindow[i],((1<<transient_shift)-1))),1)), in[C*(transient_time+i-16)+c]);
for (c=0;c<C;c++) for (c=0;c<C;c++)
for (i=transient_time;i<N+st->overlap;i++) for (i=transient_time;i<N+st->overlap;i++)
in[C*i+c] = SHR32(in[C*i+c], transient_shift); in[C*i+c] = SHR32(in[C*i+c], transient_shift);
#else #else
for (c=0;c<C;c++) for (c=0;c<C;c++)
for (i=0;i<16;i++) for (i=0;i<16;i++)
in[C*(transient_time+i-16)+c] /= 1+transientWindow[i]*((1<<transient_shift)-1); in[C*(transient_time+i-16)+c] /= 1+transientWindow[i]*((1<<transient_shift)-1);
gain_1 = 1./(1<<transient_shift); gain_1 = 1./(1<<transient_shift);
for (c=0;c<C;c++) for (c=0;c<C;c++)
for (i=transient_time;i<N+st->overlap;i++) for (i=transient_time;i<N+st->overlap;i++)
in[C*i+c] *= gain_1; in[C*i+c] *= gain_1;
#endif #endif
}
shortBlocks = 1;
has_fold = 1;
} else {
transient_time = -1;
transient_shift = 0;
shortBlocks = 0;
} }
} else { shortBlocks = 1;
transient_time = -1; has_fold = 1;
transient_shift = 0;
shortBlocks = 0;
} }
ALLOC(freq, C*N, celt_sig_t); /**< Interleaved signal MDCTs */ ALLOC(freq, C*N, celt_sig_t); /**< Interleaved signal MDCTs */