Commit eb2e8b0b authored by Sandesh Venkatesh's avatar Sandesh Venkatesh
Browse files

Merge branch '3gpp_issue_1155_fix_2' into 'main' 

Fix for 3GPP issue 1155: Encoder crash for Stereo at 32kbps in PostShortTerm_ivas_enc_fx() - 2

See merge request !1036
parents 87a96ce5 5c20a521

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -127,4 +127,5 @@ 
#define FIX_ISSUE_1185                          /* Ittiam: Fix for issue 1185: Assertion in ivas_dirac_dec_binaural_internal_fx() for crash in decoder in fft30_with_cmplx_data()*/

#define FIX_ISSUE_1209                          /* Ittiam: Fix for issue 1209: Assertion exit in BASOP encoder (stereo_dmx_evs)*/

#define IVAS_ISSUE_1188_EVS_CRASH               /* Ittiam: Fix for issue 1188: Issue due to ASAN */

#define FIX_ISSUE_1155                          /* Ittiam: Fix for issue 1155: Encoder crash for Stereo at 32kbps in PostShortTerm_ivas_enc_fx()*/

#endif

lib_com/swb_tbe_com_fx.c

+4 −0
Original line number Diff line number Diff line
@@ -982,7 +982,11 @@ static void filt_mu_fx( 
    FOR( n = 0; n < SubFrameLength; n++ )

    {

        temp = mult_r( mu, ( *ptrs++ ) );

#ifdef FIX_ISSUE_1155

        temp = add_sat( temp, *ptrs ); /*Q12 */

#else

        temp = add( temp, *ptrs ); /*Q12 */

#endif

        sig_out[n] = shl_o( mult_r( ga, temp ), 1, &Overflow );

        move16(); /*Q12 */

    }