Merge branch 'main' into basop-2346-review-potentially-duplicated-igf-functions (21be129b) · Commits · SA4 / Audio / IVAS BASOP

CMakeLists.txt

+10 −3

Original line number	Diff line number	Diff line
		@@ -63,9 +63,16 @@ if(UNIX)
		# to be uncommented in CI
		# set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror")

		# don't override CMAKE_C_COMPILER if it's already set
		if(CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR AND NOT CMAKE_C_COMPILER)
		# set C compiler
		find_program(cc NAMES clang-18 clang REQUIRED)
		set(CMAKE_C_COMPILER "${cc}" CACHE STRING "")
		find_program(cc NAMES clang-18 clang)
		if(cc)
		set(CMAKE_C_COMPILER "${cc}" CACHE FILEPATH "")
		else()
		message(WARNING "clang compiler not found - falling back to system default")
		endif()
		endif()

		# CLANG
		if(CLANG)

+2 −0

Original line number	Diff line number	Diff line
		@@ -92,6 +92,8 @@
		#define NONBE_FIX_ISSUE_2206_AVOID_OVERFLOW_MSVQ_Interpol_Tran_fx /* FhG: Fix saturation crash in MSVQ_Interpol_Tran_fx() */
		#define NONBE_FIX_ISSUE_2206_SWB_EXPERIMENT_FIX_2527 /* Fix crash from issue #2527 */
		#define FIX_FLOAT_1539_G192_FORMAT_SWITCH /* VA/Nokia: reintroduce format switching for g192 bitstreams */
		#define HARMONIZE_2595_reconfig_decoder_LPD /* FhG: Harmonize reconfig_decoder_LPD with its ivas derivate */
		#define HARMONIZE_2596_SetModeIndex /* FhG: Harmonize SetModeIndex with its ivas derivate */
		#define FIX_2346_DUPLICATED_IGF_FUNCTIONS_3 /* FhG: part 3 of basop issue 2346: Remove duplicate reconfig function */

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

+15 −1

Original line number	Diff line number	Diff line
		@@ -7821,6 +7821,7 @@ Word16 RCcontextMapping_decode2_no_mem_s17_LCS_fx(
		CONTEXT_HM_CONFIG hm_cfg / i : context-based harmonic model configuration*/
		);

		#ifndef HARMONIZE_2595_reconfig_decoder_LPD
		void reconfig_decoder_LPD_fx(
		Decoder_State st, / i/o: decoder state structure */
		Word16 bits_frame, /* i : bit budget Q0*/
		@@ -7828,8 +7829,13 @@ void reconfig_decoder_LPD_fx(
		Word32 total_brate, /* i : total bitrate Q0*/
		Word16 L_frame_old /* i : frame length Q0*/
		);
		#endif

		#ifdef HARMONIZE_2595_reconfig_decoder_LPD
		void reconfig_decoder_LPD_fx(
		#else
		void reconfig_decoder_LPD_ivas_fx(
		#endif
		Decoder_State st, / i/o: decoder state structure */
		const Word16 bits_frame, /* i : bit budget Q0*/
		const Word16 bwidth, /* i : audio bandwidth Q0*/
		@@ -9541,11 +9547,19 @@ void core_coder_mode_switch_ivas_fx(
		);


		#ifdef HARMONIZE_2596_SetModeIndex
		void SetModeIndex_fx(
		#else
		void SetModeIndex_ivas_fx(
		#endif
		Encoder_State st, / i : Encoder state */
		const Word32 last_total_brate, /* i : last total bitrate Q0*/
		const Word16 last_element_mode, /* i : last IVAS element mode Q0*/
		const Word16 MCT_flag /* i : hMCT handle allocated (1) or not (0) Q0*/
		#ifdef HARMONIZE_2596_SetModeIndex
		,
		const Word16 shift
		#endif
		);

		void init_tcx_cfg_ivas_fx(

+10 −0

Original line number	Diff line number	Diff line
		@@ -10,7 +10,11 @@
		#include "rom_com.h"


		#ifdef HARMONIZE_2595_reconfig_decoder_LPD
		void reconfig_decoder_LPD_fx(
		#else
		void reconfig_decoder_LPD_ivas_fx(
		#endif
		Decoder_State st, / i/o: decoder state structure */
		const Word16 bits_frame, /* i : bit budget Q0*/
		const Word16 bwidth, /* i : audio bandwidth Q0*/
		@@ -168,6 +172,10 @@ void reconfig_decoder_LPD_ivas_fx(
		ELSE
		{
		set16_fx( st->mem_syn_clas_estim_fx, 0, L_SYN_MEM_CLAS_ESTIM ); /* Qx */
		#ifdef HARMONIZE_2595_reconfig_decoder_LPD
		st->classifier_Q_mem_syn = 0;
		move16();
		#endif
		}
		}
		}
		@@ -193,6 +201,7 @@ void reconfig_decoder_LPD_ivas_fx(
		return;
		}

		#ifndef HARMONIZE_2595_reconfig_decoder_LPD
		void reconfig_decoder_LPD_fx(
		Decoder_State st, / i/o: decoder state structure */
		Word16 bits_frame, /* i : bit budget Q0*/
		@@ -386,3 +395,4 @@ void reconfig_decoder_LPD_fx(

		return;
		}
		#endif

+4 −0

Original line number	Diff line number	Diff line
		@@ -383,7 +383,11 @@ void mode_switch_decoder_LPD_ivas_fx(

		frame_size = FrameSizeConfig[frame_size_index].frame_net_bits;
		move16();
		#ifdef HARMONIZE_2595_reconfig_decoder_LPD
		reconfig_decoder_LPD_fx( st, frame_size, bwidth, total_brate, st->last_L_frame );
		#else
		reconfig_decoder_LPD_ivas_fx( st, frame_size, bwidth, total_brate, st->last_L_frame );
		#endif

		test();
		IF( hTcxDec->envWeighted && !hTcxDec->enableTcxLpc )