# HG changeset patch # User kabi # Date 1003868401 0 # Node ID 42a36eb08c8dda07f41e134f8ec6b6dc0b185dc8 # Parent 036ec148fb18cadfece950980a3f576c3c341d16 * and finaly avoid deadlock at the end of audio stream diff -r 036ec148fb18 -r 42a36eb08c8d mpegaudiodec.c --- a/mpegaudiodec.c Tue Oct 23 19:58:30 2001 +0000 +++ b/mpegaudiodec.c Tue Oct 23 20:20:01 2001 +0000 @@ -2271,9 +2271,9 @@ if (len > buf_size) len = buf_size; else if (len > 0) { - memcpy(s->inbuf_ptr, buf_ptr, len); - buf_ptr += len; - buf_size -= len; + memcpy(s->inbuf_ptr, buf_ptr, len); + buf_ptr += len; + buf_size -= len; s->inbuf_ptr += len; } if ((s->inbuf_ptr - s->inbuf) >= HEADER_SIZE) { @@ -2282,7 +2282,7 @@ (s->inbuf[2] << 8) | s->inbuf[3]; if (check_header(header) < 0) { /* no sync found : move by one byte (inefficient, but simple!) */ - memcpy(s->inbuf, s->inbuf + 1, s->inbuf_ptr - s->inbuf); + memcpy(s->inbuf, s->inbuf + 1, s->inbuf_ptr - s->inbuf - 1); s->inbuf_ptr--; dprintf("skip %x\n", header); /* reset free format frame size to give a chance @@ -2291,14 +2291,14 @@ } else { if (decode_header(s, header) == 1) { /* free format: compute frame size */ - s->frame_size = -1; - memcpy(s->inbuf, s->inbuf + 1, s->inbuf_ptr - s->inbuf); + s->frame_size = -1; + memcpy(s->inbuf, s->inbuf + 1, s->inbuf_ptr - s->inbuf - 1); s->inbuf_ptr--; } else { /* update codec info */ avctx->sample_rate = s->sample_rate; avctx->channels = s->nb_channels; - avctx->bit_rate = s->bit_rate; + avctx->bit_rate = s->bit_rate; } } } @@ -2359,13 +2359,12 @@ len = s->frame_size - len; if (len > buf_size) len = buf_size; - else if (len > 0) - { + else if (len < 4) + len = buf_size > 4 ? 4 : buf_size; memcpy(s->inbuf_ptr, buf_ptr, len); buf_ptr += len; s->inbuf_ptr += len; buf_size -= len; - } } else { out_size = mp_decode_frame(s, out_samples); s->inbuf_ptr = s->inbuf;