Commit bf890991 authored by sagnowski's avatar sagnowski
Browse files

Align split rendering init loops in IVAS_REND_Open with the float implementation

parent 99dc937f

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -86,6 +86,7 @@ 
#define FIX_1990_SANITIZER_IN_REVERB_LOAD               /* Nokia: Fix issue part of issue 1990 by introducing missing free of structure - keep until #2059 is addressed */

#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 BE_FIX_BASOP_2543_MISMATCH_REND_OPEN_FX_FL      /* FhG: Aligns implementation of split rendering init loops in IVAS_REND_Open between float and BASOP */



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

lib_rend/lib_rend_fx.c

+8 −0
Original line number Diff line number Diff line
@@ -3918,7 +3918,11 @@ ivas_error IVAS_REND_Open( 
        move32();

        hIvasRend->inputsIsm[i].tdRendWrapper.hBinRendererTd = NULL;

        move32();

#ifdef BE_FIX_BASOP_2543_MISMATCH_REND_OPEN_FX_FL

        FOR( j = 0; j < (Word16) ( sizeof( hIvasRend->inputsMc[i].splitTdRendWrappers ) / sizeof( *hIvasRend->inputsMc[i].splitTdRendWrappers ) ); ++j )

#else

        FOR( j = 0; j < MAX_HEAD_ROT_POSES - 1; ++j )

#endif

        {

            hIvasRend->inputsIsm[i].splitTdRendWrappers[j].hBinRendererTd = NULL;

            move32();
@@ -3957,7 +3961,11 @@ ivas_error IVAS_REND_Open( 
        move32();

        hIvasRend->inputsMc[i].hMcMasa = NULL;

        move32();

#ifdef BE_FIX_BASOP_2543_MISMATCH_REND_OPEN_FX_FL

        FOR( j = 0; j < (Word16) ( sizeof( hIvasRend->inputsIsm[i].splitTdRendWrappers ) / sizeof( *hIvasRend->inputsIsm[i].splitTdRendWrappers ) ); ++j )

#else

        FOR( j = 0; j < MAX_HEAD_ROT_POSES - 1; ++j )

#endif

        {

            hIvasRend->inputsMc[i].splitTdRendWrappers[j].hBinRendererTd = NULL;

            move32();