cosmetics: rearrange AC3EncodeContext fields

Originally committed as revision 25945 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Justin Ruggles 2010-12-14 14:50:15 +00:00
parent 9baec618c0
commit 7e5a4bf8ba

View File

@ -35,24 +35,28 @@
typedef struct AC3EncodeContext { typedef struct AC3EncodeContext {
PutBitContext pb; PutBitContext pb;
int nb_channels;
int nb_all_channels; unsigned int bitstream_id;
int lfe_channel; unsigned int bitstream_mode;
const uint8_t *channel_map;
int bit_rate; int bit_rate;
unsigned int sample_rate; unsigned int sample_rate;
unsigned int bitstream_id; int sr_shift;
unsigned int sr_code; /* frequency */
unsigned int frame_size_min; /* minimum frame size in case rounding is necessary */ unsigned int frame_size_min; /* minimum frame size in case rounding is necessary */
unsigned int frame_size; /* current frame size in words */ unsigned int frame_size; /* current frame size in words */
unsigned int frame_size_code;
unsigned int bits_written; unsigned int bits_written;
unsigned int samples_written; unsigned int samples_written;
int sr_shift;
unsigned int frame_size_code; int nb_all_channels;
unsigned int sr_code; /* frequency */ int nb_channels;
unsigned int channel_mode;
int lfe; int lfe;
unsigned int bitstream_mode; int lfe_channel;
short last_samples[AC3_MAX_CHANNELS][256]; unsigned int channel_mode;
const uint8_t *channel_map;
unsigned int chbwcod[AC3_MAX_CHANNELS]; unsigned int chbwcod[AC3_MAX_CHANNELS];
int nb_coefs[AC3_MAX_CHANNELS]; int nb_coefs[AC3_MAX_CHANNELS];
@ -62,8 +66,11 @@ typedef struct AC3EncodeContext {
int coarse_snr_offset; int coarse_snr_offset;
int fast_gain_code[AC3_MAX_CHANNELS]; int fast_gain_code[AC3_MAX_CHANNELS];
int fine_snr_offset[AC3_MAX_CHANNELS]; int fine_snr_offset[AC3_MAX_CHANNELS];
/* mantissa encoding */ /* mantissa encoding */
int mant1_cnt, mant2_cnt, mant4_cnt; int mant1_cnt, mant2_cnt, mant4_cnt;
short last_samples[AC3_MAX_CHANNELS][256];
} AC3EncodeContext; } AC3EncodeContext;
static int16_t costab[64]; static int16_t costab[64];