comparison atrac1.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 4b3da727d832
comparison
equal deleted inserted replaced
11368:3d4f64b8fb10 11369:98970e51365a
56 */ 56 */
57 typedef struct { 57 typedef struct {
58 int log2_block_count[AT1_QMF_BANDS]; ///< log2 number of blocks in a band 58 int log2_block_count[AT1_QMF_BANDS]; ///< log2 number of blocks in a band
59 int num_bfus; ///< number of Block Floating Units 59 int num_bfus; ///< number of Block Floating Units
60 float* spectrum[2]; 60 float* spectrum[2];
61 DECLARE_ALIGNED_16(float, spec1)[AT1_SU_SAMPLES]; ///< mdct buffer 61 DECLARE_ALIGNED(16, float, spec1)[AT1_SU_SAMPLES]; ///< mdct buffer
62 DECLARE_ALIGNED_16(float, spec2)[AT1_SU_SAMPLES]; ///< mdct buffer 62 DECLARE_ALIGNED(16, float, spec2)[AT1_SU_SAMPLES]; ///< mdct buffer
63 DECLARE_ALIGNED_16(float, fst_qmf_delay)[46]; ///< delay line for the 1st stacked QMF filter 63 DECLARE_ALIGNED(16, float, fst_qmf_delay)[46]; ///< delay line for the 1st stacked QMF filter
64 DECLARE_ALIGNED_16(float, snd_qmf_delay)[46]; ///< delay line for the 2nd stacked QMF filter 64 DECLARE_ALIGNED(16, float, snd_qmf_delay)[46]; ///< delay line for the 2nd stacked QMF filter
65 DECLARE_ALIGNED_16(float, last_qmf_delay)[256+23]; ///< delay line for the last stacked QMF filter 65 DECLARE_ALIGNED(16, float, last_qmf_delay)[256+23]; ///< delay line for the last stacked QMF filter
66 } AT1SUCtx; 66 } AT1SUCtx;
67 67
68 /** 68 /**
69 * The atrac1 context, holds all needed parameters for decoding 69 * The atrac1 context, holds all needed parameters for decoding
70 */ 70 */
71 typedef struct { 71 typedef struct {
72 AT1SUCtx SUs[AT1_MAX_CHANNELS]; ///< channel sound unit 72 AT1SUCtx SUs[AT1_MAX_CHANNELS]; ///< channel sound unit
73 DECLARE_ALIGNED_16(float, spec)[AT1_SU_SAMPLES]; ///< the mdct spectrum buffer 73 DECLARE_ALIGNED(16, float, spec)[AT1_SU_SAMPLES]; ///< the mdct spectrum buffer
74 74
75 DECLARE_ALIGNED_16(float, low)[256]; 75 DECLARE_ALIGNED(16, float, low)[256];
76 DECLARE_ALIGNED_16(float, mid)[256]; 76 DECLARE_ALIGNED(16, float, mid)[256];
77 DECLARE_ALIGNED_16(float, high)[512]; 77 DECLARE_ALIGNED(16, float, high)[512];
78 float* bands[3]; 78 float* bands[3];
79 DECLARE_ALIGNED_16(float, out_samples)[AT1_MAX_CHANNELS][AT1_SU_SAMPLES]; 79 DECLARE_ALIGNED(16, float, out_samples)[AT1_MAX_CHANNELS][AT1_SU_SAMPLES];
80 FFTContext mdct_ctx[3]; 80 FFTContext mdct_ctx[3];
81 int channels; 81 int channels;
82 DSPContext dsp; 82 DSPContext dsp;
83 } AT1Ctx; 83 } AT1Ctx;
84 84