Resolve merge conflict. (40f5e60e) · Commits · SA4 / Audio / IVAS BASOP

apps/decoder.c

+3 −0

Original line number	Diff line number	Diff line
		@@ -913,6 +913,9 @@ static bool parseCmdlIVAS_dec(
		arg->inputFormat = IVAS_DEC_INPUT_FORMAT_G192;
		arg->non_diegetic_pan_enabled = false;
		arg->non_diegetic_pan_gain = 0.f;
		#ifdef FIX_2318_CLANG_DECODER
		arg->non_diegetic_pan_gain_fx = 0;
		#endif
		arg->tsmEnabled = false;
		arg->render_num_subframes = IVAS_RENDER_NUM_SUBFR_20MS;
		arg->aeSequence.count = 0;

lib_com/ivas_prot_fx.h

+14 −2

Original line number	Diff line number	Diff line
		@@ -5859,7 +5859,11 @@ ivas_error ivas_mct_enc_fx(
		const Word16 nb_bits_metadata /* i : number of metadata bits */
		);

		#ifdef FIX_2344_ALIGN_PREPROC
		void ivas_compute_core_buffers_fx(
		#else
		ivas_error ivas_compute_core_buffers_fx(
		#endif
		Encoder_State st, / i/o: encoder state structure */
		Word16 *inp16k_out_fx, / o : ptr. to inp. signal in the current frame */
		Word16 old_inp_16k_fx, / i/o: buffer of old input signal @ 16kHz */
		@@ -5873,7 +5877,7 @@ ivas_error ivas_compute_core_buffers_fx(
		Word32 epsP[M + 1], /* i/o: LP prediction errors */
		Word16 lsp_new_fx[M], /* i/o: LSPs at the end of the frame */
		Word16 lsp_mid_fx[M], /* i/o: LSPs in the middle of the frame */
		Word16 Q_old_inp_16k,
		const Word16 Q_old_inp_16k,
		Word16 Q_r[2],
		Word16 *Q_new
		);
		@@ -5964,7 +5968,11 @@ void ivas_mct_enc_close_fx(
		MCT_ENC_HANDLE hMCT / i/o: MCT encoder structure */
		);

		#ifdef FIX_2344_ALIGN_PREPROC
		void pre_proc_front_ivas_fx(
		#else
		ivas_error pre_proc_front_ivas_fx(
		#endif
		SCE_ENC_HANDLE hSCE, /* i/o: SCE encoder structure */
		CPE_ENC_HANDLE hCPE, /* i/o: CPE encoder structure */
		const Word32 element_brate, /* i : SCE/CPE element bitrate Q0*/
		@@ -6020,7 +6028,11 @@ ivas_error pre_proc_front_ivas_fx(
		Word16 Q_new / i/o : Q factor of speech buffers */
		);

		#ifdef FIX_2344_ALIGN_PREPROC
		void pre_proc_ivas_fx(
		#else
		ivas_error pre_proc_ivas_fx(
		#endif
		Encoder_State st, / i/o: encoder state structure */
		const Word16 last_element_mode, /* i : last element mode Q0*/
		const Word32 element_brate, /* i : element bitrate Q0*/

lib_com/options.h

+13 −0

Original line number	Diff line number	Diff line
		@@ -99,11 +99,24 @@
		#define REMOVE_UNUSED_CODE_IVAS_DEC /* VA: remove unused code in ivas_jbm_dec_tc_fx() */
		#define FIX_2294_CLANG_18_WARNINGS_ENC /* VA: Fix some encoder clang-18 warnings, desc. in 2294 */
		#define REMOVE_CAM_FROM_IVAS /* VA: basop issue 210: remove obsoelte CAM code from IVAS */
		#define FIX_2318_CLANG_DECODER /* VA: basop issue 2318: Initialize command-line parameter arg.non_diegetic_pan_gain_fx */
		#define OPT_BE_2311_HARM_GSC_GAIN /* VA: issue 2311: BE part of the GSC gain harmonization pipeline #70380 shows the BE */
		#define HARM_CORECODER_UPDT /* VA: basop issue 2342: Remove duplicated code in core-coder common update functions */
		#define HARM_CORE_SW /* VA: basop issue 2314: Remove duplicated code in the core switching */
		#define HARM_PREPROC /* VA: basop issue 2339: Remove duplicated code in the core-coder DTX */
		#define HARM_NON_LINEARITY /* VA: basop issue 2345: Remove duplicated code in core-coder: non_linearity_fx() and LP CNG */
		#define FIX_2344_ALIGN_PREPROC /* VA: basop issue 2344: Align pre_proc_ivas() between FLP and BASOP */
		#define FIX_2334_HARM_CODER_MODIF /* VA: basop issue 2334 : harmonizing coder_modif_function */
		#define FIX_FLOAT_1501_UNIT_VALUE_IN_OMASA /* Nokia: Fix float issue 1501, uninitialized value in ivas_masa_combine_directions for OMASA */
		#define FIX_BASOP_2323_DIRAC_ENC_WRONG_INIT /* Nokia/FhG: basop issue 2323: Use correct init size */
		#define FIX_BASOP_2324_MISSING_SET_TO_ZERO /* Nokia: basop issue 2324: Fix issue by setting the exponent to zero where it should be */
		#define FIX_BASOP_2326_WRONG_SIG_LENGTH /* Nokia: basop issue 2326: Fix issue by using correct signal length in multiple places */
		#define FIX_BASOP_2327_WRONG_LOOP_END /* Nokia: basop inssue 2327: Correct loop end to solve MSAN error */
		#define FIX_BASOP_2328_MSAN_WRONG_ASSIGNMENT /* Nokia: basop issue 2328: Fix MSAN error by correcting the variable assignment */
		#define FIX_BASOP_2329_UNINIT_VALUE /* Nokia: basop issue 2329: Fix issue by checking for structure instead of length */
		#define FIX_BASOP_2332_ASAN_OVERFLOW_IN_EXT_DIRAC_REND /* Nokia: basop issue 2332: Uses predefined memory sizes instead computing wrong */
		#define FIX_BASOP_2333_MCMASA_ANA_MEMORY_LEAK /* Nokia: basop issue 2333: Add missing free for direction_vector_e to ivas_mcmasa_ana_fx.c */
		#define HARM_COREDECODER_FUNCTIONS /* VA: basop issue 2347: Remove various duplicated code in core-decoder */

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

lib_com/parameter_bitmaping_fx.c

+12 −2

Original line number	Diff line number	Diff line
		@@ -25,6 +25,7 @@ static Word16 PutIntoBitstream_fx(

		return value;
		}
		#ifndef HARM_COREDECODER_FUNCTIONS
		static Word16 PutIntoBitstream_ivas_fx(
		const Word16 **pStream,
		TEncodeValue EncodeValue,
		@@ -43,6 +44,7 @@ static Word16 PutIntoBitstream_ivas_fx(

		return value;
		}
		#endif

		static Word16 FixedWidthEncoding( Word16 value, Word16 index )
		{
		@@ -252,6 +254,8 @@ void SetParameters_fx(
		}
		}
		}

		return;
		}


		@@ -266,13 +270,11 @@ void WriteToBitstream_fx(
		Word16 index;
		Word16 iParam, nParams;


		assert( ( paramsBitMap != NULL ) && ( nArrayLength > 0 ) && ( pStream != NULL ) && ( pnSize != NULL ) && ( hBstr != NULL ) && ( pnBits != NULL ) );
		nParams = paramsBitMap->nParams;

		FOR( index = 0; index < nArrayLength; index++ )
		{

		FOR( iParam = 0; iParam < nParams; iParam++ )
		{
		ParamBitMap const *param;
		@@ -321,7 +323,11 @@ void WriteToBitstream_fx(
		}
		}
		}

		return;
		}

		#ifndef HARM_COREDECODER_FUNCTIONS
		void WriteToBitstream_ivas_fx(
		ParamsBitMap const *paramsBitMap,
		const Word16 nArrayLength,
		@@ -389,6 +395,7 @@ void WriteToBitstream_ivas_fx(
		}
		}
		}
		#endif

		/** Get nBits long value from bitstream into pStream. /
		static Word16 GetFromBitstream(
		@@ -457,6 +464,9 @@ void ReadFromBitstream_fx(
		}
		}
		}

		move16();
		pnSize = add( pnSize, i_mult( nParams, nArrayLength ) );

		return;
		}

lib_com/prot_fx.h

+10 −4

Original line number	Diff line number	Diff line
		@@ -6189,10 +6189,11 @@ void concealment_init_x(
		const Word16 L_frameTCX,
		T_PLCInfo_HANDLE hPlcInfo );

		#ifdef HARM_COREDECODER_FUNCTIONS
		void concealment_init_ivas_fx(
		const Word16 L_frameTCX,
		T_PLCInfo_HANDLE hPlcInfo );

		#endif
		void concealment_update_x(
		const Word16 bfi,
		const Word16 core,
		@@ -6572,6 +6573,7 @@ void formant_post_filt_fx(
		const Word16 off_flag /* i : off flag */
		);

		#ifndef HARM_COREDECODER_FUNCTIONS
		void Filt_mu_fx(
		Word16 sig_in, / i : signal (beginning at sample -1) */
		Word16 sig_out, / o : signal with tilt */
		@@ -6585,7 +6587,7 @@ void Filt_mu_ivas_fx(
		Word16 parcor0, /* i : parcor0 (mu = parcor0 * gamma3) */
		Word16 L_subfr, /* i : the length of subframe */
		const Word16 extl );

		#endif
		void scale_st_fx(
		const Word16 sig_in, / i : postfilter i signal */
		Word16 sig_out, / i/o: postfilter o signal */
		@@ -6772,6 +6774,7 @@ void gain_dec_tc_fx(
		Word32 norm_gain_code_fx / o : norm. gain of the codebook excit. */
		);

		#ifndef HARM_COREDECODER_FUNCTIONS
		void gain_dec_tc_ivas_fx(
		Decoder_State st_fx, / i/o: decoder state structure */
		const Word16 code_fx, / i : algebraic code excitation */
		@@ -6782,7 +6785,7 @@ void gain_dec_tc_ivas_fx(
		Word16 gain_inov_fx, / o : unscaled innovation gain */
		Word32 norm_gain_code_fx / o : norm. gain of the codebook excit. */
		);

		#endif
		void gain_dec_mless_fx(
		Decoder_State st_fx, / i/o: decoder state structure */
		const Word16 L_frame_fx, /* i : length of the frame */
		@@ -8784,12 +8787,14 @@ Word16 dlpc_avq_fx(
		Word32 sr_core );

		Word16 decode_lpc_avq_fx(
		#ifndef HARM_COREDECODER_FUNCTIONS
		Decoder_State st, / i/o: decoder state structure */
		const Word16 numlpc, /* i : Number of sets of lpc */
		Word16 param_lpc / o : lpc parameters */
		);

		Word16 decode_lpc_avq_ivas_fx(
		#endif
		Decoder_State st, / i/o: decoder state structure */
		const Word16 numlpc, /* i : Number of sets of lpc */
		Word16 param_lpc, / o : lpc parameters */
		@@ -10883,6 +10888,7 @@ void WriteToBitstream_fx(
		BSTR_ENC_HANDLE hBstr,
		Word16 *pnBits );

		#ifndef HARM_COREDECODER_FUNCTIONS
		void WriteToBitstream_ivas_fx(
		ParamsBitMap const *paramsBitMap,
		const Word16 nArrayLength,
		@@ -10890,7 +10896,7 @@ void WriteToBitstream_ivas_fx(
		Word16 *pnSize,
		BSTR_ENC_HANDLE hBstr,
		Word16 *pnBits );

		#endif

		/===========================================================================================/
		/----------------------------------------------------------------------------------