Mercurial > libavcodec.hg
comparison mpegaudiodec.c @ 10535:95f3daa991a2 libavcodec
Use get_bits_left() instead of size_in_bits - get_bits_count().
| author | rbultje |
|---|---|
| date | Mon, 16 Nov 2009 17:42:43 +0000 |
| parents | ead8d96926c4 |
| children | 34a65026fa06 |
comparison
equal
deleted
inserted
replaced
| 10534:4cd2ef16fb63 | 10535:95f3daa991a2 |
|---|---|
| 2160 nb_frames = mp_decode_layer3(s); | 2160 nb_frames = mp_decode_layer3(s); |
| 2161 | 2161 |
| 2162 s->last_buf_size=0; | 2162 s->last_buf_size=0; |
| 2163 if(s->in_gb.buffer){ | 2163 if(s->in_gb.buffer){ |
| 2164 align_get_bits(&s->gb); | 2164 align_get_bits(&s->gb); |
| 2165 i= (s->gb.size_in_bits - get_bits_count(&s->gb))>>3; | 2165 i= get_bits_left(&s->gb)>>3; |
| 2166 if(i >= 0 && i <= BACKSTEP_SIZE){ | 2166 if(i >= 0 && i <= BACKSTEP_SIZE){ |
| 2167 memmove(s->last_buf, s->gb.buffer + (get_bits_count(&s->gb)>>3), i); | 2167 memmove(s->last_buf, s->gb.buffer + (get_bits_count(&s->gb)>>3), i); |
| 2168 s->last_buf_size=i; | 2168 s->last_buf_size=i; |
| 2169 }else | 2169 }else |
| 2170 av_log(s->avctx, AV_LOG_ERROR, "invalid old backstep %d\n", i); | 2170 av_log(s->avctx, AV_LOG_ERROR, "invalid old backstep %d\n", i); |
| 2172 s->in_gb.buffer= NULL; | 2172 s->in_gb.buffer= NULL; |
| 2173 } | 2173 } |
| 2174 | 2174 |
| 2175 align_get_bits(&s->gb); | 2175 align_get_bits(&s->gb); |
| 2176 assert((get_bits_count(&s->gb) & 7) == 0); | 2176 assert((get_bits_count(&s->gb) & 7) == 0); |
| 2177 i= (s->gb.size_in_bits - get_bits_count(&s->gb))>>3; | 2177 i= get_bits_left(&s->gb)>>3; |
| 2178 | 2178 |
| 2179 if(i<0 || i > BACKSTEP_SIZE || nb_frames<0){ | 2179 if(i<0 || i > BACKSTEP_SIZE || nb_frames<0){ |
| 2180 if(i<0) | 2180 if(i<0) |
| 2181 av_log(s->avctx, AV_LOG_ERROR, "invalid new backstep %d\n", i); | 2181 av_log(s->avctx, AV_LOG_ERROR, "invalid new backstep %d\n", i); |
| 2182 i= FFMIN(BACKSTEP_SIZE, buf_size - HEADER_SIZE); | 2182 i= FFMIN(BACKSTEP_SIZE, buf_size - HEADER_SIZE); |