Makes sure there's a PLC-only region in the mode transition

This commit is contained in:
Jean-Marc Valin 2011-02-16 00:41:04 -05:00
parent 73870719a2
commit ca869b2ee4

View file

@ -225,15 +225,17 @@ int opus_decode(OpusDecoder *st, const unsigned char *data,
if (transition) if (transition)
{ {
int tlength; int plc_length, overlap;
if (mode == MODE_CELT_ONLY) if (mode == MODE_CELT_ONLY)
tlength = IMIN(audiosize, 10+st->Fs/200); plc_length = IMIN(audiosize, 10+st->Fs/200);
else else
tlength = IMIN(audiosize, 10+st->Fs/400); plc_length = IMIN(audiosize, 10+st->Fs/400);
for (i=0;i<audiosize;i++) for (i=0;i<plc_length;i++)
{ pcm[i] = pcm_transition[i];
pcm[i] = (i*pcm[i] + (audiosize-i)*pcm_transition[i])/audiosize;
} overlap = IMIN(480, IMAX(0, audiosize-plc_length));
for (i=0;i<overlap;i++)
pcm[plc_length+i] = (i*pcm[plc_length+i] + (overlap-i)*pcm_transition[plc_length+i])/overlap;
} }
#if OPUS_TEST_RANGE_CODER_STATE #if OPUS_TEST_RANGE_CODER_STATE
st->rangeFinal = dec.rng; st->rangeFinal = dec.rng;