Commit 49ca5538 authored by vaclav's avatar vaclav
Browse files

enable again FIX_1320_STACK_CPE_DECODER + port FIX_1946_CRASH_JBM_PROCESSING within it

parent be452fcd

lib_com/options.h

+1 −3
Original line number Diff line number Diff line
@@ -89,9 +89,7 @@ 
#define NONBE_1302_FIX_OMASA_JBM_FLUSH                  /* VA: issue 1302: fix OMASA JBM bitrate switching flush in binaural output */

#define NONBE_1328_FIX_NON_LINEARITY                    /* VA: Fix possible issue when computing bwe_exc_extended and previous frame were almost 0, float issue 1328  */

#define FIX_1319_STACK_SBA_DECODER                      /* VA: issue 1319: Optimize the definition of buffer lengths in the SBA decoder */

//de-activate FIX_1320_STACK_CPE_DECODER due to sanitizer issues in #1986; also review needed for patch within FIX_1946_CRASH_JBM_PROCESSING, which gets partially disabled

//#define FIX_1320_STACK_CPE_DECODER                      /* VA: issue 1320: Optimize the stack memory consumption in the CPE decoder */



#define FIX_1320_STACK_CPE_DECODER                      /* VA: issue 1320: Optimize the stack memory consumption in the CPE decoder */

#define FIX_1984_SAT_IN_PSYCHAD                         /* VA: Issue 1984: proposal to fix an assert */



/* #################### End BASOP porting switches ############################ */

lib_dec/ivas_cpe_dec_fx.c

+4 −0
Original line number Diff line number Diff line
@@ -981,7 +981,11 @@ static ivas_error stereo_dft_dec_main( 


    IF( NE_16( shift, 31 ) )

    {

#ifdef FIX_1946_CRASH_JBM_PROCESSING

        shift = sub( add( hCPE->hStereoDft->q_dft, shift ), Q17 ); /* Q17 for guard bits */

#else

        shift = sub( add( hCPE->hStereoDft->q_dft, shift ), Q16 ); /* Q16 for guard bits */

#endif



        IF( GT_16( shift, hCPE->hStereoDft->q_dft ) )

        {