Mercurial > libavcodec.hg
changeset 7033:f90b89217cc9 libavcodec
move rematrixing band table to ac3dec_data.c
| author | jbr |
|---|---|
| date | Sun, 08 Jun 2008 21:09:02 +0000 |
| parents | 784a2b575226 |
| children | 130784da5595 |
| files | ac3dec.c ac3dec_data.c ac3dec_data.h |
| diffstat | 3 files changed, 11 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/ac3dec.c Sun Jun 08 21:08:57 2008 +0000 +++ b/ac3dec.c Sun Jun 08 21:09:02 2008 +0000 @@ -39,16 +39,11 @@ #include "bitstream.h" #include "dsputil.h" #include "ac3dec.h" +#include "ac3dec_data.h" /** Maximum possible frame size when the specification limit is ignored */ #define AC3_MAX_FRAME_SIZE 21695 -/** - * Table of bin locations for rematrixing bands - * reference: Section 7.5.2 Rematrixing : Frequency Band Definitions - */ -static const uint8_t rematrix_band_tab[5] = { 13, 25, 37, 61, 253 }; - /** table for grouping exponents */ static uint8_t exp_ungroup_tab[128][3]; @@ -579,8 +574,8 @@ for(bnd=0; bnd<s->num_rematrixing_bands; bnd++) { if(s->rematrixing_flags[bnd]) { - bndend = FFMIN(end, rematrix_band_tab[bnd+1]); - for(i=rematrix_band_tab[bnd]; i<bndend; i++) { + bndend = FFMIN(end, ff_ac3_rematrix_band_tab[bnd+1]); + for(i=ff_ac3_rematrix_band_tab[bnd]; i<bndend; i++) { tmp0 = s->fixed_coeffs[1][i]; tmp1 = s->fixed_coeffs[2][i]; s->fixed_coeffs[1][i] = tmp0 + tmp1;
--- a/ac3dec_data.c Sun Jun 08 21:08:57 2008 +0000 +++ b/ac3dec_data.c Sun Jun 08 21:09:02 2008 +0000 @@ -1109,3 +1109,9 @@ */ const uint8_t ff_eac3_default_cpl_band_struct[18] = { 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 0, 1, 1, 1, 1, 1 }; + +/** + * Table of bin locations for rematrixing bands + * reference: Section 7.5.2 Rematrixing : Frequency Band Definitions + */ +const uint8_t ff_ac3_rematrix_band_tab[5] = { 13, 25, 37, 61, 253 };
--- a/ac3dec_data.h Sun Jun 08 21:08:57 2008 +0000 +++ b/ac3dec_data.h Sun Jun 08 21:09:02 2008 +0000 @@ -34,4 +34,6 @@ extern const uint8_t ff_eac3_frm_expstr[32][6]; extern const uint8_t ff_eac3_default_cpl_band_struct[18]; +extern const uint8_t ff_ac3_rematrix_band_tab[5]; + #endif /* FFMPEG_AC3DEC_DATA_H */