# HG changeset patch # User michael # Date 1156678960 0 # Node ID ae1dfbbb25bb120424fa44b931340005beaa4168 # Parent 0efda682253cbc178b1c74c312685ca131817716 fix low bitrate mp3 diff -r 0efda682253c -r ae1dfbbb25bb mpegaudiodec.c --- a/mpegaudiodec.c Sun Aug 27 09:19:02 2006 +0000 +++ b/mpegaudiodec.c Sun Aug 27 11:42:40 2006 +0000 @@ -2517,15 +2517,26 @@ default: nb_frames = mp_decode_layer3(s); - if(s->in_gb.buffer) + s->last_buf_size=0; + if(s->in_gb.buffer){ + align_get_bits(&s->gb); + i= (s->gb.size_in_bits - get_bits_count(&s->gb))>>3; + if(i > 0 && i <= BACKSTEP_SIZE){ + memmove(s->last_buf, s->gb.buffer + (get_bits_count(&s->gb)>>3), i); + s->last_buf_size=i; + } s->gb= s->in_gb; + } + align_get_bits(&s->gb); assert((get_bits_count(&s->gb) & 7) == 0); - s->last_buf_size= (s->gb.size_in_bits - get_bits_count(&s->gb))>>3; - if(s->last_buf_size <0 || s->last_buf_size > BACKSTEP_SIZE || nb_frames<0) - s->last_buf_size= FFMIN(BACKSTEP_SIZE, buf_size - HEADER_SIZE); - assert(s->last_buf_size <= buf_size - HEADER_SIZE); - memcpy(s->last_buf, s->gb.buffer + buf_size - HEADER_SIZE - s->last_buf_size, s->last_buf_size); + i= (s->gb.size_in_bits - get_bits_count(&s->gb))>>3; + + if(i<0 || s->last_buf_size + i > BACKSTEP_SIZE || nb_frames<0) + i= FFMIN(BACKSTEP_SIZE-s->last_buf_size, buf_size - HEADER_SIZE); + assert(i <= buf_size - HEADER_SIZE && i>= 0); + memcpy(s->last_buf + s->last_buf_size, s->gb.buffer + buf_size - HEADER_SIZE - i, i); + s->last_buf_size += i; break; }