diff --git a/lib_com/options.h b/lib_com/options.h index c215b53875ac89eb100fefe51be0261ff84ee41b..6deb68b869adc7953f903352764a5af1e6325404 100755 --- a/lib_com/options.h +++ b/lib_com/options.h @@ -242,6 +242,7 @@ #define BINAURAL_AUDIO_CMDLINE #define FIX_570_TCX_LPC_WRITE /* FhG: fix issue 570: LPC bitstream writer in TCX */ +#define FIX_506 /* FhG: Compiler warnings */ /* ################## End DEVELOPMENT switches ######################### */ /* clang-format on */ diff --git a/lib_dec/LD_music_post_filter.c b/lib_dec/LD_music_post_filter.c index 87984e873a15af6bc744f1e32f4b3af1e409a8ea..0b8bed426c3f836efea94835ecb4190c8402f6bd 100644 --- a/lib_dec/LD_music_post_filter.c +++ b/lib_dec/LD_music_post_filter.c @@ -387,7 +387,10 @@ static void spectrum_mod_dct( float slope; float inv_noise[MBANDS_GN_LD]; float *pt_gbin, alpha, tmpN; - int16_t i, cnt; + int16_t i; +#ifndef FIX_506 + int16_t cnt; +#endif float *pt; float tmp, shift; const float *pt2; @@ -475,7 +478,9 @@ static void spectrum_mod_dct( tmpN = slope * inv_noise[i]; tmp = 0.0f; +#ifndef FIX_506 cnt = 0; +#endif while ( freq <= mfreq_loc_LD[i] ) { gain = 1.0f; @@ -502,7 +507,9 @@ static void spectrum_mod_dct( *pt_gbin = gain + alpha * *pt_gbin; *pt++ *= *pt_gbin; +#ifndef FIX_506 cnt++; +#endif freq += BIN_16kdct; pt_gbin++; } diff --git a/lib_dec/hq_lr_dec.c b/lib_dec/hq_lr_dec.c index 774720844c56abf7a28ea7cd13c4c312153f9077..1fa8b168c481f674bdaace9cdb8584b919fb707b 100644 --- a/lib_dec/hq_lr_dec.c +++ b/lib_dec/hq_lr_dec.c @@ -1370,10 +1370,14 @@ static void spt_shorten_domain_set_dec( ) { int16_t j, k; +#ifndef FIX_506 int16_t kpos; +#endif int16_t spt_shorten_flag[SPT_SHORTEN_SBNUM]; +#ifndef FIX_506 kpos = 0; +#endif j = 0; for ( k = bands - SPT_SHORTEN_SBNUM; k < bands; k++ ) { @@ -1390,7 +1394,9 @@ static void spt_shorten_domain_set_dec( } } +#ifndef FIX_506 kpos++; +#endif j++; } diff --git a/lib_dec/ivas_svd_dec.c b/lib_dec/ivas_svd_dec.c index 785a9067804c9b252fb08d1922d4354d675ab801..7c4a0cf4bb69df87c2dd5477823eb3f2bd119c30 100644 --- a/lib_dec/ivas_svd_dec.c +++ b/lib_dec/ivas_svd_dec.c @@ -96,22 +96,26 @@ void mat2svdMat( ) { int16_t i, j; +#ifndef FIX_506 int16_t posCounter; +#endif if ( transpose ) { +#ifndef FIX_506 posCounter = 0; - +#endif for ( i = 0; i < mCols; i++ ) { for ( j = 0; j < nRows; j++ ) { svdMat[i][j] = mat[j + nRows * i]; - +#ifndef FIX_506 if ( mat[j + nRows * i] > 0.0f ) { posCounter++; } +#endif } set_zero( &svdMat[i][mCols], MAX_OUTPUT_CHANNELS - nRows ); diff --git a/lib_dec/swb_bwe_dec_lr.c b/lib_dec/swb_bwe_dec_lr.c index 4f29becf248e298f1aa223816d64366b30f82a88..222316151d395d6fed0bad0565ee6b2897f266a7 100644 --- a/lib_dec/swb_bwe_dec_lr.c +++ b/lib_dec/swb_bwe_dec_lr.c @@ -130,7 +130,10 @@ static void DecodeSWBSubbands( float ss_min = 1.0f, g, be_tonal[SWB_HAR_RAN1], xSynth_har[L_FRAME32k]; GainItem pk_sf[(NB_SWB_SUBBANDS) *8]; int16_t lagIndices_real[NB_SWB_SUBBANDS]; - int16_t pul_res[NB_SWB_SUBBANDS], cnt, imin; +#ifndef FIX_506 + int16_t cnt; +#endif + int16_t pul_res[NB_SWB_SUBBANDS], imin; int16_t har_freq_est1 = 0; int16_t har_freq_est2 = 0; int16_t flag_dis = 1; @@ -202,14 +205,18 @@ static void DecodeSWBSubbands( { lagGains[k] *= 0.9f; } +#ifndef FIX_506 cnt = 0; +#endif for ( k = 0; k < NB_SWB_SUBBANDS; k++ ) { th_g[k] = 0.0f; if ( p2a_flags[BANDS - NB_SWB_SUBBANDS + k] == 0 ) { th_g[k] = lagGains[k] * ss_min; +#ifndef FIX_506 cnt++; +#endif } } /* Construct spectrum */ diff --git a/lib_enc/swb_bwe_enc_lr.c b/lib_enc/swb_bwe_enc_lr.c index afa9e75ac792c6d74bc4b5e1b1ef7dcbdc0a91d6..dd5bf3b4ca65a06911b977547ec9a198b571a2a9 100644 --- a/lib_enc/swb_bwe_enc_lr.c +++ b/lib_enc/swb_bwe_enc_lr.c @@ -66,11 +66,15 @@ static int16_t GetSubbandCorrIndex2_har( int16_t bestIdx, i, j; float corr, energy, corr_sq; float lagCorr_sq, lagEnergy, eOld; +#ifndef FIX_506 int16_t absPos; +#endif int16_t N1, N2; +#ifndef FIX_506 absPos = 0; +#endif bestIdx = 0; lagCorr_sq = 0.0f; lagEnergy = 1e30f; @@ -130,7 +134,9 @@ static int16_t GetSubbandCorrIndex2_har( } predBuf++; +#ifndef FIX_506 absPos++; +#endif } if ( lagCorr_sq == 0.0f && *prev_frame_bstindx < 0 ) @@ -512,7 +518,10 @@ static void EncodeSWBSubbands( float sspectra_ni[L_FRAME32k], sspectra_diff[L_FRAME32k], be_tonal[SWB_HAR_RAN1], xSynth_har[L_FRAME32k]; float ss_min = 1.0f, th_g[NB_SWB_SUBBANDS]; GainItem pk_sf[(NB_SWB_SUBBANDS) *8]; - int16_t pul_res[NB_SWB_SUBBANDS], cnt; +#ifndef FIX_506 + int16_t cnt; +#endif + int16_t pul_res[NB_SWB_SUBBANDS]; int16_t har_freq_est1 = 0, har_freq_est2 = 0; int16_t flag_dis = 1; int16_t pos_max_hfe2 = 0; @@ -599,14 +608,18 @@ static void EncodeSWBSubbands( lagGains[k] *= 0.9f; } +#ifndef FIX_506 cnt = 0; +#endif for ( k = 0; k < NB_SWB_SUBBANDS; k++ ) { th_g[k] = 0.0f; if ( p2a_flags[BANDS - NB_SWB_SUBBANDS + k] == 0 ) { th_g[k] = lagGains[k] * ss_min; +#ifndef FIX_506 cnt++; +#endif } }