Merge remote-tracking branch 'remotes/origin/ivas-float-update' into 1852-ref-PortFlpMr1606 (475a26bc) · Commits · SA4 / Audio / IVAS BASOP

lib_com/options.h

+2 −1

Original line number	Diff line number	Diff line
		@@ -170,7 +170,7 @@
		#define NONBE_1319_M2R_PRECISION_ALIGN /* Nokia: bring updates from PC code related to OMASA masa2total ratios */
		#define NONBE_FIX_864_JBM_RENDER_FRAMESIZE /* FhG: issue #864: fix different behaviour of JBM TSM with different render frame sizes */
		#define NONBE_FIX_TCX5_INTERLEAVING_FOR_FS_IN_UNEQUAL_FS_OUT /* FhG: apply correct TCX5 grouping/interleaving when input_fs != output_fs */
		#define NONBE_FIX_MC_LFE_LPF /* Dlb: Adding the LFE LPF filter back for MC content. */
		/#define NONBE_FIX_MC_LFE_LPF/ /* Dlb: Adding the LFE LPF filter back for MC content. */

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

		@@ -193,6 +193,7 @@
		#define NONBE_FIX_1070_USAN_SEGFAULT_MC_TO_BIN_BTSW_HEADROT /* fix 1070 USAN: nullptr-with-offset and Segfaults in 7_1_4 to BINAURAL and BINAURAL_ROOM_REVERB decoding with bitrate switching and head rotation*/

		#define FIX_1068_ASAN_IN_MC_2_BINAURAL_ROOM_IR /* issue 1068 : Memory leak in MC to BINAURAL_ROOM decoding with bitrate switching*/
		#define FIX_1082_INSTRUM_FAILED_LC3PLUS /* VoiceAge: issue 1082: fix ambiguous syntax in LC3Plus code leading to fails of instrumented builds */

		/* #################### End BASOP porting switches ############################ */

+1 −0

+1 −8

Original line number	Diff line number	Diff line
		/******************************************************************************
		* ETSI TS 103 634 V1.4.3 *
		* ETSI TS 103 634 V1.5.1 *
		* Low Complexity Communication Codec Plus (LC3plus) *
		* *
		* Copyright licence is solely granted through ETSI Intellectual Property *
		@@ -7,7 +7,6 @@
		* estoppel or otherwise. *
		******************************************************************************/


		#include "options.h"
		#include "wmc_auto.h"
		#include "functions.h"
		@@ -19,11 +18,7 @@ void processAdjustGlobalGain_fl(LC3_INT* gg_idx, LC3_INT gg_idx_min, LC3_INT gg_
		LC3_FLOAT delta;
		LC3_INT delta2;
		LC3_INT gg_idx_inc;
		#ifdef CR8_G_ADD_75MS
		LC3_FLOAT factor;
		#else
		LC3_INT factor;
		#endif

		if (frame_dms == 25)
		{
		@@ -37,12 +32,10 @@ void processAdjustGlobalGain_fl(LC3_INT* gg_idx, LC3_INT gg_idx_min, LC3_INT gg_
		{
		factor = 2;
		}
		#ifdef CR8_G_ADD_75MS
		else if (frame_dms == 75)
		{
		factor = 1.2;
		}
		#endif
		else
		{
		factor = 1;

+1 −3

Original line number	Diff line number	Diff line
		/******************************************************************************
		* ETSI TS 103 634 V1.4.3 *
		* ETSI TS 103 634 V1.5.1 *
		* Low Complexity Communication Codec Plus (LC3plus) *
		* *
		* Copyright licence is solely granted through ETSI Intellectual Property *
		@@ -7,7 +7,6 @@
		* estoppel or otherwise. *
		******************************************************************************/


		#include "options.h"
		#include "wmc_auto.h"
		#include "stdint.h"
		@@ -715,7 +714,6 @@ LC3_INT32 fec_decoder(LC3_UINT8 iobuf, LC3_INT16 slot_bytes, LC3_INT32 data_by

		if (*bfi == 1)
		{

		return ERROR_REPORT_BEC_MASK;
		}

+1 −2

Original line number	Diff line number	Diff line
		/******************************************************************************
		* ETSI TS 103 634 V1.4.3 *
		* ETSI TS 103 634 V1.5.1 *
		* Low Complexity Communication Codec Plus (LC3plus) *
		* *
		* Copyright licence is solely granted through ETSI Intellectual Property *
		@@ -7,7 +7,6 @@
		* estoppel or otherwise. *
		******************************************************************************/


		#include "options.h"
		#include "wmc_auto.h"
		#include "functions.h"