Commit 6bb2c5bd authored by Sandesh Venkatesh's avatar Sandesh Venkatesh
Browse files

Merge branch 'bug_fix_saturation_removal_macro_correction' into 'main' 

Bug fix in CNG_enc_ivas_fx, saturation removal and correction of macro value for MASA path

See merge request !1308
parents a185318f 556608f7

lib_com/ivas_cnst.h

+1 −1
Original line number Diff line number Diff line
@@ -1285,7 +1285,7 @@ enum 
#define MASA_RATIO_THRESHOLD                    0.1f

#define MASA_ANGLE_TOLERANCE                    0.5f

#define MASA_RATIO_THRESHOLD_FX                 214748365   // 0.1 in Q31

#define MASA_RATIO_TOLERANCE_FX                 214748364/*0.1 Q30*/

#define MASA_RATIO_TOLERANCE_FX                 107374182   // 0.1 in Q30

#define MASA_ANGLE_TOLERANCE_FX                 ONE_IN_Q21  // 0.5 in Q22

#define MASA_LIMIT_NO_BANDS_SUR_COH             8

#define MINIMUM_BIT_BUDGET_NORMAL_META          100

lib_com/rom_com.c

+15 −0
Original line number Diff line number Diff line
@@ -25351,6 +25351,21 @@ const Word16 lsp_shb_prev_tbl_fx[LPC_SHB_ORDER] = { 
    13107,

    14746

};













const Word16 lsp_shb_prev_tbl_swb_tbe_enc_fx[LPC_SHB_ORDER] = {













    // Q15













    32767,













    31165,













    26509,













    19262,













    10123,













    0,













    -10124,













    -19261,













    -26509,













    -31166,













};



























const Word16 ivas_lsp_shb_prev_tbl_fx[LPC_SHB_ORDER] = {















    /* Q15 */















    1489,

























lib_com/rom_com.h



+10
−9




























Original line number
Diff line number
Diff line








@@ -1512,6 +1512,7 @@ extern const Word16 ivas_band_len_ener_shift[];    // Q0













extern const Word16 ivas_fine_gain_pred_sqrt_bw[];     // Q11















extern const Word16 Mean_isf_wb[];                     // Q2.56















extern const Word16 lsp_shb_prev_tbl_fx[];             // Q15













extern const Word16 lsp_shb_prev_tbl_swb_tbe_enc_fx[]; // Q15















extern const Word16 ivas_lsp_shb_prev_tbl_fx[];        // Q15















extern const Word16 tab_ari_qnew[4][4];

















































lib_com/swb_tbe_com_fx.c



+1
−1




























Original line number
Diff line number
Diff line








@@ -930,7 +930,7 @@ static void Calc_st_filt_tbe_ivas_enc_fx(













    {















        L_g0 = L_mac0( L_g0, 1, abs_s( h[i] ) );















    }













    g0 = extract_h( L_shl_sat( L_g0, 14 ) );













    g0 = extract_h( L_shl( L_g0, 14 ) );































    /* Scale signal i  of 1/A(gamma1) */















    IF( GT_16( g0, 1024 ) )

































lib_enc/cng_enc_fx.c



+4
−4




























Original line number
Diff line number
Diff line








@@ -1305,19 +1305,19 @@ void CNG_enc_ivas_fx(













            move16();















            BREAK;















        case L_FRAME32k:













            inv_frame_len = ONE_BY_L_FRAME48k_Q31;













            inv_frame_len = ONE_BY_L_FRAME32k_Q31;















            move16();















            BREAK;















        case L_FRAME16k:













            inv_frame_len = ONE_BY_L_FRAME48k_Q31;













            inv_frame_len = ONE_BY_L_FRAME16k_Q31;















            move16();















            BREAK;















        case L_FRAME8k:













            inv_frame_len = ONE_BY_L_FRAME48k_Q31;













            inv_frame_len = ONE_BY_L_FRAME8k_Q31;















            move16();















            BREAK;















        case L_FRAME4k:













            inv_frame_len = ONE_BY_L_FRAME48k_Q31;













            inv_frame_len = ONE_BY_L_FRAME4k_Q31;















            move16();















            BREAK;















        default: