Merge branch '2431-use-of-calloc-in-basop' into 2424-remove-duplicated-code-gauss_l2_ivas_fx (7537a33f) · Commits · SA4 / Audio / IVAS BASOP

lib_com/ACcontextMapping_fx.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -57,7 +57,7 @@ Word16 get_next_coeff_unmapped(
		return *idx;
		}

		Word16 update_mixed_context(
		Word16 update_mixed_context_fx(
		Word16 ctx, /* Q0 */
		Word16 a /* Q0 */
		)
		@@ -78,7 +78,7 @@ Word16 update_mixed_context(
		return add( shl( s_and( ctx, 0xf ), 4 ), add( t, 13 ) );
		}

		Word32 update_mixed_context_ivas_fx(
		Word32 update_mixed_context_fx_32(
		Word32 ctx, /* Q0 */
		Word16 a /* Q0 */
		)

lib_com/cldfb_evs_fx.c

+10 −0

Original line number	Diff line number	Diff line
		@@ -1598,17 +1598,27 @@ ivas_error cldfb_save_memory(
		}
		hs->memory_length = cldfb_get_memory_length( hs );
		move16();
		#ifdef FIX_2431_AVOID_CALLOC
		hs->memory = (Word16 ) malloc( ( hs->memory_length + CLDFB_MEM_EXPONENTS + 1 ) sizeof( Word16 ) );
		IF( hs->memory == NULL )
		{
		return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for CLDFB\n" );
		}
		#else
		hs->memory = (Word16 *) calloc( hs->memory_length + CLDFB_MEM_EXPONENTS + 1, sizeof( Word16 ) );
		#endif

		/* save the memory */
		Copy( hs->FilterStates, hs->memory, hs->memory_length );
		Copy( hs->FilterStates_e, hs->memory + hs->memory_length, CLDFB_MEM_EXPONENTS );
		hs->memory[hs->memory_length + CLDFB_MEM_EXPONENTS] = hs->FilterStates_eg;
		move16();
		#ifndef FIX_2431_AVOID_CALLOC
		IF( hs->memory == NULL )
		{
		return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for CLDFB\n" );
		}
		#endif

		return IVAS_ERR_OK;
		}

lib_com/cng_exc_fx.c

+8 −0

Original line number	Diff line number	Diff line
		@@ -306,7 +306,11 @@ IF( NE_16( Opt_AMR_WB, 1 ) )

		IF( EQ_16( L_frame, L_FRAME16k ) )
		{
		#ifndef FIX_2410_HARM_MODIF_FS
		modify_Fs_fx( fft_io, L_FRAME16k, 16000, fft_io, 12800, exc_mem1, 0 );
		#else
		modify_Fs_fx( fft_io, L_FRAME16k, 16000, fft_io, 12800, exc_mem1, 0, NULL, NULL );
		#endif
		}

		/* fft_rel(fft_io, L_FFT, LOG2_L_FFT); */
		@@ -419,7 +423,11 @@ IF( NE_16( Opt_AMR_WB, 1 ) )

		IF( EQ_16( L_frame, L_FRAME16k ) )
		{
		#ifndef FIX_2410_HARM_MODIF_FS
		modify_Fs_fx( fft_io, L_FFT, 12800, fft_io, 16000, exc_mem, 0 );
		#else
		modify_Fs_fx( fft_io, L_FFT, 12800, fft_io, 16000, exc_mem, 0, NULL, NULL );
		#endif
		}

		/* enr1 = dotp( fft_io, fft_io, L_frame ) / L_frame; */

lib_com/core_com_config_fx.c

+70 −8

Original line number	Diff line number	Diff line
		@@ -169,7 +169,74 @@ Word16 get_codec_mode(
		return codec_mode; /Q0/
		}

		#ifdef FIX_2385_GETTCXONLY
		/-------------------------------------------------------------------
		* getTcxonly()
		*
		*
		-------------------------------------------------------------------/

		Word16 getTcxonly_fx(
		const Word16 element_mode, /* i : IVAS element mode Q0*/
		const Word32 total_brate, /* i : total bitrate Q0*/
		const Word16 MCT_flag, /* i : hMCT handle allocated (1) or not (0) Q0*/
		const Word16 is_ism_format /* i : flag indicating ISM format Q0*/
		)
		{
		Word16 tcxonly = 0;
		move16();
		Word32 temp_flag;

		SWITCH( element_mode )
		{
		case EVS_MONO:
		if ( GT_32( total_brate, ACELP_32k ) )
		{
		tcxonly = 1;
		move16();
		}
		BREAK;
		case IVAS_SCE:
		temp_flag = MAX_ACELP_BRATE;
		move32();
		if ( is_ism_format )
		{
		temp_flag = MAX_ACELP_BRATE_ISM;
		move32();
		}
		if ( GT_32( total_brate, temp_flag ) )
		{
		tcxonly = 1;
		move16();
		}
		BREAK;
		case IVAS_CPE_DFT:
		case IVAS_CPE_TD:
		if ( GT_32( total_brate, MAX_ACELP_BRATE ) )
		{
		tcxonly = 1;
		move16();
		}
		BREAK;
		case IVAS_CPE_MDCT:
		temp_flag = IVAS_48k;
		move32();
		if ( MCT_flag )
		{
		temp_flag = IVAS_32k;
		move32();
		}
		if ( GE_32( total_brate, temp_flag ) )
		{
		tcxonly = 1;
		move16();
		}
		BREAK;
		}

		return tcxonly; /Q0/
		}
		#else
		/-------------------------------------------------------------------
		* getTcxonly_ivas()
		*
		@@ -244,6 +311,8 @@ Word16 getTcxonly_ivas_fx(

		return tcxonly; /Q0/
		}
		#endif /* FIX_2385_GETTCXONLY */
		#ifndef FIX_2385_GETTCXONLY

		Word16 getTcxonly(
		const Word32 total_brate /* i : total bitrate */
		@@ -331,6 +400,7 @@ Word16 getTcxonly_fx(

		return tcxonly; /Q0/
		}
		#endif /* FIX_2385_GETTCXONLY */

		/-------------------------------------------------------------------
		* getCtxHm()
		@@ -997,11 +1067,7 @@ 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 ) );
		}

		@@ -1256,11 +1322,7 @@ 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/fd_cng_com_fx.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -2995,7 +2995,7 @@ void lpc_from_spectrum(

		/* LPC */

		E_LPC_lev_dur( r_h, r_l, A, NULL, lpcorder, NULL );
		E_LPC_lev_dur_fx( r_h, r_l, A, NULL, lpcorder, NULL );
		}

		/*