Mercurial > libavcodec.hg
comparison ac3enc.c @ 6002:29635f7c3d9c libavcodec
cosmetics: rename ac3 tables
| author | jbr |
|---|---|
| date | Sun, 09 Dec 2007 03:21:33 +0000 |
| parents | 60016f2e3aa1 |
| children | 608c8e9ac412 |
comparison
equal
deleted
inserted
replaced
| 6001:f4859c13426b | 6002:29635f7c3d9c |
|---|---|
| 449 ff_ac3_bit_alloc_calc_psd(encoded_exp[blk][ch], 0, | 449 ff_ac3_bit_alloc_calc_psd(encoded_exp[blk][ch], 0, |
| 450 s->nb_coefs[ch], | 450 s->nb_coefs[ch], |
| 451 psd[blk][ch], bndpsd[blk][ch]); | 451 psd[blk][ch], bndpsd[blk][ch]); |
| 452 ff_ac3_bit_alloc_calc_mask(&s->bit_alloc, bndpsd[blk][ch], | 452 ff_ac3_bit_alloc_calc_mask(&s->bit_alloc, bndpsd[blk][ch], |
| 453 0, s->nb_coefs[ch], | 453 0, s->nb_coefs[ch], |
| 454 ff_fgaintab[s->fgaincod[ch]], | 454 ff_ac3_fast_gain_tab[s->fgaincod[ch]], |
| 455 ch == s->lfe_channel, | 455 ch == s->lfe_channel, |
| 456 DBA_NONE, 0, NULL, NULL, NULL, | 456 DBA_NONE, 0, NULL, NULL, NULL, |
| 457 mask[blk][ch]); | 457 mask[blk][ch]); |
| 458 } | 458 } |
| 459 } | 459 } |
| 517 s->fgaincod[ch] = 4; | 517 s->fgaincod[ch] = 4; |
| 518 | 518 |
| 519 /* compute real values */ | 519 /* compute real values */ |
| 520 s->bit_alloc.fscod = s->fscod; | 520 s->bit_alloc.fscod = s->fscod; |
| 521 s->bit_alloc.halfratecod = s->halfratecod; | 521 s->bit_alloc.halfratecod = s->halfratecod; |
| 522 s->bit_alloc.sdecay = ff_sdecaytab[s->sdecaycod] >> s->halfratecod; | 522 s->bit_alloc.sdecay = ff_ac3_slow_decay_tab[s->sdecaycod] >> s->halfratecod; |
| 523 s->bit_alloc.fdecay = ff_fdecaytab[s->fdecaycod] >> s->halfratecod; | 523 s->bit_alloc.fdecay = ff_ac3_fast_decay_tab[s->fdecaycod] >> s->halfratecod; |
| 524 s->bit_alloc.sgain = ff_sgaintab[s->sgaincod]; | 524 s->bit_alloc.sgain = ff_ac3_slow_gain_tab[s->sgaincod]; |
| 525 s->bit_alloc.dbknee = ff_dbkneetab[s->dbkneecod]; | 525 s->bit_alloc.dbknee = ff_ac3_db_per_bit_tab[s->dbkneecod]; |
| 526 s->bit_alloc.floor = ff_floortab[s->floorcod]; | 526 s->bit_alloc.floor = ff_ac3_floor_tab[s->floorcod]; |
| 527 | 527 |
| 528 /* header size */ | 528 /* header size */ |
| 529 frame_bits += 65; | 529 frame_bits += 65; |
| 530 // if (s->acmod == 2) | 530 // if (s->acmod == 2) |
| 531 // frame_bits += 2; | 531 // frame_bits += 2; |
| 655 s->lfe_channel = s->lfe ? 5 : -1; | 655 s->lfe_channel = s->lfe ? 5 : -1; |
| 656 | 656 |
| 657 /* frequency */ | 657 /* frequency */ |
| 658 for(i=0;i<3;i++) { | 658 for(i=0;i<3;i++) { |
| 659 for(j=0;j<3;j++) | 659 for(j=0;j<3;j++) |
| 660 if ((ff_ac3_freqs[j] >> i) == freq) | 660 if ((ff_ac3_sample_rate_tab[j] >> i) == freq) |
| 661 goto found; | 661 goto found; |
| 662 } | 662 } |
| 663 return -1; | 663 return -1; |
| 664 found: | 664 found: |
| 665 s->sample_rate = freq; | 665 s->sample_rate = freq; |
| 669 s->bsmod = 0; /* complete main audio service */ | 669 s->bsmod = 0; /* complete main audio service */ |
| 670 | 670 |
| 671 /* bitrate & frame size */ | 671 /* bitrate & frame size */ |
| 672 bitrate /= 1000; | 672 bitrate /= 1000; |
| 673 for(i=0;i<19;i++) { | 673 for(i=0;i<19;i++) { |
| 674 if ((ff_ac3_bitratetab[i] >> s->halfratecod) == bitrate) | 674 if ((ff_ac3_bitrate_tab[i] >> s->halfratecod) == bitrate) |
| 675 break; | 675 break; |
| 676 } | 676 } |
| 677 if (i == 19) | 677 if (i == 19) |
| 678 return -1; | 678 return -1; |
| 679 s->bit_rate = bitrate; | 679 s->bit_rate = bitrate; |
| 680 s->frmsizecod = i << 1; | 680 s->frmsizecod = i << 1; |
| 681 s->frame_size_min = ff_ac3_frame_sizes[s->frmsizecod][s->fscod]; | 681 s->frame_size_min = ff_ac3_frame_size_tab[s->frmsizecod][s->fscod]; |
| 682 s->bits_written = 0; | 682 s->bits_written = 0; |
| 683 s->samples_written = 0; | 683 s->samples_written = 0; |
| 684 s->frame_size = s->frame_size_min; | 684 s->frame_size = s->frame_size_min; |
| 685 | 685 |
| 686 /* bit allocation init */ | 686 /* bit allocation init */ |