Addition of compiler switch, code compiles and run, but not BE (1597e6dd) · Commits · SA4 / Audio / IVAS BASOP

lib_com/bitstream_fx.c

+3 −4

Original line number	Diff line number	Diff line
		@@ -244,7 +244,7 @@ Word16 rate2EVSmode(
		*
		* Push a new indice into the buffer
		-------------------------------------------------------------------/
		#if 0
		#ifndef HARM_PUSH_BIT
		void push_indice_fx(
		BSTR_ENC_HANDLE hBstr, /* i/o: encoder state structure */
		Word16 id, /* i : ID of the indice */
		@@ -565,8 +565,7 @@ void reset_indices_dec_fx(
		*
		* Write the buffer of indices to a file
		-------------------------------------------------------------------/
		#if 0

		#ifndef HARM_PUSH_BIT
		void write_indices_fx(
		Encoder_State st_fx, / i/o: encoder state structure */
		BSTR_ENC_HANDLE hBstr, /* i/o: encoder state structure */
		@@ -670,7 +669,7 @@ void write_indices_fx(
		*
		* Write the buffer of indices to a file
		-------------------------------------------------------------------/
		#if 0
		#ifndef HARM_PUSH_BIT
		void write_indices_buf_fx(
		Encoder_State st_fx, / i/o: encoder state structure */
		BSTR_ENC_HANDLE hBstr, /* i/o: encoder state structure */

lib_com/options.h

+2 −0

Original line number	Diff line number	Diff line
		@@ -75,4 +75,6 @@
		/* Both following 2 macros (IMPROVE_HIGH_COMPLEXITY_PARAM_MC_PRM_EST) are independent from each other, they refer to different code blocks /
		#define IMPROVE_HIGH_COMPLEXITY_PARAM_MC_PRM_EST_BE /* FhG: reduces WMOPS of param_mc_prm_est, bit-exact to previous version */
		#define IMPROVE_HIGH_COMPLEXITY_PARAM_MC_PRM_EST_NONBE /* FhG: reduces WMOPS of param_mc_prm_est, not bit-exact to previous version */
		#define HARM_PUSH_BIT
		#define HARM_ENC_INIT
		#endif

lib_enc/igf_enc.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -2429,7 +2429,7 @@ void IGFEncSetMode_ivas_fx(
		*
		* IGF bitstream concatenation for TCX10 modes
		-------------------------------------------------------------------/
		#if 0 /* Float code */
		#ifndef HARM_PUSH_BIT /* Float code */
		void IGFEncConcatenateBitstream(
		const IGF_ENC_INSTANCE_HANDLE hIGFEnc, /* i : instance handle of IGF Encoder */
		const Word16 bsBits, /* i : number of IGF bits written to list of indices */

lib_enc/igf_enc_fx.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1449,7 +1449,7 @@ hBstr->nb_bits_tot = sub( hBstr->nb_bits_tot, nb_bits_written );

		return;
		}
		#if 0 /* old bitstream */
		#ifndef HARM_PUSH_BIT /* old bitstream */
		/*********************************************************************/ /
		IGF bitsream concatenation for TCX10 modes
		**************************************************************************/

lib_enc/init_enc_fx.c

+36 −12

Original line number	Diff line number	Diff line
		@@ -20,6 +20,7 @@
		*
		* Initialization of state variables
		-----------------------------------------------------------------------/
		#if 1
		ivas_error init_encoder_fx(
		Encoder_State st_fx / i/o: Encoder static variables structure */
		)
		@@ -946,6 +947,7 @@ ivas_error init_encoder_fx(
		move32();
		return error;
		}
		#endif
		/-----------------------------------------------------------------------
		* LPDmem_enc_init_fx()
		*
		@@ -1498,14 +1500,7 @@ ivas_error init_encoder_ivas_fx(
		IF( st->element_mode == EVS_MONO )
		{
		/* This is done to as in EVS T_CldfbVadState structure is present in Encoder State */
		/*
		if ( ( st->hVAD_CLDFB = (VAD_CLDFB_HANDLE) malloc( sizeof( T_CldfbVadState ) ) ) == NULL )
		{
		return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for CLDFB VAD\n" ) );
		}
		*/
		st->hVAD_CLDFB = &st->vad_st;

		vad_init_fx( st->hVAD_CLDFB );
		}
		ELSE
		@@ -1670,11 +1665,25 @@ ivas_error init_encoder_ivas_fx(
		test();
		IF( ( NE_16( st->element_mode, IVAS_CPE_MDCT ) && idchan == 0 ) \|\| ( EQ_16( st->element_mode, IVAS_CPE_MDCT ) && st->Opt_DTX_ON ) )
		{
		IF( EQ_16( st->element_mode, EVS_MONO ) )
		{
		/* open analysis for input SR */
		st->input_frame_fx = extract_l( Mult_32_16( st->input_Fs, 0x0290 ) );

		if ( ( error = openCldfb( &st->cldfbAnaEnc, CLDFB_ANALYSIS, CLDFB_getNumChannels( st->input_Fs ), st->input_frame_fx ) ) != IVAS_ERR_OK )
		{
		return error;
		}
		}
		ELSE
		{

		IF( ( error = openCldfb_ivas_fx( &st->cldfbAnaEnc, CLDFB_ANALYSIS, st->input_Fs, CLDFB_PROTOTYPE_1_25MS, ENC ) ) != IVAS_ERR_OK )
		{
		return error;
		}
		}
		}
		ELSE
		{
		st->cldfbAnaEnc = NULL;
		@@ -1784,11 +1793,20 @@ ivas_error init_encoder_ivas_fx(
		return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for TD BWE\n" ) );
		}

		IF( st->element_mode == EVS_MONO )
		{
		if ( ( error = openCldfb( &st->cldfbSynTd, CLDFB_SYNTHESIS, CLDFB_getNumChannels( 16000 ), L_FRAME16k ) ) != IVAS_ERR_OK )
		{
		return error;
		}
		}
		ELSE
		{
		IF( ( error = openCldfb_ivas_fx( &st->cldfbSynTd, CLDFB_SYNTHESIS, 16000, CLDFB_PROTOTYPE_1_25MS, ENC ) ) != IVAS_ERR_OK )
		{
		return error;
		}

		}
		InitSWBencBuffer_ivas_fx( st );
		ResetSHBbuffer_Enc_fx( st );
		}
		@@ -2144,7 +2162,13 @@ ivas_error init_encoder_ivas_fx(
		}
		ELSE
		{
		#ifndef HARM_ENC_INIT
		InitTransientDetection_ivas_fx( frame_length, NS2SA_FX2( st->input_Fs, DELAY_FIR_RESAMPL_NS ), st->hTranDet, 0 );
		#else
		InitTransientDetection_fx( extract_l( Mult_32_16( st->input_Fs, 0x0290 ) ),
		NS2SA_FX2( st->input_Fs, DELAY_FIR_RESAMPL_NS ),
		&st->transientDetection );
		#endif
		}

		/-----------------------------------------------------------------