Audio: Do not set sink align constraints in modules and use default

This patch mofidies modules ARIA, EQFIR, EQIIR, IGO NR, Mixer,
Selector, SRC, and TDFB by removing sink align constraints set.
Also the frame byte align of 1 is changed to SOF_FRAME_BYTE_ALIGN.

When the sink align is not set the default values from
audio_stream_init() is used, or the downstream modules sets
the align for the source.

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

Author: singalsu

src/audio/aria/aria.c

@@ -168,11 +168,6 @@ static void aria_set_stream_params(struct comp_buffer *buffer,
 	const struct ipc4_audio_format *audio_fmt = &mod->priv.cfg.base_cfg.audio_fmt;
 
 	ipc4_update_buffer_format(buffer, audio_fmt);
-#if SOF_USE_HIFI(3, ARIA) || SOF_USE_HIFI(4, ARIA)
-	audio_stream_set_align(8, 1, &buffer->stream);
-#elif SOF_USE_HIFI(5, ARIA)
-	audio_stream_set_align(16, 1, &buffer->stream);
-#endif
 }
 
 static int aria_prepare(struct processing_module *mod,
@@ -195,6 +190,7 @@ static int aria_prepare(struct processing_module *mod,
 
 	aria_set_stream_params(source, mod);
 	aria_set_stream_params(sink, mod);
+	audio_stream_set_align(SOF_FRAME_BYTE_ALIGN, SOF_FRAME_COUNT_ALIGN, &source->stream);
 
 	if (audio_stream_get_valid_fmt(&source->stream) != SOF_IPC_FRAME_S24_4LE ||
 	    audio_stream_get_valid_fmt(&sink->stream) != SOF_IPC_FRAME_S24_4LE) {

src/audio/eq_fir/eq_fir.c

@@ -366,14 +366,12 @@ static int eq_fir_process(struct processing_module *mod,
 	return 0;
 }
 
-static void eq_fir_set_alignment(struct audio_stream *source,
-				 struct audio_stream *sink)
+static void eq_fir_set_alignment(struct audio_stream *source)
 {
-	const uint32_t byte_align = 1;
+	const uint32_t byte_align = SOF_FRAME_BYTE_ALIGN;
 	const uint32_t frame_align_req = 2; /* Process multiples of 2 frames */
 
 	audio_stream_set_align(byte_align, frame_align_req, source);
-	audio_stream_set_align(byte_align, frame_align_req, sink);
 }
 
 static int eq_fir_prepare(struct processing_module *mod,
@@ -404,7 +402,7 @@ static int eq_fir_prepare(struct processing_module *mod,
 		return ret;
 	}
 
-	eq_fir_set_alignment(&sourceb->stream, &sinkb->stream);
+	eq_fir_set_alignment(&sourceb->stream);
 	channels = audio_stream_get_channels(&sinkb->stream);
 	frame_fmt = audio_stream_get_frm_fmt(&sourceb->stream);
 

src/audio/eq_iir/eq_iir.c

@@ -142,7 +142,7 @@ static int eq_iir_process(struct processing_module *mod,
 static void eq_iir_set_alignment(struct audio_stream *source,
 				 struct audio_stream *sink)
 {
-	const uint32_t byte_align = 8;
+	const uint32_t byte_align = SOF_FRAME_BYTE_ALIGN;
 	const uint32_t frame_align_req = 2;
 
 	audio_stream_set_align(byte_align, frame_align_req, source);

src/audio/igo_nr/igo_nr.c

@@ -832,8 +832,7 @@ static int32_t igo_nr_prepare(struct processing_module *mod,
 	if (ret)
 		return ret;
 
-	source_set_alignment_constants(source, 1, IGO_FRAME_SIZE);
-	sink_set_alignment_constants(sink, 1, IGO_FRAME_SIZE);
+	source_set_alignment_constants(source, SOF_FRAME_BYTE_ALIGN, IGO_FRAME_SIZE);
 
 	igo_nr_set_igo_params(mod);
 

src/audio/mixer/mixer.c

@@ -187,18 +187,18 @@ static int mixer_reset(struct processing_module *mod)
 /* init and calculate the aligned setting for available frames and free frames retrieve*/
 static inline void mixer_set_frame_alignment(struct audio_stream *source)
 {
-#if XCHAL_HAVE_HIFI3 || XCHAL_HAVE_HIFI4
 
 	/* Xtensa intrinsics ask for 8-byte aligned. 5.1 format SSE audio
-	 * requires 16-byte aligned.
+	 * requires 16-byte aligned. Note: The SOF_FRAME_BYTE_ALIGN is the
+	 * same value 16 with HiFi5.
 	 */
-	const uint32_t byte_align = audio_stream_get_channels(source) == 6 ? 16 : 8;
+	const uint32_t byte_align = audio_stream_get_channels(source) == 6 ?
+		MIXER_HIFI_FRAME_BYTE_ALIGN_6CH : SOF_FRAME_BYTE_ALIGN;
 
-	/*There is no limit for frame number, so set it as 1*/
-	const uint32_t frame_align_req = 1;
+	/* There is no limit for frame number, so set it as default (1). */
+	const uint32_t frame_align_req = SOF_FRAME_COUNT_ALIGN;
 
 	audio_stream_set_align(byte_align, frame_align_req, source);
-#endif
 }
 
 static int mixer_prepare(struct processing_module *mod,
@@ -216,7 +216,10 @@ static int mixer_prepare(struct processing_module *mod,
 	}
 
 	md->mix_func = mixer_get_processing_function(dev, sink);
-	mixer_set_frame_alignment(&sink->stream);
+
+	/* No need to set sink align constraints, set constraints for each
+	 * source next. The sink align will follow to common source alignment.
+	 */
 
 	/* check each mixer source state */
 	struct comp_buffer *source;

src/audio/mixer/mixer.h

@@ -32,6 +32,9 @@ void sys_comp_module_mixer_interface_init(void);
 
 #define MIXER_MAX_SOURCES	2
 
+/* Xtensa HiFi optimized version needs this for 5.1ch */
+#define MIXER_HIFI_FRAME_BYTE_ALIGN_6CH 16
+
 /* mixer component private data */
 struct mixer_data {
 	void (*mix_func)(struct comp_dev *dev, struct audio_stream *sink,

src/audio/selector/selector.c

@@ -1007,8 +1007,7 @@ static int selector_prepare(struct processing_module *mod,
 	sourceb = comp_dev_get_first_data_producer(dev);
 	sinkb = comp_dev_get_first_data_consumer(dev);
 
-	audio_stream_set_align(4, 1, &sourceb->stream);
-	audio_stream_set_align(4, 1, &sinkb->stream);
+	audio_stream_set_align(SOF_FRAME_BYTE_ALIGN, SOF_FRAME_COUNT_ALIGN, &sourceb->stream);
 
 	/* get source data format and period bytes */
 	cd->source_format = audio_stream_get_frm_fmt(&sourceb->stream);

src/audio/src/src_common.c

@@ -384,13 +384,12 @@ int src_copy_sxx(struct comp_data *cd, struct sof_source *source,
 	return -ENOTSUP;
 }
 
-void src_set_alignment(struct sof_source *source, struct sof_sink *sink)
+void src_set_alignment(struct sof_source *source)
 {
-	const uint32_t byte_align = 1;
-	const uint32_t frame_align_req = 1;
+	const uint32_t byte_align = SOF_FRAME_BYTE_ALIGN;
+	const uint32_t frame_align_req = SOF_FRAME_COUNT_ALIGN;
 
 	source_set_alignment_constants(source, byte_align, frame_align_req);
-	sink_set_alignment_constants(sink, byte_align, frame_align_req);
 }
 
 static int src_verify_params(struct processing_module *mod)

src/audio/src/src_common.h

@@ -143,7 +143,7 @@ int32_t src_input_rates(void);
 
 int32_t src_output_rates(void);
 
-void src_set_alignment(struct sof_source *source, struct sof_sink *sink);
+void src_set_alignment(struct sof_source *source);
 
 struct comp_data {
 #if CONFIG_IPC_MAJOR_4

src/audio/src/src_ipc3.c

@@ -105,7 +105,7 @@ int src_prepare_general(struct processing_module *mod,
 	enum sof_ipc_frame sink_format;
 
 	/* set align requirements */
-	src_set_alignment(source, sink);
+	src_set_alignment(source);
 
 	/* get source/sink data format */
 	source_format = source_get_frm_fmt(source);