Commit 8306575a authored by Sandesh Venkatesh's avatar Sandesh Venkatesh
Browse files

Merge branch 'fix-879-diff-conceal-path' into 'main' 

Fix for 879 different concealment path

See merge request !636
parents c51b9867 77b73565

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -182,6 +182,7 @@ 
#define FIX_871_REMOVE_UNNECESSARY_CONDITION    /* VA: remove a condition that is not needed and prevented correct frame classification of the secondary channel of the TD stereo */

#define FIX_875_SATURATION_DURING_ROUNDING      /* VA: fix a possible saturation when rounding */

#define FIX_882_LOW_LEVEL_DISCONTINUITIES       /* VA: Fix 882, discontinuities for low level signal by adding a scaling function that uses rounding, this function is more complex than normal one, has to be used only when necessary*/

#define FIX_879_DIFF_CONCEAL_PATH               /* FhG: Fix for issue 879 and different concelalment paths that led to crash */



/* ################## End DEVELOPMENT switches ######################### */

lib_dec/tonalMDCTconcealment_fx.c

+4 −0
Original line number Diff line number Diff line
@@ -2022,7 +2022,11 @@ ELSE 
    FOR( i = 1; i < hTonalMDCTConc->pTCI->numIndexes; i++ )

    {

        tmp = round_fx( BASOP_Util_fPow( L_deposit_h( tiltFactor ), 0, L_deposit_h( (UWord16) L_add( L_sub( hTonalMDCTConc->pTCI->upperIndex[i - 1], hTonalMDCTConc->pTCI->lowerIndex[i - 1] ), 1 ) ), 15, &exp ) );

#ifdef FIX_879_DIFF_CONCEAL_PATH

        tmp = shl_sat( tmp, exp );

#else

        tmp = shl( tmp, exp );

#endif

        tilt = mult_r( tilt, tmp ); // Q15



        FOR( l = hTonalMDCTConc->pTCI->lowerIndex[i]; l <= hTonalMDCTConc->pTCI->upperIndex[i]; l++ )