Commit 7883f786 authored by jbr's avatar jbr

cosmetics: vertical align


git-svn-id: file:///var/local/repositories/ffmpeg/trunk@13699 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent fe1c7b54
...@@ -64,21 +64,21 @@ typedef struct { ...@@ -64,21 +64,21 @@ typedef struct {
int channel_in_cpl[AC3_MAX_CHANNELS]; ///< channel in coupling int channel_in_cpl[AC3_MAX_CHANNELS]; ///< channel in coupling
int phase_flags_in_use; ///< phase flags in use int phase_flags_in_use; ///< phase flags in use
int phase_flags[18]; ///< phase flags int phase_flags[18]; ///< phase flags
int num_cpl_subbands; ///< number of coupling sub bands int num_cpl_subbands; ///< number of coupling sub bands
int num_cpl_bands; ///< number of coupling bands int num_cpl_bands; ///< number of coupling bands
int cpl_band_struct[18]; ///< coupling band structure int cpl_band_struct[18]; ///< coupling band structure
int cpl_coords[AC3_MAX_CHANNELS][18]; ///< coupling coordinates int cpl_coords[AC3_MAX_CHANNELS][18]; ///< coupling coordinates
///@} ///@}
///@defgroup channel channel ///@defgroup channel channel
int fbw_channels; ///< number of full-bandwidth channels int fbw_channels; ///< number of full-bandwidth channels
int channels; ///< number of total channels int channels; ///< number of total channels
int lfe_ch; ///< index of LFE channel int lfe_ch; ///< index of LFE channel
float downmix_coeffs[AC3_MAX_CHANNELS][2]; ///< stereo downmix coefficients float downmix_coeffs[AC3_MAX_CHANNELS][2]; ///< stereo downmix coefficients
float downmix_coeff_adjust[2]; ///< adjustment needed for each output channel when downmixing float downmix_coeff_adjust[2]; ///< adjustment needed for each output channel when downmixing
int downmixed; ///< indicates if coeffs are currently downmixed int downmixed; ///< indicates if coeffs are currently downmixed
int output_mode; ///< output channel configuration int output_mode; ///< output channel configuration
int out_channels; ///< number of output channels int out_channels; ///< number of output channels
///@} ///@}
///@defgroup dynrng dynamic range ///@defgroup dynrng dynamic range
...@@ -86,8 +86,8 @@ typedef struct { ...@@ -86,8 +86,8 @@ typedef struct {
///@} ///@}
///@defgroup bandwidth bandwidth ///@defgroup bandwidth bandwidth
int start_freq[AC3_MAX_CHANNELS]; ///< start frequency bin int start_freq[AC3_MAX_CHANNELS]; ///< start frequency bin
int end_freq[AC3_MAX_CHANNELS]; ///< end frequency bin int end_freq[AC3_MAX_CHANNELS]; ///< end frequency bin
///@} ///@}
///@defgroup rematrixing rematrixing ///@defgroup rematrixing rematrixing
...@@ -97,23 +97,23 @@ typedef struct { ...@@ -97,23 +97,23 @@ typedef struct {
///@defgroup exponents exponents ///@defgroup exponents exponents
int num_exp_groups[AC3_MAX_CHANNELS]; ///< Number of exponent groups int num_exp_groups[AC3_MAX_CHANNELS]; ///< Number of exponent groups
int8_t dexps[AC3_MAX_CHANNELS][256]; ///< decoded exponents int8_t dexps[AC3_MAX_CHANNELS][256]; ///< decoded exponents
int exp_strategy[AC3_MAX_CHANNELS]; ///< exponent strategies int exp_strategy[AC3_MAX_CHANNELS]; ///< exponent strategies
///@} ///@}
///@defgroup bitalloc bit allocation ///@defgroup bitalloc bit allocation
AC3BitAllocParameters bit_alloc_params; ///< bit allocation parameters AC3BitAllocParameters bit_alloc_params; ///< bit allocation parameters
int snr_offset[AC3_MAX_CHANNELS]; ///< signal-to-noise ratio offsets int snr_offset[AC3_MAX_CHANNELS]; ///< signal-to-noise ratio offsets
int fast_gain[AC3_MAX_CHANNELS]; ///< fast gain values (signal-to-mask ratio) int fast_gain[AC3_MAX_CHANNELS]; ///< fast gain values (signal-to-mask ratio)
uint8_t bap[AC3_MAX_CHANNELS][256]; ///< bit allocation pointers uint8_t bap[AC3_MAX_CHANNELS][256]; ///< bit allocation pointers
int16_t psd[AC3_MAX_CHANNELS][256]; ///< scaled exponents int16_t psd[AC3_MAX_CHANNELS][256]; ///< scaled exponents
int16_t band_psd[AC3_MAX_CHANNELS][50]; ///< interpolated exponents int16_t band_psd[AC3_MAX_CHANNELS][50]; ///< interpolated exponents
int16_t mask[AC3_MAX_CHANNELS][50]; ///< masking curve values int16_t mask[AC3_MAX_CHANNELS][50]; ///< masking curve values
int dba_mode[AC3_MAX_CHANNELS]; ///< delta bit allocation mode int dba_mode[AC3_MAX_CHANNELS]; ///< delta bit allocation mode
int dba_nsegs[AC3_MAX_CHANNELS]; ///< number of delta segments int dba_nsegs[AC3_MAX_CHANNELS]; ///< number of delta segments
uint8_t dba_offsets[AC3_MAX_CHANNELS][8]; ///< delta segment offsets uint8_t dba_offsets[AC3_MAX_CHANNELS][8]; ///< delta segment offsets
uint8_t dba_lengths[AC3_MAX_CHANNELS][8]; ///< delta segment lengths uint8_t dba_lengths[AC3_MAX_CHANNELS][8]; ///< delta segment lengths
uint8_t dba_values[AC3_MAX_CHANNELS][8]; ///< delta values for each segment uint8_t dba_values[AC3_MAX_CHANNELS][8]; ///< delta values for each segment
///@} ///@}
///@defgroup dithering zero-mantissa dithering ///@defgroup dithering zero-mantissa dithering
...@@ -129,21 +129,21 @@ typedef struct { ...@@ -129,21 +129,21 @@ typedef struct {
///@} ///@}
///@defgroup opt optimization ///@defgroup opt optimization
DSPContext dsp; ///< for optimization DSPContext dsp; ///< for optimization
float add_bias; ///< offset for float_to_int16 conversion float add_bias; ///< offset for float_to_int16 conversion
float mul_bias; ///< scaling for float_to_int16 conversion float mul_bias; ///< scaling for float_to_int16 conversion
///@} ///@}
int fixed_coeffs[AC3_MAX_CHANNELS][256]; ///> fixed-point transform coefficients int fixed_coeffs[AC3_MAX_CHANNELS][256]; ///> fixed-point transform coefficients
///@defgroup arrays aligned arrays ///@defgroup arrays aligned arrays
DECLARE_ALIGNED_16(float, transform_coeffs[AC3_MAX_CHANNELS][256]); ///< transform coefficients DECLARE_ALIGNED_16(float, transform_coeffs[AC3_MAX_CHANNELS][256]); ///< transform coefficients
DECLARE_ALIGNED_16(float, delay[AC3_MAX_CHANNELS][256]); ///< delay - added to the next block DECLARE_ALIGNED_16(float, delay[AC3_MAX_CHANNELS][256]); ///< delay - added to the next block
DECLARE_ALIGNED_16(float, window[256]); ///< window coefficients DECLARE_ALIGNED_16(float, window[256]); ///< window coefficients
DECLARE_ALIGNED_16(float, tmp_output[512]); ///< temporary storage for output before windowing DECLARE_ALIGNED_16(float, tmp_output[512]); ///< temporary storage for output before windowing
DECLARE_ALIGNED_16(float, tmp_imdct[256]); ///< temporary storage for imdct transform DECLARE_ALIGNED_16(float, tmp_imdct[256]); ///< temporary storage for imdct transform
DECLARE_ALIGNED_16(float, output[AC3_MAX_CHANNELS][256]); ///< output after imdct transform and windowing DECLARE_ALIGNED_16(float, output[AC3_MAX_CHANNELS][256]); ///< output after imdct transform and windowing
DECLARE_ALIGNED_16(short, int_output[AC3_MAX_CHANNELS-1][256]); ///< final 16-bit integer output DECLARE_ALIGNED_16(short, int_output[AC3_MAX_CHANNELS-1][256]); ///< final 16-bit integer output
///@} ///@}
} AC3DecodeContext; } AC3DecodeContext;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment