MR 2388, also harmonizing InitTnsConfigs(), using suffix _fx instead of _ivas_fx (17ebdc5c) · Commits · SA4 / Audio / IVAS BASOP

lib_com/core_com_config_fx.c

+8 −1

Original line number	Diff line number	Diff line
		@@ -997,8 +997,11 @@ void init_tcx_cfg_ivas_fx(

		IF( hTcxCfg->fIsTNSAllowed )
		{
		#ifdef FIX_2388_INITTNSCONFIGURATION
		InitTnsConfigs_fx( bwidth, hTcxCfg->tcx_coded_lines, hTcxCfg->tnsConfig, infoIGFStopFreq, total_brate, element_mode, MCT_flag );
		#else
		InitTnsConfigs_ivas_fx( bwidth, hTcxCfg->tcx_coded_lines, hTcxCfg->tnsConfig, infoIGFStopFreq, total_brate, element_mode, MCT_flag );

		#endif
		SetAllowTnsOnWhite( hTcxCfg->tnsConfig, (Word8) EQ_16( element_mode, IVAS_CPE_MDCT ) );
		}

		@@ -1253,7 +1256,11 @@ void init_tcx_cfg_fx(

		IF( hTcxCfg->fIsTNSAllowed )
		{
		#ifdef FIX_2388_INITTNSCONFIGURATION
		InitTnsConfigs_fx( bwidth, hTcxCfg->tcx_coded_lines, hTcxCfg->tnsConfig, infoIGFStopFreq, total_brate, element_mode, MCT_flag );
		#else
		InitTnsConfigs( bwidth, hTcxCfg->tcx_coded_lines, hTcxCfg->tnsConfig, infoIGFStopFreq, total_brate, element_mode, MCT_flag );
		#endif

		SetAllowTnsOnWhite( hTcxCfg->tnsConfig, (Word8) EQ_16( element_mode, IVAS_CPE_MDCT ) );
		}

lib_com/prot_fx.h

+12 −1

Original line number	Diff line number	Diff line
		@@ -3580,7 +3580,11 @@ void InitTnsConfiguration(
		const Word16 is_mct );
		#endif

		#ifdef FIX_2388_INITTNSCONFIGURATION
		void InitTnsConfiguration_fx(
		#else
		void InitTnsConfiguration_ivas_fx(
		#endif
		const Word16 bwidth,
		const Word16 frameLength,
		STnsConfig *pTnsConfig,
		@@ -4225,6 +4229,7 @@ void tcx_noise_filling_with_shift(
		const Word16 element_mode /* i : IVAS element mode */
		);

		#ifndef FIX_2388_INITTNSCONFIGURATION
		void InitTnsConfigs(
		const Word16 bwidth,
		const Word16 L_frame,
		@@ -4233,8 +4238,14 @@ void InitTnsConfigs(
		const Word32 total_brate,
		const Word16 element_mode,
		const Word16 is_mct );
		#endif

		void InitTnsConfigs_ivas_fx(
		#ifdef FIX_2388_INITTNSCONFIGURATION
		void InitTnsConfigs_fx
		#else
		void InitTnsConfigs_ivas_fx
		#endif
		(
		const Word16 bwidth,
		const Word16 L_frame,
		STnsConfig tnsConfig[2][2],

lib_com/tcx_utils_fx.c

+18 −11

Original line number	Diff line number	Diff line
		@@ -1969,10 +1969,11 @@ void tcx_noise_filling_with_shift(


		/*---------------------------------------------------------------
		* ()
		* InitTnsConfigs()
		--------------------------------------------------------------/


		#ifndef FIX_2388_INITTNSCONFIGURATION
		void InitTnsConfigs(
		const Word16 bwidth, /Q0/
		const Word16 L_frame, /Q0/
		@@ -1984,22 +1985,19 @@ void InitTnsConfigs(
		{
		IF( GT_32( total_brate, ACELP_32k ) )
		{
		#ifdef FIX_2388_INITTNSCONFIGURATION
		InitTnsConfiguration_ivas_fx( bwidth, shr( L_frame, 1 ), &tnsConfig[0][0], igfStopFreq, total_brate, element_mode, MCT_flag );
		#else
		InitTnsConfiguration( bwidth, shr( L_frame, 1 ), &tnsConfig[0][0], igfStopFreq, total_brate, element_mode, MCT_flag );
		#endif
		}
		#ifdef FIX_2388_INITTNSCONFIGURATION
		InitTnsConfiguration_ivas_fx( bwidth, L_frame, &tnsConfig[1][0], igfStopFreq, total_brate, element_mode, MCT_flag );
		InitTnsConfiguration_ivas_fx( bwidth, add( L_frame, shr( L_frame, 2 ) ), &tnsConfig[1][1], igfStopFreq, total_brate, element_mode, MCT_flag );
		#else
		InitTnsConfiguration( bwidth, L_frame, &tnsConfig[1][0], igfStopFreq, total_brate, element_mode, MCT_flag );
		InitTnsConfiguration( bwidth, add( L_frame, shr( L_frame, 2 ) ), &tnsConfig[1][1], igfStopFreq, total_brate, element_mode, MCT_flag );
		#endif
		}
		#endif

		void InitTnsConfigs_ivas_fx(
		#ifdef FIX_2388_INITTNSCONFIGURATION
		void InitTnsConfigs_fx
		#else
		void InitTnsConfigs_ivas_fx
		#endif
		(
		const Word16 bwidth, /Q0/
		const Word16 L_frame, /Q0/
		STnsConfig tnsConfig[2][2],
		@@ -2010,10 +2008,19 @@ void InitTnsConfigs_ivas_fx(
		{
		IF( GT_32( total_brate, ACELP_32k ) )
		{
		#ifdef FIX_2388_INITTNSCONFIGURATION
		InitTnsConfiguration_fx( bwidth, shr( L_frame, 1 ), &tnsConfig[0][0], igfStopFreq, total_brate, element_mode, MCT_flag );
		#else
		InitTnsConfiguration_ivas_fx( bwidth, shr( L_frame, 1 ), &tnsConfig[0][0], igfStopFreq, total_brate, element_mode, MCT_flag );
		#endif
		}
		#ifdef FIX_2388_INITTNSCONFIGURATION
		InitTnsConfiguration_fx( bwidth, L_frame, &tnsConfig[1][0], igfStopFreq, total_brate, element_mode, MCT_flag );
		InitTnsConfiguration_fx( bwidth, add( L_frame, shr( L_frame, 2 ) ), &tnsConfig[1][1], igfStopFreq, total_brate, element_mode, MCT_flag );
		#else
		InitTnsConfiguration_ivas_fx( bwidth, L_frame, &tnsConfig[1][0], igfStopFreq, total_brate, element_mode, MCT_flag );
		InitTnsConfiguration_ivas_fx( bwidth, add( L_frame, shr( L_frame, 2 ) ), &tnsConfig[1][1], igfStopFreq, total_brate, element_mode, MCT_flag );
		#endif
		}

		void SetTnsConfig(

lib_com/tns_base.c

+6 −1

Original line number	Diff line number	Diff line
		@@ -199,7 +199,12 @@ void InitTnsConfiguration(
		}
		#endif /* FIX_2388_INITTNSCONFIGURATION */

		void InitTnsConfiguration_ivas_fx(
		#ifdef FIX_2388_INITTNSCONFIGURATION
		void InitTnsConfiguration_fx
		#else
		void InitTnsConfiguration_ivas_fx
		#endif /* FIX_2388_INITTNSCONFIGURATION */
		(
		const Word16 bwidth, /Q0/
		const Word16 frameLength, /Q0/
		STnsConfig *pTnsConfig,

lib_dec/core_dec_init_fx.c

+4 −0

Original line number	Diff line number	Diff line
		@@ -240,7 +240,11 @@ void open_decoder_LPD_fx(

		IF( st->hTcxCfg->fIsTNSAllowed != 0 )
		{
		#ifdef FIX_2388_INITTNSCONFIGURATION
		InitTnsConfigs_fx( st->bwidth, st->hTcxCfg->tcx_coded_lines, st->hTcxCfg->tnsConfig, st->hIGFDec->infoIGFStopFreq, st->total_brate, st->element_mode, 0 /is_mct/ );
		#else
		InitTnsConfigs( st->bwidth, st->hTcxCfg->tcx_coded_lines, st->hTcxCfg->tnsConfig, st->hIGFDec->infoIGFStopFreq, st->total_brate, st->element_mode, 0 /is_mct/ );
		#endif
		}
		/Constraint for adaptive BPF, otherwise parameter estimation and post-processing not time aligned/
		if ( st->tcxonly == 0 )