remove create_evs_sce_enc_fx() (1859de27) · Commits · SA4 / Audio / IVAS BASOP

lib_com/ivas_prot_fx.h

+1 −12

Original line number	Diff line number	Diff line
		@@ -60,15 +60,8 @@ void ivas_masa_dec_close_fx(
		MASA_DECODER_HANDLE hMasa / i/o: MASA metadata structure */
		);

		ivas_error create_evs_sce_enc_fx(
		Encoder_Struct st_ivas, / i/o: IVAS encoder structure */
		const Word16 sce_id, /* i : SCE # identifier */
		const Word32 element_brate /* i : element bitrate */
		);

		void destroy_sce_enc_fx(
		SCE_ENC_HANDLE hSCE, /* i/o: SCE encoder structure */
		Flag is_evs /* i : Flag to indicate EVS encoder */
		SCE_ENC_HANDLE hSCE /* i/o: SCE encoder structure */
		);

		void generate_gridEq_fx(
		@@ -807,10 +800,6 @@ void destroy_core_enc_fx(
		ENC_CORE_HANDLE hCoreCoder /* i/o: core encoder structure */
		);

		void destroy_evs_core_enc_fx(
		ENC_CORE_HANDLE hCoreCoder /* i/o: core encoder structure */
		);

		ivas_error ivas_sce_dec_fx(
		Decoder_Struct st_ivas, / i/o: IVAS decoder structure */
		const Word16 sce_id, /* i : SCE # identifier */

lib_dec/init_dec_fx.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -358,6 +358,7 @@ ivas_error init_decoder_fx(
		/-----------------------------------------------------------------
		* LD music post-filter
		-----------------------------------------------------------------/

		test();
		test();
		IF( ( idchan == 0 && NE_16( st_fx->element_mode, IVAS_CPE_MDCT ) ) \|\| EQ_16( st_fx->element_mode, IVAS_CPE_TD ) )

lib_enc/init_enc_fx.c

+4 −4

Original line number	Diff line number	Diff line
		@@ -886,6 +886,7 @@ ivas_error init_encoder_fx(
		InitTransientDetection_fx( extract_l( Mult_32_16( st_fx->input_Fs, 0x0290 ) ),
		NS2SA_FX2( st_fx->input_Fs, DELAY_FIR_RESAMPL_NS ),
		&st_fx->transientDetection );
		st_fx->hTranDet = NULL;

		st_fx->Q_syn2 = 0;
		move16();
		@@ -2124,9 +2125,8 @@ ivas_error init_encoder_ivas_fx(
		{
		return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Transient Detection\n" ) );
		}
		Word16 temp;
		Word16 frame_length = BASOP_Util_Divide3232_Scale( st->input_Fs, FRAMES_PER_SEC, &temp );
		frame_length = shr( frame_length, sub( 15, temp ) );

		Word16 frame_length = extract_l( Mult_32_16( st->input_Fs, 0x0290 ) );

		IF( GT_16( st->element_mode, EVS_MONO ) )
		{
		@@ -2134,7 +2134,7 @@ ivas_error init_encoder_ivas_fx(
		}
		ELSE
		{
		InitTransientDetection_fx( extract_l( Mult_32_16( st->input_Fs, 0x0290 ) ),
		InitTransientDetection_fx( frame_length,
		NS2SA_FX2( st->input_Fs, DELAY_FIR_RESAMPL_NS ),
		&st->transientDetection );
		}

lib_enc/ivas_corecoder_enc_reconfig_fx.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -372,7 +372,7 @@ ivas_error ivas_corecoder_enc_reconfig_fx(
		q_input_buff[sce_id] = st_ivas->hSCE[sce_id]->hCoreCoder[0]->q_old_inp32;
		move16();
		}
		destroy_sce_enc_fx( st_ivas->hSCE[sce_id], ( EQ_16( st_ivas->hEncoderConfig->element_mode_init, EVS_MONO ) && !st_ivas->hEncoderConfig->stereo_dmx_evs ) );
		destroy_sce_enc_fx( st_ivas->hSCE[sce_id] );
		st_ivas->hSCE[sce_id] = NULL;
		}

lib_enc/ivas_init_enc_fx.c

+8 −20

Original line number	Diff line number	Diff line
		@@ -421,6 +421,7 @@ void ivas_initialize_handles_enc_fx(
		*
		* Initialize IVAS encoder state structure
		-------------------------------------------------------------------/

		ivas_error ivas_init_encoder_fx(
		Encoder_Struct st_ivas / i/o: IVAS encoder structure */
		)
		@@ -565,11 +566,13 @@ ivas_error ivas_init_encoder_fx(
		move16();
		sce_id = 0;
		move16();

		test();
		IF( NE_32( ( error = create_evs_sce_enc_fx( st_ivas, sce_id, ivas_total_brate ) ), IVAS_ERR_OK ) )
		IF( NE_32( ( error = create_sce_enc_fx( st_ivas, sce_id, ivas_total_brate ) ), IVAS_ERR_OK ) )
		{
		return error;
		}

		/* prepare stereo downmix for EVS */
		IF( EQ_16( hEncoderConfig->stereo_dmx_evs, 1 ) )
		{
		@@ -1034,6 +1037,8 @@ ivas_error ivas_init_encoder_fx(

		return error;
		}


		/*-------------------------------------------------------------------------
		* destroy_core_enc()
		*
		@@ -1044,8 +1049,6 @@ void destroy_core_enc_fx(
		ENC_CORE_HANDLE hCoreCoder /* i/o: core encoder structure */
		)
		{
		Word16 i;

		destroy_cldfb_encoder_fx( hCoreCoder );

		IF( hCoreCoder->hSignalBuf != NULL )
		@@ -1056,12 +1059,6 @@ void destroy_core_enc_fx(

		IF( hCoreCoder->hBstr != NULL )
		{
		/* reset buffer of indices */
		FOR( i = 0; i < hCoreCoder->hBstr->nb_ind_tot; i++ )
		{
		hCoreCoder->hBstr->ind_list[i].nb_bits = -1;
		move16();
		}
		free( hCoreCoder->hBstr );
		hCoreCoder->hBstr = NULL;
		}
		@@ -1092,8 +1089,7 @@ void destroy_core_enc_fx(

		IF( hCoreCoder->hVAD_CLDFB != NULL )
		{
		/* This is not required as we are not allocating memory dynamically */
		// free( hCoreCoder->hVAD_CLDFB );
		free( hCoreCoder->hVAD_CLDFB );
		hCoreCoder->hVAD_CLDFB = NULL;
		}

		@@ -1198,14 +1194,6 @@ void destroy_evs_core_enc_fx(
		{
		Word16 i;

		destroy_cldfb_encoder_fx( hCoreCoder );

		IF( hCoreCoder->hSignalBuf != NULL )
		{
		free( hCoreCoder->hSignalBuf );
		hCoreCoder->hSignalBuf = NULL;
		}

		IF( hCoreCoder->hBstr != NULL )
		{
		/* reset buffer of indices */
		@@ -1364,7 +1352,7 @@ void ivas_destroy_enc_fx(
		{
		if ( st_ivas->hSCE[i] != NULL )
		{
		destroy_sce_enc_fx( st_ivas->hSCE[i], EQ_16( st_ivas->hEncoderConfig->element_mode_init, EVS_MONO ) );
		destroy_sce_enc_fx( st_ivas->hSCE[i] );
		st_ivas->hSCE[i] = NULL;
		}
		}