Commit 8a7c3d05 authored by Sandesh Venkatesh's avatar Sandesh Venkatesh
Browse files

Merge branch '3gpp_issue_1428_fix' into 'main' 

Fix for 3GPP issue 1428: Basop Encoder Artifact for Stereo 13.2 kps DTX Background Noise Segment [allow regression]

See merge request !1857
parents ebd02210 8680bd29

lib_com/rom_com.c

+27 −0
Original line number Diff line number Diff line
@@ -15654,6 +15654,33 @@ const Word16 wac_swb_l[LPC_SHB_ORDER] = 
    30328

};













const Word16 wac_swb_ivas_h[LPC_SHB_ORDER] =













{//Q15













    32749,













    32731,













    32686,













    32622,













    32541,













    32442,













    32325,













    32191,













    32039,













    31870













};

























const Word16 wac_swb_ivas_l[LPC_SHB_ORDER] =













{//Q15













    2624,













    20874,













    7850,













    25873,













    12831,













    5927,













    10541,













    239,













    15037,













    30328













};





























const Word16 lbr_wb_bwe_lsfvq_cbook_2bit_fx[4 * 4] =















{

























lib_com/rom_com.h



+4
−2




























Original line number
Diff line number
Diff line








@@ -618,6 +618,8 @@ extern const Word16 Hilbert_coeffs_fx[4 * NUM_HILBERTS][HILBERT_ORDER1 + 1]; //





























extern const Word16 wac_swb_h[];      // Q15















extern const Word16 wac_swb_l[];      // Q15













extern const Word16 wac_swb_ivas_h[]; // Q15













extern const Word16 wac_swb_ivas_l[]; // Q15































extern const Word16 wb_bwe_lsfvq_cbook_8bit_fx[];     // Q15















extern const Word16 lbr_wb_bwe_lsfvq_cbook_2bit_fx[]; // Q15

































lib_enc/swb_tbe_enc_fx.c



+2
−2




























Original line number
Diff line number
Diff line








@@ -3062,7 +3062,7 @@ void swb_tbe_enc_ivas_fx(













    {















        FOR( i = 1; i <= LPC_SHB_ORDER; i++ )















        {













            L_tmp = Mpy_32( R_h[i], R_l[i], wac_swb_h[i - 1], wac_swb_l[i - 1] );













            L_tmp = Mpy_32( R_h[i], R_l[i], wac_swb_ivas_h[i - 1], wac_swb_ivas_l[i - 1] );















            L_Extract( L_tmp, &R_h[i], &R_l[i] );















        }















    }










@@ -3091,7 +3091,7 @@ void swb_tbe_enc_ivas_fx(













    }































    /* this is needed as the E_LPC_lev_dur function outputs lpc in Q14 */













    Copy_Scale_sig( lpc_shb_fx, lpc_shb_fx, LPC_SHB_ORDER + 1, sub( norm_s( lpc_shb_fx[0] ), 2 ) );













    scale_sig( lpc_shb_fx, LPC_SHB_ORDER + 1, sub( norm_s( lpc_shb_fx[0] ), 2 ) );































    /* Expand bandwidth of the LP coeffs */















    test();