generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

libspeexdec: properly handle DTX for multiple frames-per-packet

Browse Source
This commit is contained in:
Justin Ruggles 2012-09-30 23:11:43 -04:00
parent 908e22b93a
commit 45e5d0c3ac
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libavcodec/libspeexdec.c
View File

@ -119,10 +119,12 @@ static int libspeex_decode_frame(AVCodecContext *avctx, void *data,
} }
output = (int16_t *)s->frame.data[0]; output = (int16_t *)s->frame.data[0];
/* if there is not enough data left for the smallest possible frame, /* if there is not enough data left for the smallest possible frame or the
reset the libspeex buffer using the current packet, otherwise ignore next 5 bits are a terminator code, reset the libspeex buffer using the
the current packet and keep decoding frames from the libspeex buffer. */ current packet, otherwise ignore the current packet and keep decoding
if (speex_bits_remaining(&s->bits) < 43) { frames from the libspeex buffer. */
if (speex_bits_remaining(&s->bits) < 5 ||
speex_bits_peek_unsigned(&s->bits, 5) == 0x1F) {
/* check for flush packet */ /* check for flush packet */
if (!buf || !buf_size) { if (!buf || !buf_size) {
*got_frame_ptr = 0; *got_frame_ptr = 0;