Commit d8ba6bfb authored by multrus's avatar multrus
Browse files

Merge branch 'basop-2592-assert-in-refinethresholdsusingpitch_fx-getf0' into 'main' 

Resolve "Assert in RefineThresholdsUsingPitch_fx() -> GetF0()"

Closes #2592

See merge request !3038
parents ce3749b6 2917b883

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -151,6 +151,7 @@ 
#define FIX_ISSUE_1966_F0_32BIT                         /* FhG: Basop issue 1966: use 32-bit variables for F0 and thresholdModification */

#define FIX_BASOP_2519_TCA_LA_ZERO_EXP                  /* FhG: BASOP #2519: Exclude zero samples from exp_com calculation in tcaTargetCh_LA_fx */

#define FIX_BASOP_2519_ICBWE_DEC_Q_TRACK                /* FhG: BASOP #2519: Track Q-format of dec_2over3_mem_fx across frames in stereo_icBWE_preproc_fx */

#define FIX_BASOP_2592_OVERFLOW                         /* FhG: BASOP #2592: fix overflow in GetF0() */



/* ##################### End NON-BE switches ########################### */

lib_dec/TonalComponentDetection_fx.c

+4 −0
Original line number Diff line number Diff line
@@ -473,7 +473,11 @@ static void GetF0( 
        {

            Word16 tmp_32 = 0;

            Word32 F0_32 = BASOP_Util_Divide3232_Scale_newton( L_shl( nSamplesCore, Q16 ), tmpPitchLag, &tmp_32 );

#ifdef FIX_BASOP_2592_OVERFLOW

            F0_32 = L_shl_sat( F0_32, tmp_32 - Q16 ); /* saturation needed to allow 0x40000000 << 1 */

#else

            F0_32 = L_shl( F0_32, tmp_32 - Q16 );

#endif

            *pF0_32 = F0_32;

            move32();

            *pOrigF0_32 = *pF0_32; /*Q26*/