Commit 6934bf42 authored by Fabian Bauer's avatar Fabian Bauer
Browse files

Merge branch 'main' of ssh://forge.3gpp.org:29419/sa4/audio/ivas-basop into... 

Merge branch 'main' of ssh://forge.3gpp.org:29419/sa4/audio/ivas-basop into basop-2537-harmonization-transient-detection-gettcxmaxenergychange-gettcxavgtemporalflatnessmeasure
parents 771e2951 efc1fc02

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -112,6 +112,7 @@ 
#define FIX_FLOAT_1569_REND_RENDER_CONFIG_CHECKS        /* Nokia: float issue 1569: fix render config checks in renderer */

#define FIX_BASOP_2526_SPAR_MASA_PARAM_MAP_Q_BUG        /* Nokia: BASOP issue 2526: Fix wrong Q variable in SPAR to MASA param mapping */

#define FIX_BASOP_2524_MASA_REDUCE_META_BUG             /* Nokia: BASOP issue 2524: Fix wrong reset of W_tmp in reduce_metadata_further_fx */

#define FIX_BASOP_2520_PARAMBIN_THRESHOLD_FIX           /* Nokia: BASOP issue 2520: Fix wrong threshold in ParamBin */



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

lib_rend/ivas_dirac_dec_binaural_functions_fx.c

+4 −0
Original line number Diff line number Diff line
@@ -1646,7 +1646,11 @@ static void ivas_dirac_dec_binaural_formulate_target_covariance_matrices_fx( 
            }

            ELSE IF( NE_32( ivas_format, MASA_ISM_FORMAT ) || ( EQ_32( ivas_format, MASA_ISM_FORMAT ) && LT_16( dirIndex, hSpatParamRendCom->numParametricDirections ) ) ) /* For second of the two simultaneous directions */

            {

#ifdef FIX_BASOP_2520_PARAMBIN_THRESHOLD_FIX

                IF( LT_32( ( ratio_fx = hSpatParamRendCom->energy_ratio2_fx[dirac_read_idx][bin] ), 1073741 /* 0.001 in Q30 */ ) )

#else

                IF( LT_32( ( ratio_fx = hSpatParamRendCom->energy_ratio2_fx[dirac_read_idx][bin] ), 10737418 /* 0.01 in Q30 */ ) )

#endif

                {

                    /* This touches only MASA path where second direction always has smaller ratio and

                     * for non-2dir it is zero. As the whole direction contribution is multiplied with