Commit ce7123eb authored by multrus's avatar multrus
Browse files

Merge branch 'main' into... 

Merge branch 'main' into basop-2567-harmonize-init_acelp-init_tcx-init_coder_ace_plus-init_core_sig_ana-init_modes
parents f2e7023d e0ce18e7

lib_com/options.h

+1 −1
Original line number Diff line number Diff line
@@ -108,7 +108,7 @@ 
#define FIX_BASOP_2592_OVERFLOW                         /* FhG: BASOP #2592: fix overflow in GetF0() */

#define FIX_BASOP_2591_EDGE_DETECT_COMP                 /* FhG: BASOP #2591: Wrong comparison in edge_detect_fx() */

#define FIX_NONBE_2580_USE_LENGTH_NOT_CONSTANT          /* Dolby: fix 2580: use dynamic length denominator for average energy in unclr_calc_corr_features_fx() */



#define FIX_BASOP_2599_TCA_OVERFLOW                     /* VA: issue 2599, Fix TCA overflow */

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



/* ################## End MAINTENANCE switches ######################### */

lib_enc/ivas_stereo_ica_enc_fx.c

+4 −0
Original line number Diff line number Diff line
@@ -1330,7 +1330,11 @@ static void estDownmixGain_fx( 
            exp = 0;

            move16();

        }

#ifdef FIX_BASOP_2599_TCA_OVERFLOW

        unclr_instTargetGain = BASOP_Util_Log10( L_add_sat( unclr_instTargetGain, L_shr( MAX_32, sub( Q31, exp ) ) ), exp );

#else

        unclr_instTargetGain = BASOP_Util_Log10( L_add( unclr_instTargetGain, L_shr( MAX_32, sub( Q31, exp ) ) ), exp );

#endif

        // unclr_fv_fx is expected in Q15 - log result will be in Q25 - hence rightshift by 10.

        hStereoClassif->unclr_fv_fx[E_ica_instTargetGain] = L_shr( unclr_instTargetGain, Q10 ); /* Q15 */

        move32();