Commit 24d3da98 authored by norvell's avatar norvell
Browse files

Merge with ivas-float-update

parents f4be2686 780495f3

lib_com/options.h

+2 −0
Original line number Diff line number Diff line
@@ -66,6 +66,8 @@ 
#define FIX_1027_GSC_INT_OVERFLOW                       /* VA: issue 2207: overflow in GSC */

#define NONBE_FIX_1096_NAN_VALUES_IN_DIRAC_TO_STEREO    /* FhG: avoid sidegain DFT-Stereo param to be larger than 1 when converting from Dirac parameters */

#define NON_BE_1055_RESET_LP_MEMORIES                   /* VA: issue 1055: Correctly reset LP filter MA and AR memories in bitrate switching */

#define NONBE_FIX_1069_SVD_TUNING                       /* FhG: issue 1069: tune SVD constants */

#define NONBE_FIX_1010_STEREO_CNG_DIV_BY_ZERO           /* Eri: Issue 1010: Division by zero in Stereo CNG */

/* #################### End FIXES switches ############################ */



#define BASOP_NOGLOB                                    /* Disable global symbols in BASOPs, Overflow/Carry in BASOPs disabled, additional BASOPs in case of Overflow */

lib_dec/ivas_stereo_dft_dec.c

+8 −0
Original line number Diff line number Diff line
@@ -2713,7 +2713,11 @@ void stereo_dft_dec_smooth_parameters( 
        if ( hStereoDft->frame_sid_nodata )

        {

            /* set new xfade target if new itd received */

#ifdef NONBE_FIX_1010_STEREO_CNG_DIV_BY_ZERO

            if ( hStereoDft->ipd_xfade_counter < STEREO_DFT_ITD_CNG_XFADE )

#else

            if ( hStereoDft->gipd[k + k_offset] != hStereoDft->ipd_xfade_target )

#endif

            {

                if ( ( hStereoDft->gipd[k + k_offset] - hStereoDft->ipd_xfade_prev ) > EVS_PI )

                {
@@ -2759,7 +2763,11 @@ void stereo_dft_dec_smooth_parameters( 
        if ( hStereoDft->frame_sid_nodata )

        {

            /* set new xfade target if new itd received */

#ifdef NONBE_FIX_1010_STEREO_CNG_DIV_BY_ZERO

            if ( hStereoDft->itd_xfade_counter < STEREO_DFT_ITD_CNG_XFADE )

#else

            if ( hStereoDft->itd[k + k_offset] != hStereoDft->itd_xfade_target )

#endif

            {

                hStereoDft->itd_xfade_target = hStereoDft->itd[k + k_offset];

                hStereoDft->itd_xfade_step = ( hStereoDft->itd_xfade_target - hStereoDft->itd_xfade_prev ) / ( STEREO_DFT_ITD_CNG_XFADE - hStereoDft->itd_xfade_counter );

lib_dec/ivas_svd_dec.c

+7 −1
Original line number Diff line number Diff line
@@ -45,11 +45,17 @@ 
 *-----------------------------------------------------------------------*/



/* The SVD is sensitive to changes to the following constants, so please be careful when trying to tune things   */

#ifdef NONBE_FIX_1069_SVD_TUNING

#define SVD_MINIMUM_VALUE        1e-32f   /* minimum value                                                   */

#define CONVERGENCE_FACTOR       1.0e-04f /* factor for SVD convergence                                      */

#define SVD_MAX_NUM_ITERATION    75       /* maximum number of interations before exiting the SVD            */

#define SVD_ZERO_FLUSH_THRESHOLD 0.0f

#else

#define SVD_MINIMUM_VALUE        1e-32f          /* minimum value                                                   */

#define CONVERGENCE_FACTOR       1.19209290e-07f /* factor for SVD convergence                                      */

#define SVD_MAX_NUM_ITERATION    75              /* maximum number of interations before exiting the SVD            */

#define SVD_ZERO_FLUSH_THRESHOLD 1.0e-20f



#endif



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

 * Local function prototypes