resolve compilation warnings (875f062d) · Commits · IVAS Codec Public Collaboration / IVAS Codec

lib_com/ivas_prot.h

+2 −0

Original line number	Diff line number	Diff line
		@@ -1727,7 +1727,9 @@ void td_stereo_param_updt(
		const float lsp_old_PCh[], /* i : primary channel old LSPs */
		const float lsf_old_PCh[], /* i : primary channel old LSFs */
		const float pitch_buf_PCh[], /* i : primary channel pitch buffer */
		#ifndef LSF_RE_USE_SECONDARY_CHANNEL_REUSEMODE
		float tdm_lspQ_PCh[], /* o : Q LSPs for primary channel */
		#endif
		float tdm_lsfQ_PCh[], /* o : Q LSFs for primary channel */
		float tdm_Pri_pitch_buf[], /* o : pitch values for primary channel */
		const int16_t flag_ACELP16k, /* i : ACELP@16kHz flag */

lib_com/ivas_stereo_td_bit_alloc.c

+14 −4

Original line number	Diff line number	Diff line
		@@ -433,7 +433,9 @@ void td_stereo_param_updt(
		const float lsp_old_PCh[], /* i : primary channel old LSPs */
		const float lsf_old_PCh[], /* i : primary channel old LSFs */
		const float pitch_buf_PCh[], /* i : primary channel pitch buffer */
		#ifndef LSF_RE_USE_SECONDARY_CHANNEL_REUSEMODE
		float tdm_lspQ_PCh[], /* o : Q LSPs for primary channel */
		#endif
		float tdm_lsfQ_PCh[], /* o : Q LSFs for primary channel */
		float tdm_Pri_pitch_buf[], /* o : pitch values for primary channel */
		const int16_t flag_ACELP16k, /* i : ACELP@16kHz flag */
		@@ -441,12 +443,17 @@ void td_stereo_param_updt(
		)
		{
		int16_t i;
		#ifdef LSF_RE_USE_SECONDARY_CHANNEL_REUSEMODE
		float tdm_lspQ_PCh[M];
		#endif

		/* Copy some primary channel information into the secondary channel structure for later usage */
		if ( tdm_use_IAWB_Ave_lpc == 1 )
		{
		mvr2r( IAWB_Ave, tdm_lsfQ_PCh, M );
		#ifndef LSF_RE_USE_SECONDARY_CHANNEL_REUSEMODE
		lsf2lsp( tdm_lsfQ_PCh, tdm_lspQ_PCh, M, INT_FS_12k8 );
		#endif
		}
		else if ( flag_ACELP16k == 1 )
		{
		@@ -456,7 +463,9 @@ void td_stereo_param_updt(
		}
		else
		{
		#ifndef LSF_RE_USE_SECONDARY_CHANNEL_REUSEMODE
		mvr2r( lsp_old_PCh, tdm_lspQ_PCh, M );
		#endif
		mvr2r( lsf_old_PCh, tdm_lsfQ_PCh, M );
		}

		@@ -553,6 +562,7 @@ static void tdm_SCh_LSF_intra_pred_tri_diag_mat(
		return;
		}


		/-------------------------------------------------------------------
		* tdm_SCh_LSF_intra_pred()
		*

lib_com/prot.h

+20 −22

Original line number	Diff line number	Diff line
		@@ -2361,7 +2361,9 @@ ivas_error acelp_core_enc(
		float pitch_buf[NB_SUBFR16k], /* o : floating pitch for each subframe */
		int16_t unbits, / o : number of unused bits */
		STEREO_TD_ENC_DATA_HANDLE hStereoTD, /* i/o: TD stereo encoder handle */
		#ifndef LSF_RE_USE_SECONDARY_CHANNEL_REUSEMODE
		const float tdm_lspQ_PCh[M], /* i : Q LSPs for primary channel */
		#endif
		const float tdm_lsfQ_PCh[M] /* i : Q LSFs for primary channel */
		);

		@@ -4521,7 +4523,9 @@ ivas_error acelp_core_dec(
		int16_t unbits, / o : number of unused bits */
		int16_t sid_bw, / o : 0-NB/WB, 1-SWB SID */
		STEREO_TD_DEC_DATA_HANDLE hStereoTD, /* i/o: TD stereo decoder handle */
		#ifndef LSF_RE_USE_SECONDARY_CHANNEL_REUSEMODE
		const float tdm_lspQ_PCh[M], /* i : Q LSPs for primary channel */
		#endif
		const float tdm_lsfQ_PCh[M], /* i : Q LSFs for primary channel */
		const int16_t use_cldfb_for_dft, /* i : flag to use of CLDFB for DFT Stereo */
		const int16_t last_element_mode, /* i : last element mode */
		@@ -6775,8 +6779,7 @@ void getTCXMode(
		Decoder_State st, / i/o: decoder memory state */
		Decoder_State st0 / i : bitstream */
		,
		const int16_t MCT_flag
		);
		const int16_t MCT_flag );

		void getTCXWindowing(
		const int16_t core, /* i : current frame mode */
		@@ -7888,10 +7891,8 @@ void decoder_tcx_post(
		float *synth,
		float *synthFB,
		float *A,
		const int16_t bfi
		,
		const int16_t isMCT
		);
		const int16_t bfi,
		const int16_t isMCT );

		void coder_acelp(
		Encoder_State st, / i/o: coder memory state */
		@@ -8133,8 +8134,7 @@ void con_tcx(
		int16_t noise_seed, / i/o: noise seed for stereo */
		const int16_t only_left /* i : TD-PLC only in left channel */
		,
		const float *A_cng
		);
		const float *A_cng );

		/! r: codebook index /
		int16_t tcxlpc_get_cdk(
		@@ -9510,10 +9510,8 @@ void TonalMDCTConceal_SaveFreqSignal(
		const float *mdctSpectrum,
		const uint16_t numSamples,
		const uint16_t nNewSamplesCore,
		const float *scaleFactors
		,
		const int16_t infoIGFStartLine
		);
		const float *scaleFactors,
		const int16_t infoIGFStartLine );

		void TonalMDCTConceal_UpdateState(
		TonalMDCTConcealPtr hTonalMDCTConc,

lib_dec/acelp_core_dec.c

+10 −8

Original line number	Diff line number	Diff line
		@@ -69,7 +69,9 @@ ivas_error acelp_core_dec(
		int16_t unbits, / o : number of unused bits */
		int16_t sid_bw, / o : 0-NB/WB, 1-SWB SID */
		STEREO_TD_DEC_DATA_HANDLE hStereoTD, /* i/o: TD stereo decoder handle */
		#ifndef LSF_RE_USE_SECONDARY_CHANNEL_REUSEMODE
		const float tdm_lspQ_PCh[M], /* i : Q LSPs for primary channel */
		#endif
		const float tdm_lsfQ_PCh[M], /* i : Q LSFs for primary channel */
		const int16_t use_cldfb_for_dft, /* i : flag to use of CLDFB for DFT Stereo */
		const int16_t last_element_mode, /* i : last element mode */

lib_dec/evs_dec.c

+4 −0

Original line number	Diff line number	Diff line
		@@ -261,7 +261,11 @@ ivas_error evs_dec(
		if ( st->core == ACELP_CORE )
		{
		/* ACELP core decoder */
		#ifdef LSF_RE_USE_SECONDARY_CHANNEL_REUSEMODE
		if ( ( error = acelp_core_dec( st, NULL, synth, NULL, bwe_exc_extended, voice_factors, old_syn_12k8_16k, sharpFlag, pitch_buf, &unbits, &sid_bw, NULL, NULL, 0, EVS_MONO, 0, 0, 1, NULL ) ) != IVAS_ERR_OK )
		#else
		if ( ( error = acelp_core_dec( st, NULL, synth, NULL, bwe_exc_extended, voice_factors, old_syn_12k8_16k, sharpFlag, pitch_buf, &unbits, &sid_bw, NULL, NULL, NULL, 0, EVS_MONO, 0, 0, 1, NULL ) ) != IVAS_ERR_OK )
		#endif
		{
		return error;
		}