fix build (9f78f55e) · Commits · SA4 / Audio / IVAS BASOP

lib_com/ivas_prot_fx.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -6005,7 +6005,7 @@ ivas_error pre_proc_front_ivas_fx(
		const Word16 lf_E_LR_fx_q, /* i : Q factor of per bin spectrum energy in lf, LR channels */
		const Word16 localVAD_HE_SAD_LR[], /* i : HE-SAD flag without hangover, LR channels Q0*/
		Word32 band_energies_LR_fx[2 * NB_BANDS], /* o : energy in critical bands without minimum noise floor E_MIN band_energies_LR_fx_q*/
		const Word16 band_energies_LR_fx_q, /* o : Q facttors of energy in critical bands without minimum noise floor */
		const Word16 band_energies_LR_fx_q, /* o : Q factors of energy in critical bands without minimum noise floor */
		const Word16 flag_16k_smc, /* i : flag to indicate if the OL SMC is run at 16 kHz Q0*/
		const Word16 front_vad_flag, /* i : front-VAD flag to overwrite VAD decision Q0*/
		const Word16 force_front_vad, /* i : flag to force VAD decision Q0*/

lib_enc/ivas_core_pre_proc_front_fx.c

+1 −5

Original line number	Diff line number	Diff line
		@@ -120,7 +120,7 @@ ivas_error pre_proc_front_ivas_fx(
		const Word16 lf_E_LR_fx_q, /* i : Q factor of per bin spectrum energy in lf, LR channels */
		const Word16 localVAD_HE_SAD_LR[], /* i : HE-SAD flag without hangover, LR channels Q0*/
		Word32 band_energies_LR_fx[2 * NB_BANDS], /* o : energy in critical bands without minimum noise floor E_MIN band_energies_LR_fx_q*/
		const Word16 band_energies_LR_fx_q, /* o : Q facttors of energy in critical bands without minimum noise floor */
		const Word16 band_energies_LR_fx_q, /* o : Q factors of energy in critical bands without minimum noise floor */
		const Word16 flag_16k_smc, /* i : flag to indicate if the OL SMC is run at 16 kHz Q0*/
		const Word16 front_vad_flag, /* i : front-VAD flag to overwrite VAD decision Q0*/
		const Word16 force_front_vad, /* i : flag to force VAD decision Q0*/
		@@ -208,10 +208,6 @@ ivas_error pre_proc_front_ivas_fx(
		Word16 Qfact_PS, q_lf_E_fx;
		Word16 enerBuffer_fx_exp_buf[CLDFB_NO_CHANNELS_MAX];
		Word32 bckr_temp[NB_BANDS];
		#ifdef DEBUG_MODE_INFO
		Word32 *in_buff_temp;
		Word16 in_q_temp;
		#endif
		#ifndef HARM_PREPROC
		mem_decim_dummy_fx = (Word16 ) malloc( 90 sizeof( Word16 * ) );
		temp1F_icatdmResampBuf_fx = (Word16 ) malloc( 45 sizeof( Word16 * ) );

lib_enc/ivas_cpe_enc_fx.c

+3 −8

Original line number	Diff line number	Diff line
		@@ -923,18 +923,13 @@ ivas_error ivas_cpe_enc_fx(
		&ener_fx[n], &relE_fx[n], A_fx[n], Aw_fx[n], epsP_fx[n], &epsP_fx_q[n], lsp_new_fx[n], lsp_mid_fx[n], &vad_hover_flag[n], &attack_flag[n],
		realBuffer_fx[n], imagBuffer_fx[n], &q_re_im_buf[n], old_wsp_fx[n], &q_old_wsp, pitch_fr_fx[n], voicing_fr_fx[n], &loc_harm[n], &cor_map_sum_fx[n], &vad_flag_dtx[n], enerBuffer_fx[n], &enerBuffer_fx_exp[n],
		fft_buff_fx[n], &fft_buff_fx_q[n], A_fx[0], lsp_new_fx[0], currFlatness_fx[n], tdm_ratio_idx, fr_bands_fx, q_fr_bands, Etot_LR_fx, lf_E_fx, q_lf_E[n], localVAD_HE_SAD,
		band_energies_LR_fx, q_band_energies_LR, 0, front_vad_flag, 0, 0, ivas_format, st_ivas->hMCT != NULL, st_ivas->hEncoderConfig->last_ivas_total_brate, ivas_total_brate, &Q_new[n]
		#ifdef DEBUG_MODE_INFO
		,
		( st_ivas->nSCE + ( cpe_id * CPE_CHANNELS ) + n )
		#endif
		);
		e_old_wsp[n] = sub( Q15, q_old_wsp );
		move16();
		band_energies_LR_fx, q_band_energies_LR, 0, front_vad_flag, 0, 0, ivas_format, st_ivas->hMCT != NULL, st_ivas->hEncoderConfig->last_ivas_total_brate, ivas_total_brate, &Q_new[n] );
		IF( error != IVAS_ERR_OK )
		{
		return error;
		}
		e_old_wsp[n] = sub( Q15, q_old_wsp );
		move16();
		}

		/making Q common/

lib_enc/ivas_ism_enc_fx.c

+3 −8

Original line number	Diff line number	Diff line
		@@ -252,18 +252,13 @@ ivas_error ivas_ism_enc_fx(
		error = pre_proc_front_ivas_fx( hSCE, NULL, hSCE->element_brate, nb_bits_metadata[sce_id], input_frame, 0, old_inp_12k8_fx[sce_id][0], old_inp_16k_fx[sce_id][0],
		&ener_fx[sce_id][0], &relE_fx[sce_id][0], A_fx[sce_id][0], Aw_fx[sce_id][0], epsP_fx[sce_id][0], &epsP_fx_q[sce_id][0], lsp_new_fx[sce_id][0], lsp_mid_fx[sce_id][0], &vad_hover_flag[sce_id][0], &attack_flag[sce_id][0],
		realBuffer_fx[sce_id][0], imagBuffer_fx[sce_id][0], &q_re_im_buf[sce_id], old_wsp_fx[sce_id][0], &q_old_wsp, pitch_fr_fx[sce_id][0], voicing_fr_fx[sce_id][0], &loc_harm[sce_id][0], &cor_map_sum_fx[sce_id][0], &vad_flag_dtx[sce_id][0], enerBuffer_fx[sce_id][0], &enerBuffer_fx_exp[sce_id][0],
		fft_buff_fx[sce_id][0], &fft_buff_fx_q[sce_id][0], A_fx[sce_id][0], lsp_new_fx[sce_id][0], currFlatness_fx[0], 0, fr_bands_fx, q_fr_bands, Etot_LR_fx, lf_E_fx, 31, localVAD_HE_SAD, NULL, 31, 0, 0, 0, 0, ISM_FORMAT, 0, st_ivas->hEncoderConfig->last_ivas_total_brate, st_ivas->hEncoderConfig->ivas_total_brate, &Q_new[sce_id][0]
		#ifdef DEBUG_MODE_INFO
		,
		st->id_element
		#endif
		);
		e_old_wsp[sce_id][0] = sub( Q15, q_old_wsp );
		move16();
		fft_buff_fx[sce_id][0], &fft_buff_fx_q[sce_id][0], A_fx[sce_id][0], lsp_new_fx[sce_id][0], currFlatness_fx[0], 0, fr_bands_fx, q_fr_bands, Etot_LR_fx, lf_E_fx, 31, localVAD_HE_SAD, NULL, 31, 0, 0, 0, 0, ISM_FORMAT, 0, st_ivas->hEncoderConfig->last_ivas_total_brate, st_ivas->hEncoderConfig->ivas_total_brate, &Q_new[sce_id][0] );
		IF( error != IVAS_ERR_OK )
		{
		return error;
		}
		e_old_wsp[sce_id][0] = sub( Q15, q_old_wsp );
		move16();

		IF( st_ivas->hEncoderConfig->Opt_DTX_ON )
		{

lib_enc/ivas_sce_enc_fx.c

+4 −8

Original line number	Diff line number	Diff line
		@@ -245,6 +245,7 @@ ivas_error ivas_sce_enc_fx(
		/----------------------------------------------------------------
		* Front Pre-processing
		----------------------------------------------------------------/

		set16_fx( old_wsp_fx[0], 0, L_WSP );
		q_old_wsp = Q15;
		move16();
		@@ -254,18 +255,13 @@ ivas_error ivas_sce_enc_fx(
		&ener_fx[0], &relE_fx[0], A_fx[0], Aw_fx[0], epsP_fx[0], &epsP_fx_q[0], lsp_new_fx[0], lsp_mid_fx[0], &vad_hover_flag[0], &attack_flag[0],
		realBuffer_fx[0], imagBuffer_fx[0], &q_re_im_buf, old_wsp_fx[0], &q_old_wsp, pitch_fr_fx[0], voicing_fr_fx[0], &loc_harm[0], &cor_map_sum_fx[0], &vad_flag_dtx[0], enerBuffer_fx[0], &enerBuffer_fx_exp[0],
		fft_buff_fx[0], &fft_buff_fx_q[0], A_fx[0], lsp_new_fx[0], currFlatness_fx[0], 0, fr_bands_fx, q_fr_bands, Etot_LR_fx, lf_E_fx, 31, localVAD_HE_SAD, NULL, 31, flag_16k_smc,
		st_ivas->hSpar != NULL ? st_ivas->hSpar->front_vad_flag : 0, st_ivas->hSpar != NULL ? st_ivas->hSpar->force_front_vad : 0, st_ivas->hSpar != NULL ? st_ivas->hSpar->front_vad_dtx_flag : 0, ivas_format, 0, st_ivas->hEncoderConfig->last_ivas_total_brate, st_ivas->hEncoderConfig->ivas_total_brate, &Q_new[0]
		#ifdef DEBUG_MODE_INFO
		,
		st->id_element
		#endif
		);
		e_old_wsp[0] = sub( Q15, q_old_wsp );
		move16();
		st_ivas->hSpar != NULL ? st_ivas->hSpar->front_vad_flag : 0, st_ivas->hSpar != NULL ? st_ivas->hSpar->force_front_vad : 0, st_ivas->hSpar != NULL ? st_ivas->hSpar->front_vad_dtx_flag : 0, ivas_format, 0, st_ivas->hEncoderConfig->last_ivas_total_brate, st_ivas->hEncoderConfig->ivas_total_brate, &Q_new[0] );
		IF( NE_32( error, IVAS_ERR_OK ) )
		{
		return error;
		}
		e_old_wsp[0] = sub( Q15, q_old_wsp );
		move16();

		/* sanity check -> DTX not supported for more than one SCEs/CPEs */
		IF( sub( add( st_ivas->nSCE, st_ivas->nCPE ), 1 ) > 0 )