address received comments (1e893d81) · Commits · IVAS Codec Public Collaboration / IVAS Codec

lib_com/prot.h

+12 −12

Original line number	Diff line number	Diff line
		@@ -7405,10 +7405,10 @@ void ProcessStereoIGF(
		STEREO_MDCT_ENC_DATA_HANDLE hStereoMdct,
		Encoder_State sts[CPE_CHANNELS], / i : Encoder state */
		int16_t ms_mask[2][MAX_SFB], /* i : bandwise MS mask */
		float pITFMDCTSpectrum[CPE_CHANNELS][2], / i : MDCT spectrum fir ITF */
		float pITFMDCTSpectrum[CPE_CHANNELS][NB_DIV], / i : MDCT spectrum fir ITF */
		float pPowerSpectrum[CPE_CHANNELS], / i/o: MDCT^2 + MDST^2 spectrum, or estimate */
		float pPowerSpectrumMsInv[CPE_CHANNELS][2], / i : inverse power spectrum */
		float inv_spectrum[CPE_CHANNELS][2], / i : inverse spectrum */
		float pPowerSpectrumMsInv[CPE_CHANNELS][NB_DIV], / i : inverse power spectrum */
		float inv_spectrum[CPE_CHANNELS][NB_DIV], / i : inverse spectrum */
		const int16_t frameno, /* i : flag indicating index of current subframe*/
		const int16_t sp_aud_decision0, /* i : sp_aud_decision0 */
		const int32_t element_brate, /* i : element bitrate */
		@@ -9855,8 +9855,8 @@ void IGFEncApplyStereo(
		const int16_t igfGridIdx, /* i : IGF grid index */
		Encoder_State sts[CPE_CHANNELS], / i : Encoder state */
		float pPowerSpectrum[CPE_CHANNELS], / i/o: MDCT^2 + MDST^2 spectrum, or estimate */
		float pPowerSpectrumMsInv[CPE_CHANNELS][2], / i/o: inverse power spectrum */
		float inv_spectrum[CPE_CHANNELS][2], / i : inverse spectrum */
		float pPowerSpectrumMsInv[CPE_CHANNELS][NB_DIV], / i/o: inverse power spectrum */
		float inv_spectrum[CPE_CHANNELS][NB_DIV], / i : inverse spectrum */
		const int16_t frameno, /* i : flag indicating index of current subframe */
		const int16_t sp_aud_decision0, /* i : sp_aud_decision0 */
		const int32_t element_brate, /* i : element bitrate */

lib_dec/ivas_mct_dec.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -83,8 +83,8 @@ ivas_error ivas_mct_dec(
		int16_t p_param[MCT_MAX_BLOCKS][CPE_CHANNELS][NB_DIV];
		int16_t nTnsBitsTCX10[MCT_MAX_BLOCKS][CPE_CHANNELS][NB_DIV];
		float Aq[MCT_MAX_BLOCKS][CPE_CHANNELS][( NB_SUBFR16k + 1 ) * ( M + 1 )];
		int16_t fUseTns[MCT_MAX_BLOCKS][CPE_CHANNELS][2]; /* two entries for each channel in case of TCX 10 */
		STnsData tnsData[MCT_MAX_BLOCKS][CPE_CHANNELS][2];
		int16_t fUseTns[MCT_MAX_BLOCKS][CPE_CHANNELS][NB_DIV];
		STnsData tnsData[MCT_MAX_BLOCKS][CPE_CHANNELS][NB_DIV];
		Decoder_State **sts;
		float synth[CPE_CHANNELS][L_FRAME_PLUS];
		float output_lfe_ch[L_FRAME48k];

lib_dec/ivas_stereo_mdct_core_dec.c

+1 −4

Original line number	Diff line number	Diff line
		@@ -153,7 +153,7 @@ void stereo_mdct_core_dec(
		int16_t param_lpc[CPE_CHANNELS][NPRM_LPC_NEW];

		float Aq[CPE_CHANNELS][( NB_SUBFR16k + 1 ) * ( M + 1 )];
		float *x[CPE_CHANNELS][2];
		float *x[CPE_CHANNELS][NB_DIV];

		/needed to allocate N_MAX to prevent stereo switching crash /
		float x_0_buf[CPE_CHANNELS][N_MAX];
		@@ -179,9 +179,7 @@ void stereo_mdct_core_dec(
		int16_t p_param[CPE_CHANNELS][NB_DIV];
		int16_t nTnsBitsTCX10[CPE_CHANNELS][NB_DIV];
		float signal_outFB_tmp[CPE_CHANNELS][L_FRAME_PLUS];

		float signal_out_tmp[CPE_CHANNELS][L_FRAME_PLUS];

		push_wmops( "stereo_mdct_core_dec" );

		/--------------------------------------------------------------------------------
		@@ -366,7 +364,6 @@ void stereo_mdct_core_dec(
		mvr2r( signal_outFB_tmp[1], signal_outFB[1], hCPE->hCoreCoder[1]->hTcxDec->L_frameTCX );

		pop_wmops();

		return;
		}

lib_enc/igf_enc.c

+4 −4

Original line number	Diff line number	Diff line
		@@ -1916,16 +1916,16 @@ void IGFEncApplyStereo(
		const int16_t igfGridIdx, /* i : IGF grid index */
		Encoder_State sts[CPE_CHANNELS], / i : Encoder state */
		float pPowerSpectrum[CPE_CHANNELS], / i/o: MDCT^2 + MDST^2 spectrum, or estimate */
		float pPowerSpectrumMsInv[CPE_CHANNELS][2], / i/o: inverse power spectrum */
		float inv_spectrum[CPE_CHANNELS][2], / i : inverse spectrum */
		float pPowerSpectrumMsInv[CPE_CHANNELS][NB_DIV], / i/o: inverse power spectrum */
		float inv_spectrum[CPE_CHANNELS][NB_DIV], / i : inverse spectrum */
		const int16_t frameno, /* i : flag indicating index of current subfr. */
		const int16_t sp_aud_decision0, /* i : sp_aud_decision0 */
		const int32_t element_brate, /* i : element bitrate */
		const int16_t mct_on /* i : flag mct block (1) or stereo (0) */
		)
		{
		float pPowerSpectrumParameter[2]; / If it is NULL it informs a function that specific handling is needed */
		float *pPowerSpectrumParameterMsInv[2];
		float pPowerSpectrumParameter[NB_DIV]; / If it is NULL it informs a function that specific handling is needed */
		float *pPowerSpectrumParameterMsInv[NB_DIV];
		int16_t coreMsMask[N_MAX];
		int16_t sfb, ch, last_core_acelp;
		STEREO_MDCT_BAND_PARAMETERS *sfbConf;

lib_enc/ivas_dirac_enc.c

+4 −4

Original line number	Diff line number	Diff line
		@@ -655,10 +655,10 @@ void ivas_dirac_param_est_enc(
		hDirAC->diffuseness_m[i] = 0;
		}

		set_f( azi_secs, 0, 2 * DIRAC_MAX_ANA_CHANS * DIRAC_MAX_NBANDS );
		set_f( ele_secs, 0, 2 * DIRAC_MAX_ANA_CHANS * DIRAC_MAX_NBANDS );
		set_f( diff_secs, 0, 2 * DIRAC_MAX_ANA_CHANS * DIRAC_MAX_NBANDS );
		set_f( ene_secs, 0, 2 * DIRAC_MAX_ANA_CHANS * DIRAC_MAX_NBANDS );
		set_zero( azi_secs, 2 * DIRAC_MAX_ANA_CHANS * DIRAC_MAX_NBANDS );
		set_zero( ele_secs, 2 * DIRAC_MAX_ANA_CHANS * DIRAC_MAX_NBANDS );
		set_zero( diff_secs, 2 * DIRAC_MAX_ANA_CHANS * DIRAC_MAX_NBANDS );
		set_zero( ene_secs, 2 * DIRAC_MAX_ANA_CHANS * DIRAC_MAX_NBANDS );

		/* Copy current frame to memory for delay compensation */
		for ( i = 0; i < nchan_fb_in; i++ )