Mercurial > libavcodec.hg
diff ac3_parser.c @ 6002:29635f7c3d9c libavcodec
cosmetics: rename ac3 tables
author | jbr |
---|---|
date | Sun, 09 Dec 2007 03:21:33 +0000 |
parents | ced30500e2b1 |
children | 608c8e9ac412 |
line wrap: on
line diff
--- a/ac3_parser.c Sat Dec 08 21:21:11 2007 +0000 +++ b/ac3_parser.c Sun Dec 09 03:21:33 2007 +0000 @@ -76,10 +76,10 @@ hdr->lfeon = get_bits1(&gbc); hdr->halfratecod = FFMAX(hdr->bsid, 8) - 8; - hdr->sample_rate = ff_ac3_freqs[hdr->fscod] >> hdr->halfratecod; - hdr->bit_rate = (ff_ac3_bitratetab[hdr->frmsizecod>>1] * 1000) >> hdr->halfratecod; - hdr->channels = ff_ac3_channels[hdr->acmod] + hdr->lfeon; - hdr->frame_size = ff_ac3_frame_sizes[hdr->frmsizecod][hdr->fscod] * 2; + hdr->sample_rate = ff_ac3_sample_rate_tab[hdr->fscod] >> hdr->halfratecod; + hdr->bit_rate = (ff_ac3_bitrate_tab[hdr->frmsizecod>>1] * 1000) >> hdr->halfratecod; + hdr->channels = ff_ac3_channels_tab[hdr->acmod] + hdr->lfeon; + hdr->frame_size = ff_ac3_frame_size_tab[hdr->frmsizecod][hdr->fscod] * 2; return 0; } @@ -125,11 +125,11 @@ if(fscod2 == 3) return 0; - *sample_rate = ff_ac3_freqs[fscod2] / 2; + *sample_rate = ff_ac3_sample_rate_tab[fscod2] / 2; } else { numblkscod = get_bits(&bits, 2); - *sample_rate = ff_ac3_freqs[fscod]; + *sample_rate = ff_ac3_sample_rate_tab[fscod]; } acmod = get_bits(&bits, 3); @@ -137,7 +137,7 @@ *samples = eac3_blocks[numblkscod] * 256; *bit_rate = frmsiz * (*sample_rate) * 16 / (*samples); - *channels = ff_ac3_channels[acmod] + lfeon; + *channels = ff_ac3_channels_tab[acmod] + lfeon; return frmsiz * 2; }