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

Fix collapse_masks overflow for mono.

Browse source 
We were always storing collapse_masks[i*C+1], which could have
 overflowed the buffer on the last band in mono.
This also moves the stores outside the conditional, which allows
 common code to be used for masking the high bits, address
 generation, etc.
This commit is contained in:
Timothy B. Terriberry 2011-01-20 23:08:31 -08:00 • committed by Jean-Marc Valin
parent 5da938b2db
commit 6bdc53b86f
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
libcelt/bands.c
View file

@ -1209,14 +1209,14 @@ void quant_all_bands(int encode, const CELTMode *m, int start, int end,
y_cm = quant_band(encode, m, i, Y, NULL, N, b/2, spread, B, intensity, tf_change, y_cm = quant_band(encode, m, i, Y, NULL, N, b/2, spread, B, intensity, tf_change,
effective_lowband != -1 ? norm2+effective_lowband : NULL, resynth, ec, &remaining_bits, LM, effective_lowband != -1 ? norm2+effective_lowband : NULL, resynth, ec, &remaining_bits, LM,
norm2+M*eBands[i], bandE, 0, seed, Q15ONE, lowband_scratch, y_cm); norm2+M*eBands[i], bandE, 0, seed, Q15ONE, lowband_scratch, y_cm);
collapse_masks[i*2+0] = (unsigned char)(x_cm&(1<<B)-1);
collapse_masks[i*2+1] = (unsigned char)(y_cm&(1<<B)-1);
} else { } else {
x_cm = quant_band(encode, m, i, X, Y, N, b, spread, B, intensity, tf_change, x_cm = quant_band(encode, m, i, X, Y, N, b, spread, B, intensity, tf_change,
effective_lowband != -1 ? norm+effective_lowband : NULL, resynth, ec, &remaining_bits, LM, effective_lowband != -1 ? norm+effective_lowband : NULL, resynth, ec, &remaining_bits, LM,
norm+M*eBands[i], bandE, 0, seed, Q15ONE, lowband_scratch, x_cm|y_cm); norm+M*eBands[i], bandE, 0, seed, Q15ONE, lowband_scratch, x_cm|y_cm);
collapse_masks[i*C+1] = collapse_masks[i*C+0] = (unsigned char)(x_cm&(1<<B)-1); y_cm = x_cm;
} }
collapse_masks[i*C+0] = (unsigned char)(x_cm&(1<<B)-1);
collapse_masks[i*C+C-1] = (unsigned char)(y_cm&(1<<B)-1);
balance += pulses[i] + tell; balance += pulses[i] + tell;
/* Update the folding position only as long as we have 1 bit/sample depth */ /* Update the folding position only as long as we have 1 bit/sample depth */