Commit 52bf335c authored by multrus's avatar multrus
Browse files

[cleanup] accept NONBE_FIX_1091_PMC_LOW_SIGNAL_BURSTS

parent ab46715e

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -86,7 +86,6 @@ 


/* #################### Start BASOP porting switches ############################ */



#define NONBE_FIX_1091_PMC_LOW_SIGNAL_BURSTS            /* FhG: fix for #1091, fix limit calculation for the regularized inverse of Kx to avoid bursts in very low signals */

#define NONBE_FIX_1070_USAN_SEGFAULT_MC_TO_BIN_BTSW_HEADROT   /* fix 1070 USAN: nullptr-with-offset and Segfaults in 7_1_4 to BINAURAL and BINAURAL_ROOM_REVERB decoding with bitrate switching and head rotation*/

#define LC3PLUS_LEA_COMPAT_BITRATES_48_6                /* FhG: treat split-rendering 256kbps lc3plus 10ms 0dof bitrate as sentinel value for LEA compatible 48_6 bitrate (124 kbps per channel)  */

#define NONBE_FIX_ISM_XOVER_BR                          /* FhG: issue 1072: select OSBA coding method depending on number of object and bitrate */

lib_dec/ivas_dirac_output_synthesis_cov_fx.c

+0 −6
Original line number Diff line number Diff line
@@ -52,13 +52,11 @@ 
#include "rom_dec.h"

#include "ivas_prot_fx.h"



#ifdef NONBE_FIX_1091_PMC_LOW_SIGNAL_BURSTS

/*-----------------------------------------------------------------------*

 * Local constants

 *-----------------------------------------------------------------------*/



#define SQRT_EPSILON_FX 68 /* Q31 square root of EPSILON */

#endif



/*-------------------------------------------------------------------*

 * ivas_dirac_dec_output_synthesis_cov_open()
@@ -887,7 +885,6 @@ Word16 computeMixingMatrices_fx( 
    }



    limit_e = add( limit_e, reg_Sx_e );

#ifdef NONBE_FIX_1091_PMC_LOW_SIGNAL_BURSTS

    limit_fx = Mpy_32_32( limit_fx, reg_Sx_fx );

    IF( BASOP_Util_Cmp_Mant32Exp( limit_fx, limit_e, SQRT_EPSILON_FX /* Q31 */, 0 ) < 0 )

    {
@@ -896,9 +893,6 @@ Word16 computeMixingMatrices_fx( 
        limit_e = 0;

        move16();

    }

#else /* NONBE_FIX_1091_PMC_LOW_SIGNAL_BURSTS */

    limit_fx = Madd_32_32( EPSILON_FX, limit_fx, reg_Sx_fx );

#endif



    FOR( i = 0; i < lengthCx; ++i )

    {