From 2de7746aeea10268e26c6a9947299f3f3fecfe15 Mon Sep 17 00:00:00 2001 From: Sandesh Venkatesh Date: Tue, 27 Feb 2024 11:37:03 +0530 Subject: [PATCH] IVAS warnings fixes - 1 --- lib_com/ivas_dirac_com.c | 2 -- lib_com/swb_bwe_com_fx.c | 4 ++-- lib_dec/TonalComponentDetection.c | 4 ++-- lib_dec/fd_cng_dec.c | 8 +------- lib_dec/ivas_jbm_dec.c | 6 +++--- lib_dec/ivas_mc_param_dec.c | 5 ++--- lib_dec/ivas_out_setup_conversion.c | 8 ++++---- lib_dec/jbm_jb4sb.c | 2 +- lib_dec/tonalMDCTconcealment.c | 12 ++++++------ lib_dec/updt_dec_fx.c | 4 ++-- lib_rend/ivas_dirac_rend.c | 2 +- lib_rend/ivas_orient_trk.c | 2 +- 12 files changed, 25 insertions(+), 34 deletions(-) diff --git a/lib_com/ivas_dirac_com.c b/lib_com/ivas_dirac_com.c index 2f6077ccf..492ebfc37 100644 --- a/lib_com/ivas_dirac_com.c +++ b/lib_com/ivas_dirac_com.c @@ -1344,8 +1344,6 @@ void deindex_spherical_component_fx( const MC_LS_SETUP mc_format /* i : channel format if in MC-mode */ ) { - Word32 az_idx_fx; - Word16 q_az_idx; assert( sph_idx < ( 1 << no_bits ) ); SWITCH( no_bits ) { diff --git a/lib_com/swb_bwe_com_fx.c b/lib_com/swb_bwe_com_fx.c index 95c496818..3dac7c4e8 100644 --- a/lib_com/swb_bwe_com_fx.c +++ b/lib_com/swb_bwe_com_fx.c @@ -748,11 +748,11 @@ Word32 ivas_calc_tilt_bwe_fx( /* o : Tilt in Q24 */ FOR(j = shr(N, 5); j > 0; j--) { #ifdef BASOP_NOGLOB /* Critical Overflow and all those below*/ - tmp1 = mult_ro(*ptr++, 8192, &Overflow); /* Divide by 4 */ + Word16 tmp = mult_ro(*ptr++, 8192, &Overflow); /* Divide by 4 */ #else tmp1 = mult_r(*ptr++, 8192); /* Divide by 4 */ #endif - L_ener = L_mult0(tmp1, tmp1); + L_ener = L_mult0( tmp, tmp ); /* With the shift by 4 and the L_mult0, no overflow possible for 32 samples */ FOR(i = 1; i < 32; i++) { diff --git a/lib_dec/TonalComponentDetection.c b/lib_dec/TonalComponentDetection.c index 02dc1f0db..b849df6fc 100644 --- a/lib_dec/TonalComponentDetection.c +++ b/lib_dec/TonalComponentDetection.c @@ -105,12 +105,12 @@ void DetectTonalComponents_flt( FOR( Word16 k = 0; k < nSamplesCore; k++ ) { if ( abs( (Word32) pScaledMdctSpectrum[k] ) != 0 ) - q_pScaledMdctSpectrum_fx = s_min( q_pScaledMdctSpectrum_fx, norm_l( pScaledMdctSpectrum[k] ) ); + q_pScaledMdctSpectrum_fx = s_min( q_pScaledMdctSpectrum_fx, norm_l( (Word32) pScaledMdctSpectrum[k] ) ); } FOR( Word16 k = 0; k < FDNS_NPTS; k++ ) { if ( abs( (Word32) scaleFactors[k] ) != 0 ) - q_scaleFactors_fx = s_min( q_scaleFactors_fx, norm_l( scaleFactors[k] ) ); + q_scaleFactors_fx = s_min( q_scaleFactors_fx, norm_l( (Word32) scaleFactors[k] ) ); } q_pScaledMdctSpectrum_fx -= 1; q_scaleFactors_fx -= 1; diff --git a/lib_dec/fd_cng_dec.c b/lib_dec/fd_cng_dec.c index 775f333e5..5ad4f1699 100644 --- a/lib_dec/fd_cng_dec.c +++ b/lib_dec/fd_cng_dec.c @@ -3040,12 +3040,6 @@ void FdCngDecodeMDCTStereoSID( #ifdef IVAS_FLOAT_FIXED Word32 *invTrfMatrix_fx; Word32 tmpRAM_fx[FDCNG_VQ_MAX_LEN][FDCNG_VQ_DCT_MAXTRUNC]; - Word32 *ms_ptr_fx[CPE_CHANNELS]; - Word32 *lr_ptr_fx[CPE_CHANNELS]; - Word32 logNoiseEst_fx[CPE_CHANNELS][NPART]; - Word32 gain_fx[CPE_CHANNELS]; - Word16 norm1, norm2; - float lr_ptr_fxfl[NPART]; #endif invTrfMatrix = (float *) tmpRAM; @@ -3053,7 +3047,7 @@ void FdCngDecodeMDCTStereoSID( invTrfMatrix_fx = (Word32 *)tmpRAM_fx; create_IDCT_N_Matrix_fx(invTrfMatrix_fx, FDCNG_VQ_MAX_LEN, FDCNG_VQ_DCT_MAXTRUNC, sizeof(tmpRAM_fx) / (sizeof(Word32))); - FOR(Word16 i = 0; i < FDCNG_VQ_MAX_LEN; i++) { + FOR( i = 0; i < FDCNG_VQ_MAX_LEN; i++) { FOR(Word16 j = 0; j < FDCNG_VQ_DCT_MAXTRUNC; j++) { Word16 index = i * FDCNG_VQ_DCT_MAXTRUNC + j; invTrfMatrix[index] = fix_to_float(invTrfMatrix_fx[index], 31); // Q factor 31 diff --git a/lib_dec/ivas_jbm_dec.c b/lib_dec/ivas_jbm_dec.c index d035ef3dc..9fcb1028b 100644 --- a/lib_dec/ivas_jbm_dec.c +++ b/lib_dec/ivas_jbm_dec.c @@ -2204,7 +2204,7 @@ ivas_error ivas_jbm_dec_render( { *nSamplesRendered = min( st_ivas->hTcBuffer->n_samples_available, nSamplesAskedLocal ); #ifdef IVAS_FLOAT_FIXED - Word16 i, j, q = Q16; + Word16 q = Q16; Word32 *p_output_fx[20]; Word32 *p_tc_fx[16]; q = q - find_guarded_bits_fx( st_ivas->nchan_transport ); @@ -2753,7 +2753,7 @@ ivas_error ivas_jbm_dec_render( { *nSamplesRendered = min( st_ivas->hTcBuffer->n_samples_available, nSamplesAskedLocal ); #ifdef IVAS_FLOAT_FIXED - Word16 i, j, q = Q16; + Word16 q = Q16; Word32 *p_output_fx[20]; Word32 *p_tc_fx[16]; q = q - find_guarded_bits_fx( st_ivas->nchan_transport ); @@ -2816,7 +2816,7 @@ ivas_error ivas_jbm_dec_render( else if ( st_ivas->renderer_type == RENDERER_MC ) { #ifdef IVAS_FLOAT_FIXED - Word16 i, j, q = Q16; + Word16 q = Q16; Word32 *p_output_fx[20]; q = q - find_guarded_bits_fx( MC_PARAMUPMIX_MAX_INPUT_CHANS ); FOR( i = 0; i < max(st_ivas->hDecoderConfig->nchan_out, MC_PARAMUPMIX_MAX_INPUT_CHANS); ++i ) diff --git a/lib_dec/ivas_mc_param_dec.c b/lib_dec/ivas_mc_param_dec.c index e0ea1290f..e621f95db 100644 --- a/lib_dec/ivas_mc_param_dec.c +++ b/lib_dec/ivas_mc_param_dec.c @@ -1813,7 +1813,7 @@ void ivas_param_mc_dec_render( Word32 Cldfb_ImagBuffer_fx[MAX_CICP_CHANNELS][PARAM_MC_MAX_NSLOTS_IN_SUBFRAME][CLDFB_NO_CHANNELS_MAX]; Word16 inChannels = st_ivas->hIntSetup.nchan_out_woLFE + st_ivas->hIntSetup.num_lfe; Word16 num_timeslots = hParamMC->subframe_nbslots[subframe_idx]; - Word16 i, j; + Word16 j; FOR( i = 0; i < inChannels; ++i ) { FOR( j = 0; j < num_timeslots; ++j ) @@ -2526,9 +2526,8 @@ static void ivas_param_mc_get_mixing_matrices( #ifdef IVAS_FLOAT_FIXED Word32 Cy_diag_fx[MAX_OUTPUT_CHANNELS]; - Word32 proto_matrix_ptr_fx[PARAM_MC_MAX_TRANSPORT_CHANS * MAX_CICP_CHANNELS]; Word32 mixing_matrix_local_fx[MAX_CICP_CHANNELS * PARAM_MC_MAX_TRANSPORT_CHANS]; - Word16 Cy_diag_e, proto_matrix_ptr_e, mixing_matrix_local_e; + Word16 Cy_diag_e, mixing_matrix_local_e; f2me_buf( Cy_diag, Cy_diag_fx, &Cy_diag_e, nY_band ); f2me_buf( proto_matrix_ptr, proto_matrix_ptr_fx, &proto_matrix_ptr_e, nY_band * nX ); diff --git a/lib_dec/ivas_out_setup_conversion.c b/lib_dec/ivas_out_setup_conversion.c index e5e063306..e0a79fd57 100644 --- a/lib_dec/ivas_out_setup_conversion.c +++ b/lib_dec/ivas_out_setup_conversion.c @@ -1894,7 +1894,7 @@ void ivas_ls_setup_conversion_process_mdct_param_mc( IF( real_exp > imag_exp ) { - FOR( Word16 i = 0; i < num_bands * nchan_transport; ++i ) + FOR( i = 0; i < num_bands * nchan_transport; ++i ) { imag_in_buffer_fx[i] = L_shr( imag_in_buffer_fx[i], real_exp - imag_exp ); } @@ -1902,14 +1902,14 @@ void ivas_ls_setup_conversion_process_mdct_param_mc( } ELSE { - FOR( Word16 i = 0; i < num_bands * nchan_transport; ++i ) + FOR( i = 0; i < num_bands * nchan_transport; ++i ) { real_in_buffer_fx[i] = L_shr( real_in_buffer_fx[i], imag_exp - real_exp ); } input_exp = imag_exp; } - FOR( Word16 i = 0; i < num_bands * nchan_transport; ++i ) + FOR( i = 0; i < num_bands * nchan_transport; ++i ) { real_in_buffer_fx[i] = L_shr( real_in_buffer_fx[i], shift ); imag_in_buffer_fx[i] = L_shr( imag_in_buffer_fx[i], shift ); @@ -2113,7 +2113,7 @@ void ivas_lssetupconversion_process_param_mc_fx( Word32 Cldfb_RealBuffer_tmp[MAX_CICP_CHANNELS][CLDFB_NO_CHANNELS_MAX]; Word32 Cldfb_ImagBuffer_tmp[MAX_CICP_CHANNELS][CLDFB_NO_CHANNELS_MAX]; LSSETUP_CONVERSION_HANDLE hLsSetUpConversion; - Word16 i, j, k; + Word16 i, k; push_wmops( "LS_Renderer_Process_Param_MC" ); /* inits */ diff --git a/lib_dec/jbm_jb4sb.c b/lib_dec/jbm_jb4sb.c index 46f9bb251..ab96ede1b 100644 --- a/lib_dec/jbm_jb4sb.c +++ b/lib_dec/jbm_jb4sb.c @@ -1307,7 +1307,7 @@ static void JB4_popFromBuffer( IF ( lost != 0 && total_rec != 0 ) { - h->netLossRate_fx = (float) lost / (float) total_rec; + h->netLossRate_fx = (Word32) ( lost / (float) total_rec ); h->netLossRate = (float) lost / (float) total_rec; } ELSE diff --git a/lib_dec/tonalMDCTconcealment.c b/lib_dec/tonalMDCTconcealment.c index 32d0c5c11..5e019bb22 100644 --- a/lib_dec/tonalMDCTconcealment.c +++ b/lib_dec/tonalMDCTconcealment.c @@ -378,12 +378,12 @@ static void CalcPowerSpecAndDetectTonalComponents( FOR( Word16 k = 0; k < hTonalMDCTConc->nSamplesCore; k++ ) { if ( abs( (Word32) powerSpectrum[k] ) != 0 ) - q_ps = s_min( q_ps, norm_l( powerSpectrum[k] ) ); + q_ps = s_min( q_ps, norm_l( (Word32) powerSpectrum[k] ) ); } FOR( Word16 k = 0; k < FDNS_NPTS; k++ ) { if ( abs( (Word32) invScaleFactors[k] ) != 0 ) - q_isf = s_min( q_isf, norm_l( invScaleFactors[k] ) ); + q_isf = s_min( q_isf, norm_l( (Word32) invScaleFactors[k] ) ); } q_ps -= 1; q_isf -= 1; @@ -506,12 +506,12 @@ void TonalMDCTConceal_Detect_ivas( FOR( Word16 k = 0; k < hTonalMDCTConc->nSamplesCore; k++ ) { if ( abs( (Word32) powerSpectrum[k] ) != 0 ) - q_ps = s_min( q_ps, norm_l( powerSpectrum[k] ) ); + q_ps = s_min( q_ps, norm_l( (Word32) powerSpectrum[k] ) ); } FOR( Word16 k = 0; k < FDNS_NPTS; k++ ) { if ( abs( (Word32) hTonalMDCTConc->secondLastBlockData.scaleFactors_float[k] ) != 0 ) - q_sf = s_min( q_sf, norm_l( hTonalMDCTConc->secondLastBlockData.scaleFactors_float[k] ) ); + q_sf = s_min( q_sf, norm_l( (Word32) hTonalMDCTConc->secondLastBlockData.scaleFactors_float[k] ) ); } q_ps -= 1; q_sf -= 1; @@ -980,12 +980,12 @@ void TonalMDCTConceal_Apply_ivas( FOR( Word16 k = 0; k < hTonalMDCTConc->nSamplesCore; k++ ) { if ( abs( (Word32) powerSpectrum[k] ) != 0 ) - q_ps = s_min( q_ps, norm_l( powerSpectrum[k] ) ); + q_ps = s_min( q_ps, norm_l( (Word32) powerSpectrum[k] ) ); } FOR( Word16 k = 0; k < FDNS_NPTS; k++ ) { if ( abs( (Word32) hTonalMDCTConc->secondLastBlockData.scaleFactors_float[k] ) != 0 ) - q_sf = s_min( q_sf, norm_l( hTonalMDCTConc->secondLastBlockData.scaleFactors_float[k] ) ); + q_sf = s_min( q_sf, norm_l( (Word32) hTonalMDCTConc->secondLastBlockData.scaleFactors_float[k] ) ); } q_ps -= 1; q_sf -= 1; diff --git a/lib_dec/updt_dec_fx.c b/lib_dec/updt_dec_fx.c index 80c72b57b..2c52affbd 100644 --- a/lib_dec/updt_dec_fx.c +++ b/lib_dec/updt_dec_fx.c @@ -721,7 +721,7 @@ void updt_dec_common_fx( IF(st_fx->hTcxDec != NULL && st_fx->enablePlcWaveadjust && !concealWholeFrameTmp && NE_16(st_fx->core, AMR_WB_CORE)) { /* update the parameters used in waveform adjustment */ - concealment_update2_x(synth, &st_fx->plcInfo, hTcxDec->L_frameTCX); + concealment_update2_x((const Word16 *)synth, &st_fx->plcInfo, hTcxDec->L_frameTCX); } st_fx->last_total_brate_ber = st_fx->total_brate; @@ -1073,7 +1073,7 @@ void ivas_updt_dec_common_fx( IF(st_fx->hTcxDec != NULL && st_fx->enablePlcWaveadjust && !concealWholeFrameTmp && NE_16(st_fx->core, AMR_WB_CORE)) { /* update the parameters used in waveform adjustment */ - concealment_update2_x(synth, &st_fx->plcInfo, hTcxDec->L_frameTCX); + concealment_update2_x((const Word16 *)synth, &st_fx->plcInfo, hTcxDec->L_frameTCX); } st_fx->last_total_brate_ber = st_fx->total_brate; diff --git a/lib_rend/ivas_dirac_rend.c b/lib_rend/ivas_dirac_rend.c index a4bd072aa..596897439 100644 --- a/lib_rend/ivas_dirac_rend.c +++ b/lib_rend/ivas_dirac_rend.c @@ -1809,7 +1809,7 @@ void ivas_dirac_dec_get_frequency_axis_fx( const Word32 output_Fs, const Word16 num_freq_bands ) { - Word16 k, div_res, const_part, scale; + Word16 k, const_part, scale; /* calc cldfb frequency axis */ const_part = BASOP_Util_Divide3216_Scale( output_Fs, shl( num_freq_bands, 1 ), &scale ); diff --git a/lib_rend/ivas_orient_trk.c b/lib_rend/ivas_orient_trk.c index d6931cdbe..8c2290ba7 100644 --- a/lib_rend/ivas_orient_trk.c +++ b/lib_rend/ivas_orient_trk.c @@ -867,7 +867,7 @@ static void VectorRotationToQuaternion_fx( Word32 comp_fx = 0; Word16 comp_e, check_flag, result_e = 0; - f2me( -0.999999, &comp_fx, &comp_e ); + f2me( -0.999999f, &comp_fx, &comp_e ); IF( GT_32( dot_product_fx, 0 ) ) { check_flag = 0; -- GitLab