Merge remote-tracking branch 'origin/main' into... (ebf46c60) · Commits · SA4 / Audio / IVAS BASOP

lib_com/common_api_types.h

+3 −1

Original line number	Diff line number	Diff line
		@@ -163,9 +163,11 @@ typedef struct

		typedef struct
		{

		float x, y, z;

		#ifdef FIX_BASOP_2023_TDREND_DISTATT_PRECISION
		Word32 x_fx, y_fx, z_fx; /* qfact, qfact, qfact */
		Word32 x_fx, y_fx, z_fx; /* q_fact, q_fact, q_fact */
		#else
		Word32 x_fx, y_fx, z_fx;
		#endif

lib_com/ivas_prot_fx.h

+11 −1

Original line number	Diff line number	Diff line
		@@ -1939,7 +1939,7 @@ void TDREND_MIX_LIST_SetPos_fx(
		BINAURAL_TD_OBJECT_RENDERER_HANDLE hBinRendererTd, /* i/o: TD renderer handle */
		#ifdef FIX_BASOP_2023_TDREND_DISTATT_PRECISION
		const Word32 Pos_p, / i : Listener's position */
		const Word16 Pos_q /* i : Listener's position Q value */
		const Word16 Pos_q /* i : Listener's position Q */
		#else
		const Word32 Pos_p / i : Listener's position */
		#endif
		@@ -6099,7 +6099,12 @@ UWord16 get_indice_st(

		void stereo_mdct_core_enc_fx(
		CPE_ENC_HANDLE hCPE, /* i/o: CPE encoder structure */
		#ifdef NONBE_FIX_ISSUE_2206_MDCT_STEREO_FIX_2549
		Word16 new_samples[CPE_CHANNELS][L_INP], /* i : new samples new_samples_q*/
		Word16 *new_samples_q,
		#else
		Word16 new_samples[CPE_CHANNELS][L_INP], /* i : new samples Qnew-1*/
		#endif
		Word16 old_wsp[CPE_CHANNELS][L_WSP], /* i : 12.8kHz weighted speech (for LTP Qx*/
		Word16 pitch_buf_fx[CPE_CHANNELS][NB_SUBFR16k] /* o : floating pitch for each subframe Q6*/
		);
		@@ -6146,7 +6151,12 @@ void stereo_switching_dec_fx(

		void ivas_mdct_core_whitening_enc_fx(
		CPE_ENC_HANDLE hCPE, /* i/o: CPE encoder structure */
		#ifdef NONBE_FIX_ISSUE_2206_MDCT_STEREO_FIX_2549
		Word16 new_samples_fx[CPE_CHANNELS][L_INP], /* i : new samples Q_new[]-1*/
		Word16 Q_new, / i : new samples q */
		#else
		Word16 new_samples_fx[CPE_CHANNELS][L_INP], /* i : new samples */
		#endif
		Word16 old_wsp_fx[CPE_CHANNELS][L_WSP], /* i : 12.8kHz weighted speech (for LTP */
		Word16 pitch_buf[CPE_CHANNELS][NB_SUBFR16k], /* o : floating pitch for each subframe */
		Word32 mdst_spectrum_long[CPE_CHANNELS], / o : buffer for MDST spectrum */

lib_com/options.h

+8 −0

Original line number	Diff line number	Diff line
		@@ -107,6 +107,9 @@
		#define FIX_BASOP_2555_FRAMELEN_CALC /* FhG: BASOP issue 2555: Simplify (sub-)framelength calculation in ivas_mdct_core_tns_ns_fx() */
		#define FIX_BASOP_2095_REMOVE_TABLES_PT01 /* FhG: BASOP issue 2095: remove unused tables, part 01 */
		#define FIX_2346_DUPLICATED_IGF_FUNCTIONS_2 /* FhG: part 2 of basop issue 2346: Review potentially duplicated IGF functions */
		#define FIX_2095_REMOVE_UNUSED_ISAR_TABLES /* Dolby: remove unused ISAR */
		#define FIX_BASOP_2560_STEREO_DFT_DEC_RESET /* FhG: BASOP issue 2560: align reset of hStereoDft->res_gains_ind_fx[][] between BASOP and float */
		#define HARMONIZE_2539_cng_energy /* FhG: basop issue 2539: harmonize cng_energy with its ivas derivate */

		/* #################### End BE switches ################################## */

		@@ -115,6 +118,7 @@

		#define FIX_1540_EXPOSE_PT_IN_RTP_HEADER_API /* Expose Payload Type setting in RTP Header */
		#define FIX_BASOP_2023_TDREND_DISTATT_PRECISION /* Eri: Basop issue 2023: Distance attenuation scaling, adding clamping of distance att input and listener position */
		#define FIX_BASOP_2023_TDREND_DISTATT_PRECISION_BUGFIX /* Eri: Bug discovered in cleanup of basop issue 2023 */
		#define USE_RTPDUMP /* FhG: RTPDUMP format (rtptools standard) instead of custom format */
		#define FIX_FLOAT_1569_REND_RENDER_CONFIG_CHECKS /* Nokia: float issue 1569: fix render config checks in renderer */
		#define FIX_BASOP_2526_SPAR_MASA_PARAM_MAP_Q_BUG /* Nokia: BASOP issue 2526: Fix wrong Q variable in SPAR to MASA param mapping */
		@@ -134,11 +138,15 @@
		#define FIX_FLOAT_1573_POSITION_UPDATE /* Eri: Float issue 1573: For static orientation and listener movement, the PoseUpdated flag is cleared and prevents 5 ms update rate. */
		#define FIX_BASOP_2521_DIRAC_STEREO_STEFFI_NRGS /* FhG: BASOP issue 2521: Fix wrong porting for determination of first subframe length in ivas_sba_dirac_stereo_compute_td_stefi_nrgs() */
		#define FIX_1452_DEFAULT_REVERB /* Nokia/Philips/FhG: Fix default room presets and their usage in renderer */
		#define NONBE_FIX_ISSUE_2206_MDCT_STEREO_FIX_2549 /* FhG: Correct scale inconsistency of old_inp_16k_fx buffer scale. */
		#define FIX_2547_ALIGN_CONDITIONS_IN_CORE_SW_DEC /* VA : Basop issue 2547: Align conditions in core sw dec */
		#define FIX_2547_ALIGN_CONDITIONS_IN_CORE_SW_DEC_EVS /* VA : Basop issue 2547: Align conditions in core sw dec, condition that could affect EVS as well, but adapted to keep EVS BE */
		#define FIX_BASOP_2548_ProcessIGF_fx_PREDICTIONGAIN /* FhG: fixes obvious bug for IVAS path. For EVS path, issue is still not resolved */
		#define FIX_FMSW_DEC /* float issue 1542: fix JBM issue in format switching */
		#define FIX_FMSW_DEC_2 /* float issue 1575: fix crash for format switching when bitsream starts with EVS */
		#define FIX_BASOP_2561_STEREO_DFT_ENC_COMPUTE_ITD /* BASOP issue 2561: fix diffs in stereo_dft_enc_compute_itd() between float and BASOP */
		#define FIX_BASOP_2517_CLICK_IN_OMASA_LTV /* FhG: BASOP #2517: preserve precision by removing one-bit headroom from Q_min and allowing saturation during buffer scaling */
		#define FIX_BASOP_2559_Q_SYNTH_HISTORY_RESET /* FhG: BASOP issue 2559: reset hTcxDec->q_synth_history_fx in allocate_CoreCoder_TCX_fx() */
		#define FIX_FLOAT_1578_OMASA_REND_SPIKES /* Nokia: Float issue 1578: Fix spikes and collapsed perception in OMASA/MASA rendering to FOA/HOA */

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

lib_dec/ivas_rom_dec.h

+2 −0

Original line number	Diff line number	Diff line
		@@ -96,6 +96,8 @@ extern const Word16 dirac_dithering_ele_scale_fx[DIRAC_DIFFUSE_LEVELS];

		extern const HUFF_NODE_TABLE ivas_mc_paramupmix_huff_nodes_df0;
		extern const HUFF_NODE_TABLE ivas_mc_paramupmix_huff_nodes_df;
		#ifndef FIX_2095_REMOVE_UNUSED_ISAR_TABLES
		extern const HUFF_NODE_TABLE ivas_mc_paramupmix_huff_nodes_dt;
		#endif

		#endif /* IVAS_ROM_DEC_H */

lib_dec/ivas_rom_dec_fx.c

+6 −2

Original line number	Diff line number	Diff line
		@@ -476,6 +476,7 @@ static const Word16 huff_nodes_alpha_1D_DF[64][2] =
		{ -2, -62 }
		};

		#ifndef FIX_2095_REMOVE_UNUSED_ISAR_TABLES
		/* Alpha Fine Huffman table dt */
		static const Word16 huff_nodes_alpha_1D_DT[64][2] =
		{
		@@ -544,6 +545,7 @@ static const Word16 huff_nodes_alpha_1D_DT[64][2] =
		{ -3, -64 },
		{ -2, -63 }
		};
		#endif

		/* Beta Fine Huffman table df0 */
		static const Word16 huff_nodes_first_band_beta[8][2] =
		@@ -557,12 +559,13 @@ static const Word16 huff_nodes_beta_1D_DF[16][2] =
		{ -9, 1 }, { -10, 2 }, { -8, 3 }, { -11, 4 }, { -7, 5 }, { 7, 6 }, { -6, -12 }, { 9, 8 }, { -5, -13 }, { 11, 10 }, { -4, -14 }, { -15, 12 }, { -3, 13 }, { -16, 14 }, { -2, 15 }, { -1, -17 }
		};

		#ifndef FIX_2095_REMOVE_UNUSED_ISAR_TABLES
		/* Beta Fine Huffman table dt */
		static const Word16 huff_nodes_beta_1D_DT[16][2] =
		{
		{ -9, 1 }, { -10, 2 }, { -8, 3 }, { -11, 4 }, { -7, 5 }, { 7, 6 }, { -6, -12 }, { -13, 8 }, { -5, 9 }, { -14, 10 }, { -4, 11 }, { -15, 12 }, { -3, 13 }, { -16, 14 }, { -2, 15 }, { -1, -17 }
		};

		#endif

		const HUFF_NODE_TABLE ivas_mc_paramupmix_huff_nodes_df0 =
		{
		@@ -576,11 +579,12 @@ const HUFF_NODE_TABLE ivas_mc_paramupmix_huff_nodes_df =
		huff_nodes_beta_1D_DF
		};

		#ifndef FIX_2095_REMOVE_UNUSED_ISAR_TABLES
		const HUFF_NODE_TABLE ivas_mc_paramupmix_huff_nodes_dt =
		{
		huff_nodes_alpha_1D_DT,
		huff_nodes_beta_1D_DT
		};

		#endif

		/* clang-format on */