eden-emu/opus
15
0
Fork 0
mirror of https://github.com/xiph/opus.git synced 2025-06-07 16:00:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Properly allocation scratch space for resynth encoder

Browse source
This commit is contained in:
Jean-Marc Valin 2016-07-25 20:44:17 -04:00
parent 9eee106214
commit 3934fac7e2
1 changed files with 15 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

16
celt/bands.c
View file

@ -1336,6 +1336,8 @@ void quant_all_bands(int encode, const CELTMode *m, int start, int end,
const opus_int16 * OPUS_RESTRICT eBands = m->eBands;
celt_norm * OPUS_RESTRICT norm, * OPUS_RESTRICT norm2;
VARDECL(celt_norm, _norm);
VARDECL(celt_norm, _lowband_scratch);
int resynth_alloc;
celt_norm *lowband_scratch;
int B;
int M;
@ -1359,8 +1361,18 @@ void quant_all_bands(int encode, const CELTMode *m, int start, int end,
ALLOC(_norm, C*(M*eBands[m->nbEBands-1]-norm_offset), celt_norm);
norm = _norm;
norm2 = norm + M*eBands[m->nbEBands-1]-norm_offset;
/* We can use the last band as scratch space because we don't need that
scratch space for the last band. */
/* For decoding, we can use the last band as scratch space because we don't need that
scratch space for the last band and we don't care about the data there until we're
decoding the last band. */
if (encode && resynth)
resynth_alloc = M*(eBands[m->nbEBands]-eBands[m->nbEBands-1]);
else
resynth_alloc = ALLOC_NONE;
ALLOC(_lowband_scratch, resynth_alloc, celt_norm);
if (encode && resynth)
lowband_scratch = _lowband_scratch;
else
lowband_scratch = X_+M*eBands[m->nbEBands-1];
lowband_offset = 0;