math: avoid re-initialising variables every loop iteration

In psy_get_mel_filterbank() if fb->slaney_normalize isn't set, 3 variables are reset to the same values needless every loop iteration. Move initialisations outside the loop instead. Signed-off-by: Guennadi Liakhovetski <[email protected]>
thesofproject · Apr 3, 2024 · f77bdfb · f77bdfb
1 parent 1ce9e45
commit f77bdfb
Showing 1 changed file with 4 additions and 6 deletions.
diff --git a/src/math/auditory/auditory.c b/src/math/auditory/auditory.c
@@ -90,8 +90,8 @@ int psy_get_mel_filterbank(struct psy_mel_filterbank *fb)
 	int32_t up_slope;
 	int32_t down_slope;
 	int32_t slope;
-	int32_t scale;
-	int32_t scale_inv;
+	int32_t scale = ONE_Q16;
+	int32_t scale_inv = ONE_Q16;
 	int16_t *mel;
 	int16_t mel_start;
 	int16_t mel_end;
@@ -137,6 +137,8 @@ int psy_get_mel_filterbank(struct psy_mel_filterbank *fb)
 	if (fb->scratch_length1 < fb->half_fft_bins)
 		return -ENOMEM;
 
+	fb->scale_log2 = 0;
+
 	mel = fb->scratch_data1;
 	for (i = 0; i < fb->half_fft_bins; i++) {
 		f = fb->samplerate * i / fb->fft_bins;
@@ -164,10 +166,6 @@ int psy_get_mel_filterbank(struct psy_mel_filterbank *fb)
 			}
 
 			scale = Q_MULTSR_32X32((int64_t)scale, scale_inv, 16, 16, 16);
-		} else {
-			scale = ONE_Q16;
-			scale_inv = ONE_Q16;
-			fb->scale_log2 = 0;
 		}
 		for (j = 0; j < fb->half_fft_bins; j++) {
 			up_slope = (((int32_t)mel[j] - left_mel) << 15) / delta_cl; /* Q17.15 */