Commit 3f12ceb4 authored by emerit's avatar emerit
Browse files

Merge branch 'main' into fix_hrtf_processing_scripts_for_3rd_party_sofa_support

parents 8fb9b378 703c7ad4

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -175,6 +175,7 @@ 
#define NONBE_FIX_1277_EVS_DTX_HIGH_RATE_THRESHOLD      /* VA/Eri: issue 1277: Fix Mismatch in DTX high-rate threshold between EVS float and BASOP */





#define NONBE_1231_BASOP_819_THRESHOLD_MASA2TOTAL        /* Nokia: add fix for precision limitation in comparison with masa2total energy ratio threshold to be aligned with BASOP*/

/* ##################### End NON-BE switches ########################### */



/* ################## End DEVELOPMENT switches ######################### */

scripts/split_rendering/lc3plus_float/ivas_lc3plus_unit_test_payload_format.c

+0 −2
Original line number Diff line number Diff line
@@ -38,7 +38,6 @@ the United Nations Convention on Contracts on the International Sales of Goods. 
#include "isar_lc3plus_common.h"

#include "options.h"



#ifdef ISAR_BITSTREAM_UPDATE_LC3PLUS



/* included by ivas_lc3plus_unit_test.c */
@@ -448,4 +447,3 @@ static int run_all_payload_tests( void ) 
    }

    return 0;

}
 
#endif