Mercurial > libavcodec.hg
diff ac3_parser.c @ 7011:77f607fb4e8b libavcodec
get the number of blocks from the ac3 parser and use in the ac3 decoder.
author | jbr |
---|---|
date | Sat, 07 Jun 2008 22:29:03 +0000 |
parents | 2d0b86dfe5bb |
children | 4156c54aedba |
line wrap: on
line diff
--- a/ac3_parser.c Sat Jun 07 13:21:24 2008 +0000 +++ b/ac3_parser.c Sat Jun 07 22:29:03 2008 +0000 @@ -49,7 +49,6 @@ int ff_ac3_parse_header(GetBitContext *gbc, AC3HeaderInfo *hdr) { int frame_size_code; - int num_blocks; memset(hdr, 0, sizeof(*hdr)); @@ -62,6 +61,8 @@ if(hdr->bitstream_id > 16) return AC3_PARSE_ERROR_BSID; + hdr->num_blocks = 6; + if(hdr->bitstream_id <= 10) { /* Normal AC-3 */ hdr->crc1 = get_bits(gbc, 16); @@ -118,9 +119,8 @@ return AC3_PARSE_ERROR_SAMPLE_RATE; hdr->sample_rate = ff_ac3_sample_rate_tab[sr_code2] / 2; hdr->sr_shift = 1; - num_blocks = 6; } else { - num_blocks = eac3_blocks[get_bits(gbc, 2)]; + hdr->num_blocks = eac3_blocks[get_bits(gbc, 2)]; hdr->sample_rate = ff_ac3_sample_rate_tab[hdr->sr_code]; hdr->sr_shift = 0; } @@ -129,7 +129,7 @@ hdr->lfe_on = get_bits1(gbc); hdr->bit_rate = (uint32_t)(8.0 * hdr->frame_size * hdr->sample_rate / - (num_blocks * 256.0)); + (hdr->num_blocks * 256.0)); hdr->channels = ff_ac3_channels_tab[hdr->channel_mode] + hdr->lfe_on; }