Commit ba6f5a68 authored by emerit's avatar emerit
Browse files

Merge branch 'main' into 1963_basop_portFltMR-1568-1471-1690

parents 890dec82 479edf1c

apps/decoder.c

+5 −1
Original line number Diff line number Diff line
@@ -802,10 +802,14 @@ cleanup: 
        destroy_hrtf_statistics( hHrtfStatistics );

#endif

    }

#ifdef FIX_CREND_SIMPLIFY_CODE



#ifdef FIX_1990_SANITIZER_IN_REVERB_LOAD

    /* This free differs from float version and is done always. This should be safe to do even though we leave a return

     * value as not handled. This is needed as HRTF statistics from ROM are currently converted from float values. */

    IVAS_DEC_GetHrtfStatisticsHandle( hIvasDec, &hHrtfBinary.hHrtfStatistics );

    destroy_hrtf_statistics( hHrtfBinary.hHrtfStatistics );

#endif



    IVAS_DEC_Close( &hIvasDec );

    CustomLsReader_close( &hLsCustomReader );

    hrtfFileReader_close( &hrtfReader );

lib_com/options.h

+2 −0
Original line number Diff line number Diff line
@@ -87,6 +87,8 @@ 
#define FIX_1987_CRASH_OMASA_ENERGY                          /* FhG: Replace cldfbAnalysis_ts_fx_fix_q() with cldfbAnalysis_ts_fx_var_q() to avoid assertion error */

#define FIX_1985_SBA_714_HF_LOSS                             /* Dlb: Fix for issue 1985, improved dirac ref pow precision*/

#define FIX_1819_EIGENVALUE_ERROR                            /* FhG: Workaround for zero eigenvalue: replace with epsilon if det != 0*/

#define FIX_1990_SANITIZER_IN_REVERB_LOAD                    /* Nokia: Fix issue part of issue 1990 by introducing missing free of structure. */



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



#define NONBE_1244_FIX_SWB_BWE_MEMORY                   /* VA: issue 1244: fix to SWB BWE memory in case of switching from FB coding - pending a review by Huawei */