Commit aed5ed56 authored by multrus's avatar multrus
Browse files

[cleanup] accept NONBE_FIX_1000_G1_G2_SWB_TBE

parent 6bb65670

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -164,7 +164,6 @@ 
/* any switch which is non-be wrt selection floating point code */

/* all switches in this category should start with "NONBE_" */



#define NONBE_FIX_1000_G1_G2_SWB_TBE                          /* VA: issue 1000: avoid div by zero due to g1 + g2 being zero in SWB TBE */

#define NONBE_FIX_999_JBM_MCT_FLUSH                           /* FhG: issue #999: fix wrong flushing for MCT at a JBM rate switch */

#define NONBE_FIX_991_PARAMBIN_BINARY_HRTF                    /* Nokia: issue #991: fix using of binary file HRTF in ParamBin */

#define NONBE_FIX_1005_MC_RS_TCBUFFER_UPDATE                  /* FhG: issue #1005: fix TC Buffer update at a MC rate switch */

lib_com/swb_tbe_com.c

+0 −6
Original line number Diff line number Diff line
@@ -939,12 +939,10 @@ void GenShapedSHBExcitation( 


                den = 4.0f * c0 * c2 - c4 * c4;



#ifdef NONBE_FIX_1000_G1_G2_SWB_TBE

                if ( den == 0.0f )

                {

                    den = 1e-7f;

                }

#endif



                g1 = ( c3 * c4 - 2 * c1 * c2 ) / den;

                g2 = ( c1 * c4 - 2 * c0 * c3 ) / den;
@@ -972,7 +970,6 @@ void GenShapedSHBExcitation( 
                else

                {

                    /* normalize gain */

#ifdef NONBE_FIX_1000_G1_G2_SWB_TBE

                    temp = 0.0f;

                    if ( g1 + g2 == 0.0f )

                    {
@@ -980,9 +977,6 @@ void GenShapedSHBExcitation( 
                    }



                    g = g2 / ( g1 + g2 + temp );

#else

                    g = g2 / ( g1 + g2 );

#endif



                    /* quantization of the mixing factor */

                    cbsize = 1 << NUM_BITS_SHB_VF;