review fixes

Signed-off-by: Seppo Ingalsuo <seppo.ingalsuo@linux.intel.com>

Author: singalsu

src/audio/stft_process/stft_process-generic.c

@@ -64,8 +64,9 @@ int stft_process_source_s32(struct stft_comp_data *cd, struct sof_source *source
 		}
 
 		/* One of the buffers needs a wrap (or end of data), so check for wrap */
-		x = (x >= x_end) ? x - x_size : x;
 		w = stft_process_buffer_wrap(ibuf, w);
+		if (x >= x_end)
+			x -= x_size;
 
 		/* Update processed samples count for next loop iteration. */
 		frames_left -= n;
@@ -131,8 +132,9 @@ int stft_process_sink_s32(struct stft_comp_data *cd, struct sof_sink *sink, int
 		}
 
 		/* One of the buffers needs a wrap (or end of data), so check for wrap */
-		y = (y >= y_end) ? y - y_size : y;
 		r = stft_process_buffer_wrap(obuf, r);
+		if (y >= y_end)
+			y -= y_size;
 
 		/* Update processed samples count for next loop iteration. */
 		frames_remain -= n;
@@ -206,8 +208,9 @@ int stft_process_source_s16(struct stft_comp_data *cd, struct sof_source *source
 		}
 
 		/* One of the buffers needs a wrap (or end of data), so check for wrap */
-		x = (x >= x_end) ? x - x_size : x;
 		w = stft_process_buffer_wrap(ibuf, w);
+		if (x >= x_end)
+			x -= x_size;
 
 		/* Update processed samples count for next loop iteration. */
 		frames_left -= n;
@@ -273,8 +276,9 @@ int stft_process_sink_s16(struct stft_comp_data *cd, struct sof_sink *sink, int
 		}
 
 		/* One of the buffers needs a wrap (or end of data), so check for wrap */
-		y = (y >= y_end) ? y - y_size : y;
 		r = stft_process_buffer_wrap(obuf, r);
+		if (y >= y_end)
+			y -= y_size;
 
 		/* Update processed samples count for next loop iteration. */
 		frames_remain -= n;

src/audio/stft_process/stft_process.c

@@ -44,6 +44,8 @@ __cold static int stft_process_init(struct processing_module *mod)
 	struct comp_dev *dev = mod->dev;
 	struct stft_comp_data *cd;
 
+	assert_can_be_cold();
+
 	comp_info(dev, "stft_process_init()");
 
 	cd = mod_alloc(mod, sizeof(*cd));

src/audio/stft_process/stft_process_common.c

@@ -174,7 +174,8 @@ static int stft_process_output_zeros_s32(struct stft_comp_data *cd, struct sof_s
 		y += samples_without_wrap;
 
 		/* Check for wrap */
-		y = (y >= y_end) ? y - y_size : y;
+		if (y >= y_end)
+			y -= y_size;
 
 		/* Update processed samples count for next loop iteration. */
 		samples -= samples_without_wrap;
@@ -234,7 +235,8 @@ static int stft_process_output_zeros_s16(struct stft_comp_data *cd, struct sof_s
 		y += samples_without_wrap;
 
 		/* Check for wrap */
-		y = (y >= y_end) ? y - y_size : y;
+		if (y >= y_end)
+			y -= y_size;
 
 		/* Update processed samples count for next loop iteration. */
 		samples -= samples_without_wrap;

src/audio/stft_process/stft_process_setup.c

@@ -195,24 +195,6 @@ int stft_process_setup(struct processing_module *mod, int max_frames,
 
 	state->gain_comp = config->window_gain_comp;
 
-	/* Scratch overlay during runtime
-	 *
-	 *  +--------------------------------------------------------+
-	 *  | 1. fft_buf[], 16 bits,size x 4, e.g. 512 -> 2048 bytes |
-	 *  +-------------------------------------+------------------+
-	 *  | 3. power_spectra[],                 |
-	 *  |    32 bits, e.g. x257 -> 1028 bytes |
-	 *  +-------------------------------------+
-	 *
-	 *  +---------------------------------------------------------------------------------+
-	 *  | 2. fft_out[], 16 bits,size x 4, e.g. 512 -> 2048 bytes                          |
-	 *  +----------------------------------+----------------------------------+-----------+
-	 *  | 4. mel_spectra[],                | 5. cepstral_coef[],              |
-	 *  |    16 bits, e.g. x23 -> 46 bytes |    16 bits, e.g. 13x -> 26 bytes |
-	 *  +----------------------------------+----------------------------------+
-	 *
-	 */
-
 	/* Use FFT buffer as scratch for later computed data */
 	state->power_spectra = (int32_t *)&fft->fft_buf[0];