Commit f54a74e1 authored by multrus's avatar multrus
Browse files

Merge branch 'basop-2645-ivas_rend_open-mismatch-float-vs-basop-for-split-rendering' into 'main' 

Resolve "IVAS_REND_Open: Mismatch float vs. BASOP for Split Rendering"

Closes #2645

See merge request !3093
parents f268b61b 33f37dd4

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -89,6 +89,7 @@ 
#define HARMONIZE_2502_GENERATE_COMFORT_NOISE_DEC       /* FhG: harmonize generate_comfort_noise_dec_fx() and generate_comfort_noise_dec_ivas_fx() */

#define FIX_BASOP_2650_DEC_PRM_TCX                      /* FhG: Simplify calculation of st->bits_frame_core in dec_prm_tcx(), align function name to float */

#define FIX_2648_IVAS_ISM_DEC_DIGEST_TC                 /* FhG: improvements on ivas_ism_dec_digest_tc_fx() */

#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->inputsIsm[i].splitTdRendWrappers ) / sizeof( *hIvasRend->inputsIsm[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->inputsMc[i].splitTdRendWrappers ) / sizeof( *hIvasRend->inputsMc[i].splitTdRendWrappers ) ); ++j )

#else

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

#endif

        {

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

            move32();