Commit d30c35ec authored by vaillancour's avatar vaillancour
Browse files

merge main

parents f14d119d 417b23a6

lib_com/options.h

+2 −0
Original line number Diff line number Diff line
@@ -81,6 +81,8 @@ 
#define FIX_2141_ASSERT_IN_OMASA_BITRATE_SWITSCHING          /* FhG: Replace L_shl with L_shl_sat to prevent overflow when calculating scale factors for very small numbers in the logarithmic domain */

#define FIX_APA_EXECS_SCALING                                /* VA: fix scaling of JBM APA buffer */

#define FIX_2164_ASSERT_IN_OMASA_PREPROC_FOR_EDIT            /* Nokia: Issue 2164: Prevent overflow when calculating equalization coefficient for editing before clamping to safe range */

#define FIX_BASOP_ASSERT_IN_TONAL_MDCT_PLC                   /* FhG: fix for issue 2165 - using saturating addition in tonal MDCT PLC function */



#define FIX_2015_PREMPH_SAT                                  /* VA: saturation can happen during preemphasis filtering due to a too aggressive scaling factor */

/* ################### End FIXES switches ########################### */

lib_dec/TonalComponentDetection_fx.c

+4 −0
Original line number Diff line number Diff line
@@ -454,7 +454,11 @@ static void getEnvelope( 


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

    {

#ifdef FIX_BASOP_ASSERT_IN_TONAL_MDCT_PLC

        sum = L_add_sat( sum, powerSpec[i] ); /*powerSpec_exp*/

#else

        sum = L_add( sum, powerSpec[i] ); /*powerSpec_exp*/

#endif

    }

    /* No need for PTR_INIT for powerSpec[i+n2] as we continue from the previous loop */

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