Mercurial > libavcodec.hg
comparison wmaprodec.c @ 11369:98970e51365a libavcodec
Remove DECLARE_ALIGNED_{8,16} macros
These macros are redundant. All uses are replaced with the generic
DECLARE_ALIGNED macro instead.
| author | mru |
|---|---|
| date | Sat, 06 Mar 2010 14:24:59 +0000 |
| parents | 34a65026fa06 |
| children | 6e1a61e42561 |
comparison
equal
deleted
inserted
replaced
| 11368:3d4f64b8fb10 | 11369:98970e51365a |
|---|---|
| 140 int saved_scale_factors[2][MAX_BANDS]; ///< resampled and (previously) transmitted scale factor values | 140 int saved_scale_factors[2][MAX_BANDS]; ///< resampled and (previously) transmitted scale factor values |
| 141 int8_t scale_factor_idx; ///< index for the transmitted scale factor values (used for resampling) | 141 int8_t scale_factor_idx; ///< index for the transmitted scale factor values (used for resampling) |
| 142 int* scale_factors; ///< pointer to the scale factor values used for decoding | 142 int* scale_factors; ///< pointer to the scale factor values used for decoding |
| 143 uint8_t table_idx; ///< index in sf_offsets for the scale factor reference block | 143 uint8_t table_idx; ///< index in sf_offsets for the scale factor reference block |
| 144 float* coeffs; ///< pointer to the subframe decode buffer | 144 float* coeffs; ///< pointer to the subframe decode buffer |
| 145 DECLARE_ALIGNED_16(float, out)[WMAPRO_BLOCK_MAX_SIZE + WMAPRO_BLOCK_MAX_SIZE / 2]; ///< output buffer | 145 DECLARE_ALIGNED(16, float, out)[WMAPRO_BLOCK_MAX_SIZE + WMAPRO_BLOCK_MAX_SIZE / 2]; ///< output buffer |
| 146 } WMAProChannelCtx; | 146 } WMAProChannelCtx; |
| 147 | 147 |
| 148 /** | 148 /** |
| 149 * @brief channel group for channel transformations | 149 * @brief channel group for channel transformations |
| 150 */ | 150 */ |
| 165 DSPContext dsp; ///< accelerated DSP functions | 165 DSPContext dsp; ///< accelerated DSP functions |
| 166 uint8_t frame_data[MAX_FRAMESIZE + | 166 uint8_t frame_data[MAX_FRAMESIZE + |
| 167 FF_INPUT_BUFFER_PADDING_SIZE];///< compressed frame data | 167 FF_INPUT_BUFFER_PADDING_SIZE];///< compressed frame data |
| 168 PutBitContext pb; ///< context for filling the frame_data buffer | 168 PutBitContext pb; ///< context for filling the frame_data buffer |
| 169 FFTContext mdct_ctx[WMAPRO_BLOCK_SIZES]; ///< MDCT context per block size | 169 FFTContext mdct_ctx[WMAPRO_BLOCK_SIZES]; ///< MDCT context per block size |
| 170 DECLARE_ALIGNED_16(float, tmp)[WMAPRO_BLOCK_MAX_SIZE]; ///< IMDCT output buffer | 170 DECLARE_ALIGNED(16, float, tmp)[WMAPRO_BLOCK_MAX_SIZE]; ///< IMDCT output buffer |
| 171 float* windows[WMAPRO_BLOCK_SIZES]; ///< windows for the different block sizes | 171 float* windows[WMAPRO_BLOCK_SIZES]; ///< windows for the different block sizes |
| 172 | 172 |
| 173 /* frame size dependent frame information (set during initialization) */ | 173 /* frame size dependent frame information (set during initialization) */ |
| 174 uint32_t decode_flags; ///< used compression features | 174 uint32_t decode_flags; ///< used compression features |
| 175 uint8_t len_prefix; ///< frame is prefixed with its length | 175 uint8_t len_prefix; ///< frame is prefixed with its length |