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

17
libcelt/celt.c
View file

@ -568,9 +568,11 @@ 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;
if (transient_analysis(in, N+st->overlap, C, &transient_time, &transient_shift)) shortBlocks = 0;
if (st->mode->nbShortMdcts > 1 && transient_analysis(in, N+st->overlap, C, &transient_time, &transient_shift))
{ {
#ifndef FIXED_POINT #ifndef FIXED_POINT
float gain_1; float gain_1;
@ -597,15 +599,6 @@ int celt_encode_float(CELTEncoder * restrict st, const celt_sig_t * pcm, celt_si
} }
shortBlocks = 1; shortBlocks = 1;
has_fold = 1; has_fold = 1;
} else {
transient_time = -1;
transient_shift = 0;
shortBlocks = 0;
}
} else {
transient_time = -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 */