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

More error handling

Browse source
This commit is contained in:
Jean-Marc Valin 2011-03-14 11:44:16 -04:00
parent 71877da4eb
commit ac768f3363
1 changed files with 8 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/opus_decoder.c
View file

@ -340,18 +340,18 @@ int opus_decode(OpusDecoder *st, const unsigned char *data,
{ {
int i, bytes, nb_samples; int i, bytes, nb_samples;
int count; int count;
unsigned char ch, toc;
/* 48 x 2.5 ms = 120 ms */ /* 48 x 2.5 ms = 120 ms */
short size[48]; short size[48];
if (len<1) if (len<1)
return CELT_BAD_ARG; return CELT_BAD_ARG;
count = opus_packet_get_nb_frames(data, len);
st->mode = opus_packet_get_mode(data); st->mode = opus_packet_get_mode(data);
st->bandwidth = opus_packet_get_bandwidth(data); st->bandwidth = opus_packet_get_bandwidth(data);
st->frame_size = opus_packet_get_samples_per_frame(data, st->Fs); st->frame_size = opus_packet_get_samples_per_frame(data, st->Fs);
st->stream_channels = opus_packet_get_nb_channels(data); st->stream_channels = opus_packet_get_nb_channels(data);
data++; toc = *data++;
len--; len--;
switch (data[-1]&0x3) switch (toc&0x3)
{ {
/* One frame */ /* One frame */
case 0: case 0:
@ -380,11 +380,13 @@ int opus_decode(OpusDecoder *st, const unsigned char *data,
if (len<1) if (len<1)
return OPUS_CORRUPTED_DATA; return OPUS_CORRUPTED_DATA;
/* Number of frames encoded in bits 0 to 5 */ /* Number of frames encoded in bits 0 to 5 */
count = data[0]&0x3F; ch = *data++;
data++; count = ch&0x3F;
if (st->frame_size*count*25 > 3*st->Fs)
return OPUS_CORRUPTED_DATA;
len--; len--;
/* Bit 7 is VBR flag (bit 6 is ignored) */ /* Bit 7 is VBR flag (bit 6 is ignored) */
if (data[0]&0x80) if (ch&0x80)
{ {
/* VBR case */ /* VBR case */
int last_size=len; int last_size=len;