Mercurial > libavcodec.hg

comparison aacenc.h @ 11369:98970e51365a libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 73f923159384
comparison
equal deleted inserted replaced
11368:3d4f64b8fb10 11369:98970e51365a
50 typedef struct AACEncContext { 50 typedef struct AACEncContext {
51 PutBitContext pb; 51 PutBitContext pb;
52 FFTContext mdct1024; ///< long (1024 samples) frame transform context 52 FFTContext mdct1024; ///< long (1024 samples) frame transform context
53 FFTContext mdct128; ///< short (128 samples) frame transform context 53 FFTContext mdct128; ///< short (128 samples) frame transform context
54 DSPContext dsp; 54 DSPContext dsp;
55 DECLARE_ALIGNED_16(FFTSample, output)[2048]; ///< temporary buffer for MDCT input coefficients 55 DECLARE_ALIGNED(16, FFTSample, output)[2048]; ///< temporary buffer for MDCT input coefficients
56 int16_t* samples; ///< saved preprocessed input 56 int16_t* samples; ///< saved preprocessed input
57 57
58 int samplerate_index; ///< MPEG-4 samplerate index 58 int samplerate_index; ///< MPEG-4 samplerate index
59 59
60 ChannelElement *cpe; ///< channel elements 60 ChannelElement *cpe; ///< channel elements
62 struct FFPsyPreprocessContext* psypp; 62 struct FFPsyPreprocessContext* psypp;
63 AACCoefficientsEncoder *coder; 63 AACCoefficientsEncoder *coder;
64 int cur_channel; 64 int cur_channel;
65 int last_frame; 65 int last_frame;
66 float lambda; 66 float lambda;
67 DECLARE_ALIGNED_16(int, qcoefs)[96][2]; ///< quantized coefficients 67 DECLARE_ALIGNED(16, int, qcoefs)[96][2]; ///< quantized coefficients
68 DECLARE_ALIGNED_16(float, scoefs)[1024]; ///< scaled coefficients 68 DECLARE_ALIGNED(16, float, scoefs)[1024]; ///< scaled coefficients
69 } AACEncContext; 69 } AACEncContext;
70 70
71 #endif /* AVCODEC_AACENC_H */ 71 #endif /* AVCODEC_AACENC_H */