From 6beef72ac5d59badcb41d5e728602e09115ef68c Mon Sep 17 00:00:00 2001 From: Buschel Date: Sat, 5 Feb 2011 19:50:16 +0000 Subject: [PATCH] Use MEM_ALIGN_ATTR in libfaad. Remove global array and re-use existing one. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@29211 a1c6a512-1295-4272-9138-f99709370657 --- apps/codecs/aac.c | 4 +-- apps/codecs/libfaad/filtbank.c | 4 +-- apps/codecs/libfaad/ic_predict.h | 8 ++--- apps/codecs/libfaad/iq_table.h | 4 +-- apps/codecs/libfaad/kbd_win.h | 8 ++--- apps/codecs/libfaad/lt_predict.c | 6 ++-- apps/codecs/libfaad/sbr_dec.c | 30 +++++++++---------- apps/codecs/libfaad/sbr_hfadj.c | 26 ++++++++-------- apps/codecs/libfaad/sbr_hfgen.c | 5 ++-- apps/codecs/libfaad/sbr_noise.h | 2 +- apps/codecs/libfaad/sbr_qmf_c.h | 3 +- apps/codecs/libfaad/sine_win.h | 16 +++++----- apps/codecs/libfaad/specrec.c | 64 ++++++++++++++++++++-------------------- apps/codecs/libfaad/syntax.c | 10 +++---- 14 files changed, 95 insertions(+), 95 deletions(-) diff --git a/apps/codecs/aac.c b/apps/codecs/aac.c index 0b27eed47..34239864d 100644 --- a/apps/codecs/aac.c +++ b/apps/codecs/aac.c @@ -30,8 +30,8 @@ CODEC_HEADER /* Global buffers to be used in the mdct synthesis. This way the arrays can * be moved to IRAM for some targets */ #define GB_BUF_SIZE 1024 -static ALIGN real_t gb_time_buffer[2][GB_BUF_SIZE] IBSS_ATTR_FAAD_LARGE_IRAM; -static ALIGN real_t gb_fb_intermed[2][GB_BUF_SIZE] IBSS_ATTR_FAAD_LARGE_IRAM; +static real_t gb_time_buffer[2][GB_BUF_SIZE] IBSS_ATTR_FAAD_LARGE_IRAM MEM_ALIGN_ATTR; +static real_t gb_fb_intermed[2][GB_BUF_SIZE] IBSS_ATTR_FAAD_LARGE_IRAM MEM_ALIGN_ATTR; /* this is the codec entry point */ enum codec_status codec_main(void) diff --git a/apps/codecs/libfaad/filtbank.c b/apps/codecs/libfaad/filtbank.c index 0c1f6c03c..906af9e1a 100644 --- a/apps/codecs/libfaad/filtbank.c +++ b/apps/codecs/libfaad/filtbank.c @@ -196,7 +196,7 @@ static INLINE void mdct(fb_info *fb, real_t *in_data, real_t *out_data, uint16_t } #endif -ALIGN real_t transf_buf[2*1024] IBSS_ATTR; +real_t transf_buf[2*1024] IBSS_ATTR MEM_ALIGN_ATTR; void ifilter_bank(uint8_t window_sequence, uint8_t window_shape, uint8_t window_shape_prev, real_t *freq_in, @@ -403,7 +403,7 @@ void ifilter_bank(uint8_t window_sequence, uint8_t window_shape, #ifdef LTP_DEC -ALIGN real_t windowed_buf[2*1024] = {0}; +real_t windowed_buf[2*1024] MEM_ALIGN_ATTR = {0}; /* only works for LTP -> no overlapping, no short blocks */ void filter_bank_ltp(fb_info *fb, uint8_t window_sequence, uint8_t window_shape, uint8_t window_shape_prev, real_t *in_data, real_t *out_mdct, diff --git a/apps/codecs/libfaad/ic_predict.h b/apps/codecs/libfaad/ic_predict.h index acaa9d8a4..1f2d2c657 100644 --- a/apps/codecs/libfaad/ic_predict.h +++ b/apps/codecs/libfaad/ic_predict.h @@ -42,8 +42,8 @@ void pns_reset_pred_state(ic_stream *ics, pred_state *state); void reset_all_predictors(pred_state *state, uint16_t frame_len); void ic_prediction(ic_stream *ics, real_t *spec, pred_state *state, uint16_t frame_len, uint8_t sf_index); - -ALIGN static const real_t mnt_table[128] = { +#warning MEM_ALIGN_ATTR me! +static const real_t mnt_table[128] = { COEF_CONST(0.9531250000), COEF_CONST(0.9453125000), COEF_CONST(0.9375000000), COEF_CONST(0.9296875000), COEF_CONST(0.9257812500), COEF_CONST(0.9179687500), @@ -109,8 +109,8 @@ ALIGN static const real_t mnt_table[128] = { COEF_CONST(0.4843750000), COEF_CONST(0.4824218750), COEF_CONST(0.4804687500), COEF_CONST(0.4785156250) }; - -ALIGN static const real_t exp_table[128] = { +#warning MEM_ALIGN_ATTR me! +static const real_t exp_table[128] = { COEF_CONST(0.50000000000000000000000000000000000000000000000000), COEF_CONST(0.25000000000000000000000000000000000000000000000000), COEF_CONST(0.12500000000000000000000000000000000000000000000000), diff --git a/apps/codecs/libfaad/iq_table.h b/apps/codecs/libfaad/iq_table.h index 84d279c03..eaf2fe467 100644 --- a/apps/codecs/libfaad/iq_table.h +++ b/apps/codecs/libfaad/iq_table.h @@ -45,7 +45,7 @@ extern "C" { #pragma warning(disable:4244) #endif -ALIGN static const real_t iq_table[IQ_TABLE_SIZE] = +static const real_t iq_table[IQ_TABLE_SIZE] MEM_ALIGN_ATTR = { 0, 1, @@ -8249,7 +8249,7 @@ ALIGN static const real_t iq_table[IQ_TABLE_SIZE] = #define IQ_TABLE_SIZE 1026 #endif -ALIGN static const real_t iq_table[IQ_TABLE_SIZE] = +static const real_t iq_table[IQ_TABLE_SIZE] MEM_ALIGN_ATTR = { REAL_CONST(0.0), REAL_CONST(1.0/8.0), diff --git a/apps/codecs/libfaad/kbd_win.h b/apps/codecs/libfaad/kbd_win.h index 1c3fd096a..8abd3c070 100644 --- a/apps/codecs/libfaad/kbd_win.h +++ b/apps/codecs/libfaad/kbd_win.h @@ -37,7 +37,7 @@ extern "C" { #pragma warning(disable:4244) #endif -ALIGN static const real_t kbd_long_1024[] ICONST_ATTR = +static const real_t kbd_long_1024[] ICONST_ATTR MEM_ALIGN_ATTR = { FRAC_CONST(0.00029256153896361), FRAC_CONST(0.00042998567353047), @@ -1066,7 +1066,7 @@ ALIGN static const real_t kbd_long_1024[] ICONST_ATTR = }; #ifdef ALLOW_SMALL_FRAMELENGTH -ALIGN static const real_t kbd_long_960[] = { +static const real_t kbd_long_960[] MEM_ALIGN_ATTR = { FRAC_CONST(0.0003021562530949), FRAC_CONST(0.0004452267024786), FRAC_CONST(0.0005674947527496), @@ -2030,7 +2030,7 @@ ALIGN static const real_t kbd_long_960[] = { }; #endif -ALIGN static const real_t kbd_short_128[] ICONST_ATTR = +static const real_t kbd_short_128[] ICONST_ATTR MEM_ALIGN_ATTR = { FRAC_CONST(4.3795702929468881e-005), FRAC_CONST(0.00011867384265436617), @@ -2163,7 +2163,7 @@ ALIGN static const real_t kbd_short_128[] ICONST_ATTR = }; #ifdef ALLOW_SMALL_FRAMELENGTH -ALIGN static const real_t kbd_short_120[] = +static const real_t kbd_short_120[] MEM_ALIGN_ATTR = { FRAC_CONST(0.0000452320086910), FRAC_CONST(0.0001274564692111), diff --git a/apps/codecs/libfaad/lt_predict.c b/apps/codecs/libfaad/lt_predict.c index 3edb9c758..f03354fc0 100644 --- a/apps/codecs/libfaad/lt_predict.c +++ b/apps/codecs/libfaad/lt_predict.c @@ -65,7 +65,7 @@ uint8_t is_ltp_ot(uint8_t object_type) return 0; } -ALIGN static const real_t codebook[8] = +static const real_t codebook[8] MEM_ALIGN_ATTR = { REAL_CONST(0.570829), REAL_CONST(0.696616), @@ -77,8 +77,8 @@ ALIGN static const real_t codebook[8] = REAL_CONST(1.369533) }; -ALIGN real_t x_est[2048]; -ALIGN real_t X_est[2048]; +static real_t x_est[2048] MEM_ALIGN_ATTR; +static real_t X_est[2048] MEM_ALIGN_ATTR; void lt_prediction(ic_stream *ics, ltp_info *ltp, real_t *spec, int16_t *lt_pred_stat, fb_info *fb, uint8_t win_shape, uint8_t win_shape_prev, uint8_t sr_index, diff --git a/apps/codecs/libfaad/sbr_dec.c b/apps/codecs/libfaad/sbr_dec.c index 78c9c79d5..4d9f9c4c4 100644 --- a/apps/codecs/libfaad/sbr_dec.c +++ b/apps/codecs/libfaad/sbr_dec.c @@ -42,6 +42,11 @@ #include "sbr_hfadj.h" +/* globals */ +static qmf_t X_left [MAX_NTSRHFG][64] MEM_ALIGN_ATTR;// = {{0}}; +static qmf_t X_right[MAX_NTSRHFG][64] MEM_ALIGN_ATTR;// = {{0}}; /* must set this to 0 */ + + /* static function declarations */ static uint8_t sbr_save_prev_data(sbr_info *sbr, uint8_t ch); static void sbr_save_matrix(sbr_info *sbr, uint8_t ch); @@ -227,7 +232,7 @@ static void sbr_save_matrix(sbr_info *sbr, uint8_t ch) } #ifdef SBR_LOW_POWER - ALIGN real_t deg[64]; + real_t deg[64] MEM_ALIGN_ATTR; #endif static void sbr_process_channel(sbr_info *sbr, real_t *channel_buf, qmf_t X[MAX_NTSR][64], @@ -370,7 +375,6 @@ static void sbr_process_channel(sbr_info *sbr, real_t *channel_buf, qmf_t X[MAX_ } } -ALIGN qmf_t X[MAX_NTSR][64]; uint8_t sbrDecodeCoupleFrame(sbr_info *sbr, real_t *left_chan, real_t *right_chan, const uint8_t just_seeked, const uint8_t downSampledSBR) { @@ -401,22 +405,22 @@ uint8_t sbrDecodeCoupleFrame(sbr_info *sbr, real_t *left_chan, real_t *right_cha sbr->just_seeked = 0; } - sbr_process_channel(sbr, left_chan, X, 0, dont_process, downSampledSBR); + sbr_process_channel(sbr, left_chan, X_left, 0, dont_process, downSampledSBR); /* subband synthesis */ if (downSampledSBR) { - sbr_qmf_synthesis_32(sbr, sbr->qmfs[0], X, left_chan); + sbr_qmf_synthesis_32(sbr, sbr->qmfs[0], X_left, left_chan); } else { - sbr_qmf_synthesis_64(sbr, sbr->qmfs[0], X, left_chan); + sbr_qmf_synthesis_64(sbr, sbr->qmfs[0], X_left, left_chan); } - sbr_process_channel(sbr, right_chan, X, 1, dont_process, downSampledSBR); + sbr_process_channel(sbr, right_chan, X_right, 1, dont_process, downSampledSBR); /* subband synthesis */ if (downSampledSBR) { - sbr_qmf_synthesis_32(sbr, sbr->qmfs[1], X, right_chan); + sbr_qmf_synthesis_32(sbr, sbr->qmfs[1], X_right, right_chan); } else { - sbr_qmf_synthesis_64(sbr, sbr->qmfs[1], X, right_chan); + sbr_qmf_synthesis_64(sbr, sbr->qmfs[1], X_right, right_chan); } if (sbr->bs_header_flag) @@ -453,8 +457,6 @@ uint8_t sbrDecodeCoupleFrame(sbr_info *sbr, real_t *left_chan, real_t *right_cha return 0; } -ALIGN qmf_t X[MAX_NTSR][64]; - uint8_t sbrDecodeSingleFrame(sbr_info *sbr, real_t *channel, const uint8_t just_seeked, const uint8_t downSampledSBR) { @@ -485,13 +487,13 @@ uint8_t sbrDecodeSingleFrame(sbr_info *sbr, real_t *channel, sbr->just_seeked = 0; } - sbr_process_channel(sbr, channel, X, 0, dont_process, downSampledSBR); + sbr_process_channel(sbr, channel, X_left, 0, dont_process, downSampledSBR); /* subband synthesis */ if (downSampledSBR) { - sbr_qmf_synthesis_32(sbr, sbr->qmfs[0], X, channel); + sbr_qmf_synthesis_32(sbr, sbr->qmfs[0], X_left, channel); } else { - sbr_qmf_synthesis_64(sbr, sbr->qmfs[0], X, channel); + sbr_qmf_synthesis_64(sbr, sbr->qmfs[0], X_left, channel); } if (sbr->bs_header_flag) @@ -521,8 +523,6 @@ uint8_t sbrDecodeSingleFrame(sbr_info *sbr, real_t *channel, return 0; } -qmf_t X_left [MAX_NTSRHFG][64] MEM_ALIGN_ATTR;// = {{0}}; -qmf_t X_right[MAX_NTSRHFG][64] MEM_ALIGN_ATTR;// = {{0}}; /* must set this to 0 */ #if (defined(PS_DEC) || defined(DRM_PS)) uint8_t sbrDecodeSingleFramePS(sbr_info *sbr, real_t *left_channel, real_t *right_channel, diff --git a/apps/codecs/libfaad/sbr_hfadj.c b/apps/codecs/libfaad/sbr_hfadj.c index 806604519..b562bf904 100644 --- a/apps/codecs/libfaad/sbr_hfadj.c +++ b/apps/codecs/libfaad/sbr_hfadj.c @@ -62,7 +62,7 @@ void hf_adjustment(sbr_info *sbr, qmf_t Xsbr[MAX_NTSRHFG][64] #endif ,uint8_t ch) { - ALIGN sbr_hfadj_info adj; + sbr_hfadj_info adj MEM_ALIGN_ATTR; memset(&adj,0,sizeof(adj)); if (sbr->bs_frame_class[ch] == FIXFIX) @@ -416,10 +416,10 @@ static void calculate_gain(sbr_info *sbr, sbr_hfadj_info *adj, uint8_t ch) uint8_t current_t_noise_band = 0; uint8_t S_mapped; - ALIGN real_t Q_M_lim[MAX_M]; - ALIGN real_t G_lim[MAX_M]; - ALIGN real_t G_boost; - ALIGN real_t S_M[MAX_M]; + real_t Q_M_lim[MAX_M] MEM_ALIGN_ATTR; + real_t G_lim[MAX_M] MEM_ALIGN_ATTR; + real_t G_boost MEM_ALIGN_ATTR; + real_t S_M[MAX_M] MEM_ALIGN_ATTR; for (l = 0; l < sbr->L_E[ch]; l++) { @@ -879,10 +879,10 @@ static void calculate_gain(sbr_info *sbr, sbr_hfadj_info *adj, uint8_t ch) uint8_t current_t_noise_band = 0; uint8_t S_mapped; - ALIGN real_t Q_M_lim[MAX_M]; - ALIGN real_t G_lim[MAX_M]; - ALIGN real_t G_boost; - ALIGN real_t S_M[MAX_M]; + real_t Q_M_lim[MAX_M] MEM_ALIGN_ATTR; + real_t G_lim[MAX_M] MEM_ALIGN_ATTR; + real_t G_boost MEM_ALIGN_ATTR; + real_t S_M[MAX_M] MEM_ALIGN_ATTR; for (l = 0; l < sbr->L_E[ch]; l++) { @@ -1126,10 +1126,10 @@ static void calculate_gain(sbr_info *sbr, sbr_hfadj_info *adj, uint8_t ch) uint8_t current_t_noise_band = 0; uint8_t S_mapped; - ALIGN real_t Q_M_lim[MAX_M]; - ALIGN real_t G_lim[MAX_M]; - ALIGN real_t G_boost; - ALIGN real_t S_M[MAX_M]; + real_t Q_M_lim[MAX_M] MEM_ALIGN_ATTR; + real_t G_lim[MAX_M] MEM_ALIGN_ATTR; + real_t G_boost MEM_ALIGN_ATTR; + real_t S_M[MAX_M] MEM_ALIGN_ATTR; for (l = 0; l < sbr->L_E[ch]; l++) { diff --git a/apps/codecs/libfaad/sbr_hfgen.c b/apps/codecs/libfaad/sbr_hfgen.c index 66ef656e5..1e32eb26b 100644 --- a/apps/codecs/libfaad/sbr_hfgen.c +++ b/apps/codecs/libfaad/sbr_hfgen.c @@ -58,9 +58,10 @@ void hf_generation(sbr_info *sbr, qmf_t Xlow[MAX_NTSRHFG][64], ,uint8_t ch) { uint8_t l, i, x; - ALIGN complex_t alpha_0[64], alpha_1[64]; + complex_t alpha_0[64] MEM_ALIGN_ATTR; + complex_t alpha_1[64] MEM_ALIGN_ATTR; #ifdef SBR_LOW_POWER - ALIGN real_t rxx[64]; + real_t rxx[64]; #endif uint8_t offset = sbr->tHFAdj; diff --git a/apps/codecs/libfaad/sbr_noise.h b/apps/codecs/libfaad/sbr_noise.h index 73ec5f463..48f0ea9d1 100644 --- a/apps/codecs/libfaad/sbr_noise.h +++ b/apps/codecs/libfaad/sbr_noise.h @@ -39,7 +39,7 @@ extern "C" { /* Table 1.A.13 Noise table V */ -ALIGN static const complex_t V[] = { +static const complex_t V[] MEM_ALIGN_ATTR = { { FRAC_CONST(-0.99948155879974), FRAC_CONST(-0.59483414888382) }, { FRAC_CONST(0.97113454341888), FRAC_CONST(-0.67528516054153) }, { FRAC_CONST(0.14130051434040), FRAC_CONST(-0.95090985298157) }, diff --git a/apps/codecs/libfaad/sbr_qmf_c.h b/apps/codecs/libfaad/sbr_qmf_c.h index fcd242bcd..0ceb487be 100644 --- a/apps/codecs/libfaad/sbr_qmf_c.h +++ b/apps/codecs/libfaad/sbr_qmf_c.h @@ -37,8 +37,7 @@ extern "C" { #pragma warning(disable:4305) #pragma warning(disable:4244) #endif - -ALIGN static const real_t qmf_c[640] ICONST_ATTR_FAAD_LARGE_IRAM = { +static const real_t qmf_c[640] ICONST_ATTR_FAAD_LARGE_IRAM MEM_ALIGN_ATTR = { FRAC_CONST( 0.00000000000000), FRAC_CONST( 0.00262017586902), FRAC_CONST( 0.01327182200351), FRAC_CONST( 0.07035330735093), FRAC_CONST( 0.36115899031355), FRAC_CONST( 0.85373856005937), FRAC_CONST(-0.36115899031355), FRAC_CONST( 0.07035330735093), FRAC_CONST(-0.01327182200351), FRAC_CONST( 0.00262017586902), FRAC_CONST(-0.00055252865047), FRAC_CONST( 0.00278704643465), FRAC_CONST( 0.01439046660792), FRAC_CONST( 0.06896640131951), FRAC_CONST( 0.37237955463061), diff --git a/apps/codecs/libfaad/sine_win.h b/apps/codecs/libfaad/sine_win.h index edd3b407f..3e042f15f 100644 --- a/apps/codecs/libfaad/sine_win.h +++ b/apps/codecs/libfaad/sine_win.h @@ -37,7 +37,7 @@ extern "C" { #pragma warning(disable:4244) #endif -ALIGN static const real_t sine_long_1024[] ICONST_ATTR = +static const real_t sine_long_1024[] ICONST_ATTR MEM_ALIGN_ATTR = { FRAC_CONST(0.00076699031874270449), FRAC_CONST(0.002300969151425805), @@ -1066,7 +1066,7 @@ ALIGN static const real_t sine_long_1024[] ICONST_ATTR = }; #ifdef ALLOW_SMALL_FRAMELENGTH -ALIGN static const real_t sine_long_960[] = +static const real_t sine_long_960[] MEM_ALIGN_ATTR = { FRAC_CONST(0.00081812299560725323), FRAC_CONST(0.0024543667964602917), @@ -2031,7 +2031,7 @@ ALIGN static const real_t sine_long_960[] = }; #endif -ALIGN static const real_t sine_short_128[] ICONST_ATTR = +static const real_t sine_short_128[] ICONST_ATTR MEM_ALIGN_ATTR = { FRAC_CONST(0.0061358846491544753), FRAC_CONST(0.01840672990580482), @@ -2164,7 +2164,7 @@ ALIGN static const real_t sine_short_128[] ICONST_ATTR = }; #ifdef ALLOW_SMALL_FRAMELENGTH -ALIGN static const real_t sine_short_120[] = +static const real_t sine_short_120[] MEM_ALIGN_ATTR = { FRAC_CONST(0.0065449379673518581), FRAC_CONST(0.019633692460628301), @@ -2290,7 +2290,7 @@ ALIGN static const real_t sine_short_120[] = #endif #ifdef LD_DEC -ALIGN static const real_t sine_mid_512[] = +static const real_t sine_mid_512[] MEM_ALIGN_ATTR = { FRAC_CONST(0.0015339801862847655), FRAC_CONST(0.0046019261204485705), @@ -2807,7 +2807,7 @@ ALIGN static const real_t sine_mid_512[] = }; #ifdef ALLOW_SMALL_FRAMELENGTH -ALIGN static const real_t sine_mid_480[] = +static const real_t sine_mid_480[] MEM_ALIGN_ATTR = { FRAC_CONST(0.0016362454436240478), FRAC_CONST(0.00490871880799799), @@ -3292,7 +3292,7 @@ ALIGN static const real_t sine_mid_480[] = }; #endif -ALIGN static const real_t ld_mid_512[] = +static const real_t ld_mid_512[] MEM_ALIGN_ATTR = { FRAC_CONST(0), FRAC_CONST(0), @@ -3809,7 +3809,7 @@ ALIGN static const real_t ld_mid_512[] = }; #ifdef ALLOW_SMALL_FRAMELENGTH -ALIGN static const real_t ld_mid_480[] = +static const real_t ld_mid_480[] MEM_ALIGN_ATTR = { FRAC_CONST(0), FRAC_CONST(0), diff --git a/apps/codecs/libfaad/specrec.c b/apps/codecs/libfaad/specrec.c index 02eac1187..d537125d5 100644 --- a/apps/codecs/libfaad/specrec.c +++ b/apps/codecs/libfaad/specrec.c @@ -61,44 +61,44 @@ static uint8_t quant_to_spec(NeAACDecHandle hDecoder, #ifdef LD_DEC -ALIGN static const uint8_t num_swb_512_window[] = +static const uint8_t num_swb_512_window[] = { 0, 0, 0, 36, 36, 37, 31, 31, 0, 0, 0, 0 }; -ALIGN static const uint8_t num_swb_480_window[] = +static const uint8_t num_swb_480_window[] = { 0, 0, 0, 35, 35, 37, 30, 30, 0, 0, 0, 0 }; #endif -ALIGN static const uint8_t num_swb_960_window[] ICONST_ATTR = +static const uint8_t num_swb_960_window[] ICONST_ATTR = { 40, 40, 45, 49, 49, 49, 46, 46, 42, 42, 42, 40 }; -ALIGN static const uint8_t num_swb_1024_window[] ICONST_ATTR = +static const uint8_t num_swb_1024_window[] ICONST_ATTR = { 41, 41, 47, 49, 49, 51, 47, 47, 43, 43, 43, 40 }; -ALIGN static const uint8_t num_swb_128_window[] ICONST_ATTR = +static const uint8_t num_swb_128_window[] ICONST_ATTR = { 12, 12, 12, 14, 14, 14, 15, 15, 15, 15, 15, 15 }; -ALIGN static const uint16_t swb_offset_1024_96[] = +static const uint16_t swb_offset_1024_96[] = { 0, 4, 8, 12, 16, 20, 24, 28, 32, 36, 40, 44, 48, 52, 56, 64, 72, 80, 88, 96, 108, 120, 132, 144, 156, 172, 188, 212, 240, 276, 320, 384, 448, 512, 576, 640, 704, 768, 832, 896, 960, 1024 }; -ALIGN static const uint16_t swb_offset_128_96[] = +static const uint16_t swb_offset_128_96[] = { 0, 4, 8, 12, 16, 20, 24, 32, 40, 48, 64, 92, 128 }; -ALIGN static const uint16_t swb_offset_1024_64[] = +static const uint16_t swb_offset_1024_64[] = { 0, 4, 8, 12, 16, 20, 24, 28, 32, 36, 40, 44, 48, 52, 56, 64, 72, 80, 88, 100, 112, 124, 140, 156, 172, 192, 216, 240, 268, @@ -106,12 +106,12 @@ ALIGN static const uint16_t swb_offset_1024_64[] = 864, 904, 944, 984, 1024 }; -ALIGN static const uint16_t swb_offset_128_64[] = +static const uint16_t swb_offset_128_64[] = { 0, 4, 8, 12, 16, 20, 24, 32, 40, 48, 64, 92, 128 }; -ALIGN static const uint16_t swb_offset_1024_48[] ICONST_ATTR = +static const uint16_t swb_offset_1024_48[] ICONST_ATTR = { 0, 4, 8, 12, 16, 20, 24, 28, 32, 36, 40, 48, 56, 64, 72, 80, 88, 96, 108, 120, 132, 144, 160, 176, 196, 216, 240, 264, 292, @@ -120,14 +120,14 @@ ALIGN static const uint16_t swb_offset_1024_48[] ICONST_ATTR = }; #ifdef LD_DEC -ALIGN static const uint16_t swb_offset_512_48[] = +static const uint16_t swb_offset_512_48[] = { 0, 4, 8, 12, 16, 20, 24, 28, 32, 36, 40, 44, 48, 52, 56, 60, 68, 76, 84, 92, 100, 112, 124, 136, 148, 164, 184, 208, 236, 268, 300, 332, 364, 396, 428, 460, 512 }; -ALIGN static const uint16_t swb_offset_480_48[] = +static const uint16_t swb_offset_480_48[] = { 0, 4, 8, 12, 16, 20, 24, 28, 32, 36, 40, 44, 48, 52, 56, 64, 72 ,80 ,88, 96, 108, 120, 132, 144, 156, 172, 188, 212, 240, 272, 304, 336, 368, 400, @@ -135,12 +135,12 @@ ALIGN static const uint16_t swb_offset_480_48[] = }; #endif -ALIGN static const uint16_t swb_offset_128_48[] ICONST_ATTR = +static const uint16_t swb_offset_128_48[] ICONST_ATTR = { 0, 4, 8, 12, 16, 20, 28, 36, 44, 56, 68, 80, 96, 112, 128 }; -ALIGN static const uint16_t swb_offset_1024_32[] ICONST_ATTR = +static const uint16_t swb_offset_1024_32[] ICONST_ATTR = { 0, 4, 8, 12, 16, 20, 24, 28, 32, 36, 40, 48, 56, 64, 72, 80, 88, 96, 108, 120, 132, 144, 160, 176, 196, 216, 240, 264, 292, @@ -149,14 +149,14 @@ ALIGN static const uint16_t swb_offset_1024_32[] ICONST_ATTR = }; #ifdef LD_DEC -ALIGN static const uint16_t swb_offset_512_32[] = +static const uint16_t swb_offset_512_32[] = { 0, 4, 8, 12, 16, 20, 24, 28, 32, 36, 40, 44, 48, 52, 56, 64, 72, 80, 88, 96, 108, 120, 132, 144, 160, 176, 192, 212, 236, 260, 288, 320, 352, 384, 416, 448, 480, 512 }; -ALIGN static const uint16_t swb_offset_480_32[] = +static const uint16_t swb_offset_480_32[] = { 0, 4, 8, 12, 16, 20, 24, 28, 32, 36, 40, 44, 48, 52, 56, 60, 64, 72, 80, 88, 96, 104, 112, 124, 136, 148, 164, 180, 200, 224, 256, 288, 320, 352, @@ -164,7 +164,7 @@ ALIGN static const uint16_t swb_offset_480_32[] = }; #endif -ALIGN static const uint16_t swb_offset_1024_24[] ICONST_ATTR = +static const uint16_t swb_offset_1024_24[] ICONST_ATTR = { 0, 4, 8, 12, 16, 20, 24, 28, 32, 36, 40, 44, 52, 60, 68, 76, 84, 92, 100, 108, 116, 124, 136, 148, 160, 172, 188, 204, 220, @@ -173,50 +173,50 @@ ALIGN static const uint16_t swb_offset_1024_24[] ICONST_ATTR = }; #ifdef LD_DEC -ALIGN static const uint16_t swb_offset_512_24[] = +static const uint16_t swb_offset_512_24[] = { 0, 4, 8, 12, 16, 20, 24, 28, 32, 36, 40, 44, 52, 60, 68, 80, 92, 104, 120, 140, 164, 192, 224, 256, 288, 320, 352, 384, 416, 448, 480, 512 }; -ALIGN static const uint16_t swb_offset_480_24[] = +static const uint16_t swb_offset_480_24[] = { 0, 4, 8, 12, 16, 20, 24, 28, 32, 36, 40, 44, 52, 60, 68, 80, 92, 104, 120, 140, 164, 192, 224, 256, 288, 320, 352, 384, 416, 448, 480 }; #endif -ALIGN static const uint16_t swb_offset_128_24[] ICONST_ATTR = +static const uint16_t swb_offset_128_24[] ICONST_ATTR = { 0, 4, 8, 12, 16, 20, 24, 28, 36, 44, 52, 64, 76, 92, 108, 128 }; -ALIGN static const uint16_t swb_offset_1024_16[] ICONST_ATTR = +static const uint16_t swb_offset_1024_16[] ICONST_ATTR = { 0, 8, 16, 24, 32, 40, 48, 56, 64, 72, 80, 88, 100, 112, 124, 136, 148, 160, 172, 184, 196, 212, 228, 244, 260, 280, 300, 320, 344, 368, 396, 424, 456, 492, 532, 572, 616, 664, 716, 772, 832, 896, 960, 1024 }; -ALIGN static const uint16_t swb_offset_128_16[] ICONST_ATTR = +static const uint16_t swb_offset_128_16[] ICONST_ATTR = { 0, 4, 8, 12, 16, 20, 24, 28, 32, 40, 48, 60, 72, 88, 108, 128 }; -ALIGN static const uint16_t swb_offset_1024_8[] ICONST_ATTR = +static const uint16_t swb_offset_1024_8[] ICONST_ATTR = { 0, 12, 24, 36, 48, 60, 72, 84, 96, 108, 120, 132, 144, 156, 172, 188, 204, 220, 236, 252, 268, 288, 308, 328, 348, 372, 396, 420, 448, 476, 508, 544, 580, 620, 664, 712, 764, 820, 880, 944, 1024 }; -ALIGN static const uint16_t swb_offset_128_8[] ICONST_ATTR = +static const uint16_t swb_offset_128_8[] ICONST_ATTR = { 0, 4, 8, 12, 16, 20, 24, 28, 36, 44, 52, 60, 72, 88, 108, 128 }; -ALIGN static const uint16_t *const swb_offset_1024_window[] ICONST_ATTR = +static const uint16_t *const swb_offset_1024_window[] ICONST_ATTR = { swb_offset_1024_96, /* 96000 */ swb_offset_1024_96, /* 88200 */ @@ -233,7 +233,7 @@ ALIGN static const uint16_t *const swb_offset_1024_window[] ICONST_ATTR = }; #ifdef LD_DEC -ALIGN static const uint16_t *swb_offset_512_window[] = +static const uint16_t *swb_offset_512_window[] = { 0, /* 96000 */ 0, /* 88200 */ @@ -249,7 +249,7 @@ ALIGN static const uint16_t *swb_offset_512_window[] = 0 /* 8000 */ }; -ALIGN static const uint16_t *swb_offset_480_window[] = +static const uint16_t *swb_offset_480_window[] = { 0, /* 96000 */ 0, /* 88200 */ @@ -266,7 +266,7 @@ ALIGN static const uint16_t *swb_offset_480_window[] = }; #endif -ALIGN static const uint16_t *const swb_offset_128_window[] ICONST_ATTR = +static const uint16_t *const swb_offset_128_window[] ICONST_ATTR = { swb_offset_128_96, /* 96000 */ swb_offset_128_96, /* 88200 */ @@ -475,7 +475,7 @@ static INLINE real_t iquant(int16_t q, const real_t *tab, uint8_t *error) } #ifndef FIXED_POINT -ALIGN static const real_t pow2sf_tab[] = { +static const real_t pow2sf_tab[] = { 2.9802322387695313E-008, 5.9604644775390625E-008, 1.1920928955078125E-007, 2.384185791015625E-007, 4.76837158203125E-007, 9.5367431640625E-007, 1.9073486328125E-006, 3.814697265625E-006, 7.62939453125E-006, @@ -523,7 +523,7 @@ ALIGN static const real_t pow2sf_tab[] = { - Within a scalefactor window band, the coefficients are in ascending spectral order. */ -ALIGN static const real_t pow2_table[] ICONST_ATTR = +static const real_t pow2_table[] ICONST_ATTR = { COEF_CONST(1.0), COEF_CONST(1.1892071150027210667174999705605), /* 2^0.25 */ @@ -836,8 +836,8 @@ static uint8_t allocate_channel_pair(NeAACDecHandle hDecoder, } /* used by reconstruct_single_channel() and reconstruct_channel_pair() */ -ALIGN static real_t spec_coef1[1024] IBSS_ATTR; -ALIGN static real_t spec_coef2[1024] IBSS_ATTR; +static real_t spec_coef1[1024] IBSS_ATTR MEM_ALIGN_ATTR; +static real_t spec_coef2[1024] IBSS_ATTR MEM_ALIGN_ATTR; uint8_t reconstruct_single_channel(NeAACDecHandle hDecoder, ic_stream *ics, element *sce, int16_t *spec_data) diff --git a/apps/codecs/libfaad/syntax.c b/apps/codecs/libfaad/syntax.c index fa077d4e9..545163e85 100644 --- a/apps/codecs/libfaad/syntax.c +++ b/apps/codecs/libfaad/syntax.c @@ -558,7 +558,7 @@ void raw_data_block(NeAACDecHandle hDecoder, NeAACDecFrameInfo *hInfo, /* Table 4.4.4 and */ /* Table 4.4.9 */ -ALIGN int16_t spec_data[1024] = {0}; +int16_t spec_data[1024] MEM_ALIGN_ATTR = {0}; element sce; static uint8_t single_lfe_channel_element(NeAACDecHandle hDecoder, bitfile *ld, uint8_t channel, uint8_t *tag) @@ -603,8 +603,8 @@ static uint8_t single_lfe_channel_element(NeAACDecHandle hDecoder, bitfile *ld, } /* Table 4.4.5 */ -ALIGN int16_t spec_data1[1024] IBSS_ATTR; -ALIGN int16_t spec_data2[1024] IBSS_ATTR; +int16_t spec_data1[1024] IBSS_ATTR MEM_ALIGN_ATTR; +int16_t spec_data2[1024] IBSS_ATTR MEM_ALIGN_ATTR; element cpe; static uint8_t channel_pair_element(NeAACDecHandle hDecoder, bitfile *ld, uint8_t channels, uint8_t *tag) @@ -1170,8 +1170,8 @@ static void gain_control_data(bitfile *ld, ic_stream *ics) #endif #ifdef SCALABLE_DEC -ALIGN int16_t spec_data1[1024]; -ALIGN int16_t spec_data2[1024]; +int16_t spec_data1[1024] MEM_ALIGN_ATTR; +int16_t spec_data2[1024] MEM_ALIGN_ATTR; /* Table 4.4.13 ASME */ void aac_scalable_main_element(NeAACDecHandle hDecoder, NeAACDecFrameInfo *hInfo, bitfile *ld, program_config *pce, drc_info *drc) -- 2.11.4.GIT