comparison mpegaudiodec.c @ 3643:ae1dfbbb25bb libavcodec

fix low bitrate mp3
author michael
date Sun, 27 Aug 2006 11:42:40 +0000
parents b325c92e7bed
children 9eb3d84b6eef
comparison
equal deleted inserted replaced
3642:0efda682253c 3643:ae1dfbbb25bb
2515 break; 2515 break;
2516 case 3: 2516 case 3:
2517 default: 2517 default:
2518 nb_frames = mp_decode_layer3(s); 2518 nb_frames = mp_decode_layer3(s);
2519 2519
2520 if(s->in_gb.buffer) 2520 s->last_buf_size=0;
2521 if(s->in_gb.buffer){
2522 align_get_bits(&s->gb);
2523 i= (s->gb.size_in_bits - get_bits_count(&s->gb))>>3;
2524 if(i > 0 && i <= BACKSTEP_SIZE){
2525 memmove(s->last_buf, s->gb.buffer + (get_bits_count(&s->gb)>>3), i);
2526 s->last_buf_size=i;
2527 }
2521 s->gb= s->in_gb; 2528 s->gb= s->in_gb;
2529 }
2530
2522 align_get_bits(&s->gb); 2531 align_get_bits(&s->gb);
2523 assert((get_bits_count(&s->gb) & 7) == 0); 2532 assert((get_bits_count(&s->gb) & 7) == 0);
2524 s->last_buf_size= (s->gb.size_in_bits - get_bits_count(&s->gb))>>3; 2533 i= (s->gb.size_in_bits - get_bits_count(&s->gb))>>3;
2525 if(s->last_buf_size <0 || s->last_buf_size > BACKSTEP_SIZE || nb_frames<0) 2534
2526 s->last_buf_size= FFMIN(BACKSTEP_SIZE, buf_size - HEADER_SIZE); 2535 if(i<0 || s->last_buf_size + i > BACKSTEP_SIZE || nb_frames<0)
2527 assert(s->last_buf_size <= buf_size - HEADER_SIZE); 2536 i= FFMIN(BACKSTEP_SIZE-s->last_buf_size, buf_size - HEADER_SIZE);
2528 memcpy(s->last_buf, s->gb.buffer + buf_size - HEADER_SIZE - s->last_buf_size, s->last_buf_size); 2537 assert(i <= buf_size - HEADER_SIZE && i>= 0);
2538 memcpy(s->last_buf + s->last_buf_size, s->gb.buffer + buf_size - HEADER_SIZE - i, i);
2539 s->last_buf_size += i;
2529 2540
2530 break; 2541 break;
2531 } 2542 }
2532 #if defined(DEBUG) 2543 #if defined(DEBUG)
2533 for(i=0;i<nb_frames;i++) { 2544 for(i=0;i<nb_frames;i++) {