Mercurial > libavcodec.hg
comparison flacdec.c @ 9120:dfd80d6fabfe libavcodec
cosmetics: indentation after last commit
| author | jbr |
|---|---|
| date | Wed, 04 Mar 2009 00:53:04 +0000 |
| parents | f3d87e34599f |
| children | 7f11c330c5d6 |
comparison
equal
deleted
inserted
replaced
| 9119:f3d87e34599f | 9120:dfd80d6fabfe |
|---|---|
| 229 static int metadata_parse(FLACContext *s) | 229 static int metadata_parse(FLACContext *s) |
| 230 { | 230 { |
| 231 int i, metadata_last, metadata_type, metadata_size; | 231 int i, metadata_last, metadata_type, metadata_size; |
| 232 int initial_pos= get_bits_count(&s->gb); | 232 int initial_pos= get_bits_count(&s->gb); |
| 233 | 233 |
| 234 skip_bits_long(&s->gb, 32); | 234 skip_bits_long(&s->gb, 32); |
| 235 | 235 |
| 236 do { | 236 do { |
| 237 metadata_last = get_bits1(&s->gb); | 237 metadata_last = get_bits1(&s->gb); |
| 238 metadata_type = get_bits(&s->gb, 7); | 238 metadata_type = get_bits(&s->gb, 7); |
| 239 metadata_size = get_bits_long(&s->gb, 24); | 239 metadata_size = get_bits_long(&s->gb, 24); |
| 240 | 240 |
| 241 if (get_bits_count(&s->gb) + 8*metadata_size > s->gb.size_in_bits) { | 241 if (get_bits_count(&s->gb) + 8*metadata_size > s->gb.size_in_bits) { |
| 242 skip_bits_long(&s->gb, initial_pos - get_bits_count(&s->gb)); | 242 skip_bits_long(&s->gb, initial_pos - get_bits_count(&s->gb)); |
| 243 break; | 243 break; |
| 244 } | |
| 245 | |
| 246 if (metadata_size) { | |
| 247 switch (metadata_type) { | |
| 248 case FLAC_METADATA_TYPE_STREAMINFO: | |
| 249 if (!s->got_streaminfo) { | |
| 250 ff_flac_parse_streaminfo(s->avctx, (FLACStreaminfo *)s, | |
| 251 s->gb.buffer+get_bits_count(&s->gb)/8); | |
| 252 allocate_buffers(s); | |
| 253 s->got_streaminfo = 1; | |
| 254 } | |
| 255 default: | |
| 256 for (i = 0; i < metadata_size; i++) | |
| 257 skip_bits(&s->gb, 8); | |
| 244 } | 258 } |
| 245 | 259 } |
| 246 if (metadata_size) { | 260 } while (!metadata_last); |
| 247 switch (metadata_type) { | |
| 248 case FLAC_METADATA_TYPE_STREAMINFO: | |
| 249 if (!s->got_streaminfo) { | |
| 250 ff_flac_parse_streaminfo(s->avctx, (FLACStreaminfo *)s, | |
| 251 s->gb.buffer+get_bits_count(&s->gb)/8); | |
| 252 allocate_buffers(s); | |
| 253 s->got_streaminfo = 1; | |
| 254 } | |
| 255 default: | |
| 256 for (i = 0; i < metadata_size; i++) | |
| 257 skip_bits(&s->gb, 8); | |
| 258 } | |
| 259 } | |
| 260 } while (!metadata_last); | |
| 261 | 261 |
| 262 return 0; | 262 return 0; |
| 263 } | 263 } |
| 264 | 264 |
| 265 static int decode_residuals(FLACContext *s, int channel, int pred_order) | 265 static int decode_residuals(FLACContext *s, int channel, int pred_order) |