Commit 2687ec39 authored by Sandesh Venkatesh's avatar Sandesh Venkatesh
Browse files

Merge branch '3gpp_issue_1147_fix_1' into 'main' 

Fix for 3GPP issue 1147: Assertion error observed in evs_enc_fx (with option stereo_dmx_evs) from DetectTnsFilt_fx function

See merge request !942
parents 909f10c3 97c030bb

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -108,4 +108,5 @@ 
#define FIX_1132_STACK_CORRUPTION               /* Stack corruption issue due of extending index access*/

#define FIX_ISSUE_1092                          /* Ittiam: Fix for Issue 1092: BASOP asserts in stereo fx encoder for selection test inputs*/

#define FIX_ISSUE_1148

#define FIX_ISSUE_1147                          /*Ittiam: Fix for issue 1147: Added saturation in DetectTnsFilt_fx.*/

#endif

lib_enc/tns_base_enc_fx.c

+4 −0
Original line number Diff line number Diff line
@@ -230,7 +230,11 @@ Word16 DetectTnsFilt_fx( STnsConfig const *pTnsConfig, 
            assert( n < (Word16) ( sizeof( tmpbuf ) / sizeof( Word16 ) ) );

            FOR( i = 0; i < n; i++ )

            {

#ifdef FIX_ISSUE_1147

                tmpbuf[i] = round_fx_sat( L_shl( pSpectrum[iStartLine + i], shift ) );

#else

                tmpbuf[i] = round_fx( L_shl( pSpectrum[iStartLine + i], shift ) );

#endif

            }



            FOR( lag = 0; lag <= pTnsConfig->maxOrder; lag++ )