Commit 3fce9157 authored by fotopoulou's avatar fotopoulou
Browse files

Merge branch 'main' into float-1546-dft-stereo-dead-code

parents 0eddc0e0 38c95a2f

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -161,6 +161,7 @@ 
/*#define FIX_I4_OL_PITCH*/                             /* fix open-loop pitch used for EVS core switching */

#define TMP_1342_WORKAROUND_DEC_FLUSH_BROKEN_IN_SR      /* FhG: Temporary workaround for incorrect implementation of decoder flush with split rendering */

#define NONBE_1122_KEEP_EVS_MODE_UNCHANGED              /* FhG: Disables fix for issue 1122 in EVS mode to keep BE tests green. This switch should be removed once the 1122 fix is added to EVS via a CR.  */

#define FIX_BASOP_2469_OBJ_EDIT_TD_REND_GAIN            /* Eri: Basop issue 2469: TD renderer gain has wrong Q. In float this is just a synch of the cleanup done in BASOP */

#define FIX_ISSUE_1546_DEAD_CODE                        /* FhG: remove dead code reported in the issue*/



/* #################### End BE switches ################################## */

lib_rend/ivas_objectRenderer_sources.c

+4 −0
Original line number Diff line number Diff line
@@ -269,9 +269,13 @@ static void TDREND_SRC_REND_Init( 
    /* SrcGain  */

    for ( nC = 0; nC < SPAT_BIN_MAX_INPUT_CHANNELS; nC++ )

    {

#ifdef FIX_BASOP_2469_OBJ_EDIT_TD_REND_GAIN

        SrcRend_p->SrcGain_p[nC] = 1.0f;

#else

        SrcRend_p->SrcGainMin_p[nC] = 0.0f;

        SrcRend_p->SrcGain_p[nC] = 1.0f;

        SrcRend_p->SrcGainMax_p[nC] = 2.0f;

#endif

    }

    SrcRend_p->SrcGainUpdated = FALSE;

lib_rend/ivas_stat_rend.h

+2 −0
Original line number Diff line number Diff line
@@ -1074,8 +1074,10 @@ typedef struct TDREND_SRC_REND_s 
    /* Gains */

    int16_t SrcGainUpdated;

    float SrcGain_p[SPAT_BIN_MAX_INPUT_CHANNELS];

#ifndef FIX_BASOP_2469_OBJ_EDIT_TD_REND_GAIN

    float SrcGainMin_p[SPAT_BIN_MAX_INPUT_CHANNELS];

    float SrcGainMax_p[SPAT_BIN_MAX_INPUT_CHANNELS];

#endif

    float DirGain_p[SPAT_BIN_MAX_INPUT_CHANNELS];

    float DistGain_p[SPAT_BIN_MAX_INPUT_CHANNELS];