Commit 6b6d9544 authored by multrus's avatar multrus
Browse files

[cleanup] accept FIX_BASOP_2520_PARAMBIN_THRESHOLD_FIX

parent c69ba984

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -114,7 +114,6 @@ 
#define FIX_2500_RENDCONF_REFACTOR                      /* Eri: Basop issue #2500: Renderer configuration range check before conversion to fixed point. Harmonize between BASOP/float */

#define FIX_BASOP_2023_TDREND_DISTATT_PRECISION         /* Eri: Basop issue 2023: Distance attenuation scaling, adding clamping of distance att input and listener position */

#define FIX_BASOP_2023_TDREND_DISTATT_PRECISION_BUGFIX  /* Eri: Bug discovered in cleanup of basop issue 2023 */

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

#define FIX_BASOP_2510_UNNECESSARY_ASSERT               /* Nokia: BASOP issue 2510: Fix by removing assert */

#define FIX_2515_TDREND_PORT_ERROR_SCALING              /* Nokia: BASOP issue 2515: Fix port error by changing to correct scaling */

#define FIX_BASOP_2522_MAP_PARAMS_DIRAC_STEREO          /* FhG: BASOP issue 2522: Fix copy and paste error for side_gain calculation in map_params_dirac_to_stereo() */

lib_rend/ivas_dirac_dec_binaural_functions_fx.c

+0 −4
Original line number Diff line number Diff line
@@ -1646,11 +1646,7 @@ 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