Merge branch 'core_coder_in_debug' into 'main' (26e6dea5) · Commits · SA4 / Audio / IVAS BASOP

lib_com/ivas_prot.h

+4 −0

Original line number	Diff line number	Diff line
		@@ -249,6 +249,10 @@ ivas_error pre_proc_front_ivas_fx(
		const IVAS_FORMAT ivas_format, /* i : IVAS format */
		const Word16 MCT_flag, /* i : hMCT handle allocated (1) or not (0) */
		const Word32 ivas_total_brate /* i : IVAS total bitrate - for setting the DTX */
		#ifdef DEBUG_MODE_INFO
		,
		const Word16 ch_idx
		#endif
		);
		ivas_error pre_proc_ivas(
		Encoder_State st, / i/o: encoder state structure */

lib_enc/ivas_core_pre_proc_front.c

+34 −0

Original line number	Diff line number	Diff line
		@@ -43,6 +43,10 @@
		#include "ivas_prot_fx.h"
		#include "wmc_auto.h"
		#include <math.h>
		#ifdef DEBUGGING
		#include "debug.h"
		#include "string.h"
		#endif

		#include "prot_fx_enc.h"
		#include "ivas_prot_fx.h"
		@@ -132,6 +136,10 @@ ivas_error pre_proc_front_ivas_fx(
		const IVAS_FORMAT ivas_format, /* i : IVAS format */
		const Word16 MCT_flag, /* i : hMCT handle allocated (1) or not (0) */
		const Word32 ivas_total_brate /* i : IVAS total bitrate - for setting the DTX */
		#ifdef DEBUG_MODE_INFO
		,
		const Word16 ch_idx
		#endif
		)
		{
		Encoder_State *st;
		@@ -240,10 +248,15 @@ ivas_error pre_proc_front_ivas_fx(
		Word16 imagBuffer16[CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX];
		Word16 res_cod_SNR_M_fx_e[STEREO_DFT_BAND_MAX];
		Word16 band_energies_fx_exp, Qfact_PS, q_lf_E_fx;
		#ifdef DEBUG_MODE_INFO
		Word32 *in_buff_temp;
		Word16 in_q_temp;
		#endif

		mem_decim_dummy_fx = (Word16 ) malloc( 90 sizeof( Word16 * ) );
		temp1F_icatdmResampBuf_fx = (Word16 ) malloc( 45 sizeof( Word16 * ) );
		set16_fx( fft_buff_fx, 0, 512 );

		IF( hSCE != NULL )
		{
		Copy_Scale_sig_16_32( hSCE->hCoreCoder[n]->input_fx, hSCE->hCoreCoder[n]->input32_fx, input_frame, sub( Q11, hSCE->hCoreCoder[n]->q_inp ) );
		@@ -256,6 +269,11 @@ ivas_error pre_proc_front_ivas_fx(
		Scale_sig( hSCE->hCoreCoder[n]->old_input_signal_fx, input_frame, sub( -1, hSCE->hCoreCoder[n]->q_old_inp ) );
		hSCE->hCoreCoder[n]->q_old_inp = -1;
		move16();

		#ifdef DEBUG_MODE_INFO
		in_buff_temp = hSCE->hCoreCoder[n]->input32_fx;
		in_q_temp = hSCE->hCoreCoder[n]->q_inp32;
		#endif
		}
		ELSE
		{
		@@ -269,7 +287,23 @@ ivas_error pre_proc_front_ivas_fx(
		Scale_sig( hCPE->hCoreCoder[n]->old_input_signal_fx, input_frame, sub( -1, hCPE->hCoreCoder[n]->q_old_inp ) );
		hCPE->hCoreCoder[n]->q_old_inp = -1;
		move16();
		#ifdef DEBUG_MODE_INFO
		in_buff_temp = hCPE->hCoreCoder[n]->input32_fx;
		in_q_temp = hCPE->hCoreCoder[n]->q_inp32;
		#endif
		}

		#ifdef DEBUG_MODE_INFO
		{
		int16_t tmpF[L_FRAME48k];
		for ( int16_t isample = 0; isample < input_frame; isample++ )
		{
		tmpF[isample] = (int16_t) ( (float) in_buff_temp[isample - NS2SA( st->input_Fs, ACELP_LOOK_NS )] / ( (float) ( 1 << in_q_temp ) ) );
		}
		dbgwrite( &tmpF, sizeof( int16_t ), input_frame, 1, strcat( fname( debug_dir, "ivas_input_dmx", 0, ch_idx + 1, ENC ), ".pcm" ) );
		}
		#endif

		#ifdef MSAN_FIX
		FOR( Word16 k = 0; k < CLDFB_NO_COL_MAX; k++ )
		{

lib_enc/ivas_cpe_enc.c

+6 −1

Original line number	Diff line number	Diff line
		@@ -803,7 +803,12 @@ 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, add( Q_buffer[n], QSCALE ), Etot_LR_fx, lf_E_fx, add( Q_buffer[n], QSCALE - 2 ), localVAD_HE_SAD,
		band_energies_LR_fx, sub( add( Q_buffer[n], QSCALE ), band_ener_guardbits ), 0, st_ivas->hSpar != NULL ? st_ivas->hSpar->front_vad_flag : 0, 0, 0, ivas_format, st_ivas->hMCT != NULL, ivas_total_brate );
		band_energies_LR_fx, sub( add( Q_buffer[n], QSCALE ), band_ener_guardbits ), 0, st_ivas->hSpar != NULL ? st_ivas->hSpar->front_vad_flag : 0, 0, 0, ivas_format, st_ivas->hMCT != NULL, ivas_total_brate
		#ifdef DEBUG_MODE_INFO
		,
		( st_ivas->nSCE + ( cpe_id * CPE_CHANNELS ) + n )
		#endif
		);
		e_old_wsp[n] = sub( Q15, q_old_wsp );
		move16();
		if ( error != IVAS_ERR_OK )

lib_enc/ivas_ism_enc.c

+6 −1

Original line number	Diff line number	Diff line
		@@ -236,7 +236,12 @@ 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, 31, Etot_LR_fx, lf_E_fx, 31, localVAD_HE_SAD, NULL, 31, 0, 0, 0, 0, ISM_FORMAT, 0, st_ivas->hEncoderConfig->ivas_total_brate );
		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, 31, Etot_LR_fx, lf_E_fx, 31, localVAD_HE_SAD, NULL, 31, 0, 0, 0, 0, ISM_FORMAT, 0, st_ivas->hEncoderConfig->ivas_total_brate
		#ifdef DEBUG_MODE_INFO
		,
		st->id_element
		#endif
		);
		e_old_wsp[sce_id][0] = sub( Q15, q_old_wsp );
		move16();
		IF( NE_32( error, IVAS_ERR_OK ) )

lib_enc/ivas_sce_enc.c

+6 −1

Original line number	Diff line number	Diff line
		@@ -255,7 +255,12 @@ 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, 31, 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->ivas_total_brate );
		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->ivas_total_brate
		#ifdef DEBUG_MODE_INFO
		,
		st->id_element
		#endif
		);
		e_old_wsp[0] = sub( Q15, q_old_wsp );
		move16();
		IF( error != IVAS_ERR_OK )