Commit 1a64a994 authored by norvell's avatar norvell
Browse files

Merge branch 'ivas-float-update' into ivas-float-update-debug

parents d37098d0 a61a71ef

lib_com/ivas_cnst.h

+4 −0
Original line number Diff line number Diff line
@@ -1185,6 +1185,10 @@ enum 
#define MASA_RATIO_TOLERANCE                    0.1f

#define MASA_RATIO_THRESHOLD                    0.1f

#define MASA_ANGLE_TOLERANCE                    0.5f

#ifdef  NON_BE_FIX_1048_THRESHOLD_COH_BASOP

#define MASA_SUR_COH_THRESHOLD                  1e-7f

#define MASA_SUR_COH_PRECISION                  1e7f

#endif

#define MASA_LIMIT_NO_BANDS_SUR_COH             8

#define MINIMUM_BIT_BUDGET_NORMAL_META          100

#define DIFF_DFRATIO_2BIT_LIMIT_IDX_HODIRAC     4

lib_com/mslvq_com.c

+4 −0
Original line number Diff line number Diff line
@@ -828,7 +828,11 @@ void deindex_lvq_SHB( 


        /* find idx_leader */

        i = 1;

#ifdef NONBE_FIX_1054_NEGATIVE_LVQ_INDEX

        while ( index > table_no_cv[i] )

#else

        while ( index >= table_no_cv[i] )

#endif

        {

            i++;

        }

lib_com/options.h

+13 −0
Original line number Diff line number Diff line
@@ -138,6 +138,19 @@ 


/* #################### End DEBUGGING switches ############################ */



/* ################### Start FIXES switches ########################### */



#define NON_BE_FIX_1048_THRESHOLD_COH_BASOP             /* Nokia: Fix 1048 replace comparison with 0 with comparison to threshold, to align with BASOP*/

#define NONBE_FIX_1054_NEGATIVE_LVQ_INDEX               /* Nokia: issue 1054: Input to decode_comb in deindex_lvq_SHB should be positive */

#define NONBE_FIX_738_QUATERNION_SLERP_PRECISION        /* Philips: issue 738: Quaternion spherical linear interpolation precision handling issues */

#define FIX_1033_MEMORY_LEAK_OMASA                      /* Nokia / Orange: issue #1033: Memory leak in OMASA to BINAURAL with HRTF with bitrate switching */

#define FIX_976_USAN_PVQ_ENC_DEC_EVS_CR                 /* Ericsson:  premature cast to unsigned detected by USAN corrected  */

#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/gs_dec.c

+4 −0
Original line number Diff line number Diff line
@@ -643,7 +643,11 @@ void gsc_dec( 
                }

                if ( concat_out[j] < 0 )

                {

#ifdef FIX_1027_GSC_INT_OVERFLOW

                    seed_init = (int16_t) ( (int32_t) seed_init + 3 );

#else

                    seed_init += 3;

#endif

                }

            }

lib_dec/ivas_mct_dec.c

+9 −2
Original line number Diff line number Diff line
@@ -1174,8 +1174,15 @@ static ivas_error ivas_mc_dec_reconfig( 


            if ( st_ivas->hBinRendererTd != NULL && ( st_ivas->renderer_type != RENDERER_BINAURAL_OBJECTS_TD ) )

            {

#ifdef FIX_1033_MEMORY_LEAK_OMASA

                if ( st_ivas->hBinRendererTd->HrFiltSet_p->ModelParams.modelROM == TRUE )

                {

#endif

                    ivas_td_binaural_close( &st_ivas->hBinRendererTd );

                    st_ivas->hHrtfTD = NULL;

#ifdef FIX_1033_MEMORY_LEAK_OMASA

                }

#endif

            }



            if ( st_ivas->hDiracDecBin != NULL )