Commit 4a89fac4 authored by norvell's avatar norvell
Browse files

Merge branch... 

Merge branch 'basop-2235-td-renderer-mismatch-between-model-data-word16-and-calculations-word32' into 'main'

Small synch with BASOP, related to BASOP #2235

See merge request !2501
parents bdbd19ac 5b32910c

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_2235_TD_RENDERER_WORD16                     /* Eri: For float: small synch with BASOP, removing unnecessary abs. BASOP: Use Word16 in TD renderer without converting to Word32 */

#define FIX_FLOAT_1526_DIRAC_MEM_LEAK                   /* FhG: potential memory leak in DirAC handles in case of format switching */

#define ALIGN_ACELP_CORE                                /* VA: align ACELP core functions with BASOP */

lib_rend/ivas_objectRenderer_hrFilt.c

+5 −0
Original line number Diff line number Diff line
@@ -461,7 +461,12 @@ static void getStandardBSplineSampVec( 
        {

            d = 2 * ( BsLen[shape_idx] - 1 ) - d;

        }

#ifdef FIX_2235_TD_RENDERER_WORD16

        assert( d >= 0 && d < BsLen[shape_idx] );

        BfVec[i] = BsShape[BsStart[shape_idx] + d];

#else

        BfVec[i] = BsShape[BsStart[shape_idx] + (int16_t) abs( d )]; /*TT, verify if abs is needed */

#endif

        NzIdx[i] = nI + i;

    }