Commit 5e6b4954 authored Jan 20, 2026 by vaclav

Merge branch 'basop-2334-remove-duplication-of-coder_type_modif_fx' into 'main'

basop-2334-remove-duplication-of-coder_type_modif_fx

See merge request !2705

parents a50277a1 6bb39394

lib_com/options.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -105,6 +105,7 @@
		#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 */

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

lib_enc/ivas_cpe_enc_fx.c

+4 −0

Original line number	Diff line number	Diff line
		@@ -1133,7 +1133,11 @@ ivas_error ivas_cpe_enc_fx(
		IF( ( NE_16( hCPE->element_mode, IVAS_CPE_DFT ) && NE_16( hCPE->element_mode, IVAS_CPE_TD ) ) \|\| n == 0 ) /* modify coder_type of primary channel */
		{
		/* limit coder_type depending on the bitrate */
		#ifndef FIX_2334_HARM_CODER_MODIF
		coder_type_modif_ivas_fx( sts[n], relE_fx[n] );
		#else
		coder_type_modif_fx( sts[n], relE_fx[n] );
		#endif
		}
		}

lib_enc/ivas_ism_enc_fx.c

+4 −1

Original line number	Diff line number	Diff line
		@@ -453,8 +453,11 @@ ivas_error ivas_ism_enc_fx(
		}

		/* modify the coder_type depending on the total_brate per channel */
		#ifndef FIX_2334_HARM_CODER_MODIF
		coder_type_modif_ivas_fx( st, relE_fx[sce_id][0] );

		#else
		coder_type_modif_fx( st, relE_fx[sce_id][0] );
		#endif
		/----------------------------------------------------------------
		* Encoder
		----------------------------------------------------------------/

lib_enc/ivas_sce_enc_fx.c

+4 −1

Original line number	Diff line number	Diff line
		@@ -364,8 +364,11 @@ ivas_error ivas_sce_enc_fx(
		move16();

		/* modify the coder_type depending on the total_brate per channel */
		#ifndef FIX_2334_HARM_CODER_MODIF
		coder_type_modif_ivas_fx( st, relE_fx[0] );

		#else
		coder_type_modif_fx( st, relE_fx[0] );
		#endif
		/----------------------------------------------------------------
		* Encoder
		----------------------------------------------------------------/

lib_enc/prot_fx_enc.h

+2 −1

Original line number	Diff line number	Diff line
		@@ -1217,11 +1217,12 @@ void coder_type_modif_fx(
		const Word16 relE /* i : frame relative E to the long term average */
		);

		#ifndef FIX_2334_HARM_CODER_MODIF
		void coder_type_modif_ivas_fx(
		Encoder_State st, / i/o: encoder state structure */
		const Word16 relE /* i : frame relative E to the long term average */
		);

		#endif
		void speech_music_clas_init_fx(
		SP_MUS_CLAS_HANDLE hSpMusClas /* i/o: speech/music classifier handle */
		);