Commit 99e84ae1 authored by malenov's avatar malenov
Browse files

rename Tab_hup_s[], Tab_hup_l[] and Hamcos_Window[] to avoid confusion with...

rename Tab_hup_s[], Tab_hup_l[] and Hamcos_Window[] to avoid confusion with similarly named float variants when instrumented with the WMC tool
parent 426763e1
Loading
Loading
Loading
Loading
Loading
+3 −3
Original line number Diff line number Diff line
@@ -41807,13 +41807,13 @@ const Word16 Gamma_29491_Tbl[] = {
 * NB post-filter tables
 *---------------------------------------------------------------------*/
const Word16 Tab_hup_s[SIZ_TAB_HUP_S] = {
const Word16 tab_hup_s_fx[SIZ_TAB_HUP_S] = {
    -188, 2873, 31650, -1597, -484, 7041, 28469, -2147, -933, 12266,
    23705, -1992, -1492, 18050, 18050, -1492, -1992, 23705, 12266, -933,
    -2147, 28469, 7041, -484, -1597, 31650, 2873, -188
};
const Word16 Tab_hup_l[SIZ_TAB_HUP_L] = {
const Word16 tab_hup_l_fx[SIZ_TAB_HUP_L] = {
    -40, 72, -156, 315, -579, 1023, -1874, 4439,
    31915, -3390, 1595, -887, 501, -266, 130, -59,
    -77, 147, -317, 631, -1150, 2030, -3773, 9639,
@@ -42043,7 +42043,7 @@ const Word16 pwf78_fx[17] = { 25559, 19936, 15550, 12129, 9460, 7379, 5755, 4489
 * lag window for windowing the autocorrelations in LP analysis
 * Used in lib_enc\analy_lp_fx.c
 *------------------------------------------------------------------------------*/
const Word16 Hamcos_Window[L_LP_AMR_WB] = {
const Word16 hamcos_window_fx[L_LP_AMR_WB] = {
    2621, 2622, 2626, 2632, 2640, 2650, 2662, 2677,
    2694, 2714, 2735, 2759, 2785, 2814, 2844, 2877,
    2912, 2949, 2989, 3031, 3075, 3121, 3169, 3220,
+3 −3
Original line number Diff line number Diff line
@@ -2103,8 +2103,8 @@ extern const Word16 Gamma_29491_Tbl[];
 * NB post-filter tables
 *---------------------------------------------------------------------*/

extern const Word16 Tab_hup_s[];
extern const Word16 Tab_hup_l[];
extern const Word16 tab_hup_s_fx[];
extern const Word16 tab_hup_l_fx[];

extern const Word16 mfreq_loc_Q2fx[];
extern const Word16 mfreq_loc_div_25[];
@@ -2160,7 +2160,7 @@ enum FUNC_GAIN_ENC
    FUNC_GAIN_ENC_GACELP_UV                                                     /* UV GACELP gain quantizer ((7=5-2bits/subfr) */
};

extern const Word16 Hamcos_Window[];
extern const Word16 hamcos_window_fx[];
extern const Word16 CNG_burst_att_fx[6][8];
extern const Word16 lpc_weights_fx[];
extern const Word16 SHBCB_SubGain5bit_12_fx[]; /* 5 bit Quantizer table for SHB gain shapes */
+2 −2
Original line number Diff line number Diff line
@@ -1070,7 +1070,7 @@ static void search_del_fx(
    move32();
    ptr_L_den0 = L_den0;
    ptr_L_den1 = L_den1;
    ptr_h = Tab_hup_s;
    ptr_h = tab_hup_s_fx;
    temp = sub( lambda, LH_UP_S - 1 );
    ptr_sig_past0 = ptr_sig_in - temp;

@@ -1420,7 +1420,7 @@ static void compute_ltp_l_fx(

    temp = sub( phase, 1 );
    temp = shl( temp, L2_LH2_L );
    ptr_h = Tab_hup_l + temp; /* Tab_hup_l + LH2_L * (phase-1) */
    ptr_h = tab_hup_l_fx + temp; /* tab_hup_l_fx + LH2_L * (phase-1) */

    temp = sub( LH_UP_L, ltpdel );
    ptr2 = s_in + temp;
+1 −1
Original line number Diff line number Diff line
@@ -145,7 +145,7 @@ void analy_lp_AMR_WB_fx(
    /* Initialization */
    wind_length = L_LP_AMR_WB;
    move16();
    wind = Hamcos_Window;
    wind = hamcos_window_fx;

    /* Autocorrelations */
    autocorr_fx( speech - L_SUBFR, M, r_h, r_l, &Q_r[0], wind_length, wind, 0, 0 );