generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

move rematrixing band table to ac3dec_data.c

Browse Source 
Originally committed as revision 13716 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Justin Ruggles 2008-06-08 21:09:02 +00:00
parent 7ed9a2ea50
commit 227322b837
3 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libavcodec/ac3dec.c
View File

@ -39,16 +39,11 @@
#include "bitstream.h" #include "bitstream.h"
#include "dsputil.h" #include "dsputil.h"
#include "ac3dec.h" #include "ac3dec.h"
#include "ac3dec_data.h"
/** Maximum possible frame size when the specification limit is ignored */ /** Maximum possible frame size when the specification limit is ignored */
#define AC3_MAX_FRAME_SIZE 21695 #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 */ /** table for grouping exponents */
static uint8_t exp_ungroup_tab[128][3]; static uint8_t exp_ungroup_tab[128][3];
@ -579,8 +574,8 @@ static void do_rematrixing(AC3DecodeContext *s)
for(bnd=0; bnd<s->num_rematrixing_bands; bnd++) { for(bnd=0; bnd<s->num_rematrixing_bands; bnd++) {
if(s->rematrixing_flags[bnd]) { if(s->rematrixing_flags[bnd]) {
bndend = FFMIN(end, rematrix_band_tab[bnd+1]); bndend = FFMIN(end, ff_ac3_rematrix_band_tab[bnd+1]);
for(i=rematrix_band_tab[bnd]; i<bndend; i++) { for(i=ff_ac3_rematrix_band_tab[bnd]; i<bndend; i++) {
tmp0 = s->fixed_coeffs[1][i]; tmp0 = s->fixed_coeffs[1][i];
tmp1 = s->fixed_coeffs[2][i]; tmp1 = s->fixed_coeffs[2][i];
s->fixed_coeffs[1][i] = tmp0 + tmp1; s->fixed_coeffs[1][i] = tmp0 + tmp1;

6
libavcodec/ac3dec_data.c
View File

@ -1109,3 +1109,9 @@ const uint8_t ff_eac3_frm_expstr[32][6] = {
*/ */
const uint8_t ff_eac3_default_cpl_band_struct[18] = 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 }; { 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 };

2
libavcodec/ac3dec_data.h
View File

@ -34,4 +34,6 @@ extern const int16_t (*ff_eac3_vq_hebap[8])[6];
extern const uint8_t ff_eac3_frm_expstr[32][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_eac3_default_cpl_band_struct[18];
extern const uint8_t ff_ac3_rematrix_band_tab[5];
#endif /* FFMPEG_AC3DEC_DATA_H */ #endif /* FFMPEG_AC3DEC_DATA_H */