buf: make all the modules use comp_dev_get_first_data_producer

marcinszkudlinski · marcinszkudlinski · commit f42fb8bafd1d · 2024-09-18T09:56:37.000+02:00
Change all access to the first element of dev-&gt;bsource_list
from direct to API call comp_dev_get_first_data_producer

access in pipeline management code, like module adapter,
is omitted intentionally

Signed-off-by: Marcin Szkudlinski &lt;marcin.szkudlinski@intel.com&gt;
diff --git a/src/audio/aria/aria.c b/src/audio/aria/aria.c
@@ -178,7 +178,7 @@ static int aria_prepare(struct processing_module *mod,
 
 	comp_info(dev, "aria_prepare()");
 
-	source = list_first_item(&dev->bsource_list, struct comp_buffer, sink_list);
+	source = comp_dev_get_first_data_producer(dev);
 	aria_set_stream_params(source, mod);
 
 	sink = comp_dev_get_first_data_consumer(dev);
diff --git a/src/audio/asrc/asrc.c b/src/audio/asrc/asrc.c
@@ -396,8 +396,7 @@ static int asrc_params(struct processing_module *mod)
 		return -EINVAL;
 	}
 
-	sourceb = list_first_item(&dev->bsource_list, struct comp_buffer,
-				  sink_list);
+	sourceb = comp_dev_get_first_data_producer(dev);
 	sinkb = comp_dev_get_first_data_consumer(dev);
 
 	/* update the source/sink buffer formats. Sink rate will be modified below */
@@ -469,7 +468,7 @@ static int asrc_dai_find(struct comp_dev *dev, struct comp_data *cd)
 	} else {
 		/* In pull mode check if source component is DAI */
 		do {
-			sourceb = list_first_item(&dev->bsource_list, struct comp_buffer, sink_list);
+			sourceb = comp_dev_get_first_data_producer(dev);
 
 			dev = sourceb->source;
 
@@ -544,8 +543,7 @@ static int asrc_prepare(struct processing_module *mod,
 		return ret;
 
 	/* SRC component will only ever have 1 source and 1 sink buffer */
-	sourceb = list_first_item(&dev->bsource_list,
-				  struct comp_buffer, sink_list);
+	sourceb = comp_dev_get_first_data_producer(dev);
 	sinkb = comp_dev_get_first_data_consumer(dev);
 
 	/* get source data format and period bytes */
@@ -794,8 +792,7 @@ static int asrc_process(struct processing_module *mod,
 		return ret;
 
 	/* asrc component needs 1 source and 1 sink buffer */
-	source = list_first_item(&dev->bsource_list, struct comp_buffer,
-				 sink_list);
+	source = comp_dev_get_first_data_producer(dev);
 	sink = comp_dev_get_first_data_consumer(dev);
 
 	frames_src = audio_stream_get_avail_frames(source_s);
diff --git a/src/audio/codec/dts/dts.c b/src/audio/codec/dts/dts.c
@@ -76,8 +76,7 @@ static int dts_effect_convert_sof_interface_result(struct comp_dev *dev,
 static int dts_effect_populate_buffer_configuration(struct comp_dev *dev,
 	DtsSofInterfaceBufferConfiguration *buffer_config)
 {
-	struct comp_buffer *source = list_first_item(&dev->bsource_list, struct comp_buffer,
-						     sink_list);
+	struct comp_buffer *source = comp_dev_get_first_data_producer(dev);
 	const struct audio_stream *stream;
 	DtsSofInterfaceBufferLayout buffer_layout;
 	DtsSofInterfaceBufferFormat buffer_format;
diff --git a/src/audio/copier/copier.c b/src/audio/copier/copier.c
@@ -388,7 +388,7 @@ static int copier_comp_trigger(struct comp_dev *dev, int cmd)
 			return -EINVAL;
 		}
 
-		buffer = list_first_item(&dai_copier->bsource_list, struct comp_buffer, sink_list);
+		buffer = comp_dev_get_first_data_producer(dai_copier);
 		pipe_reg.stream_start_offset = posn.dai_posn +
 			latency * audio_stream_period_bytes(&buffer->stream, dev->frames);
 		pipe_reg.stream_end_offset = 0;
@@ -412,7 +412,7 @@ static int copier_comp_trigger(struct comp_dev *dev, int cmd)
 			return -EINVAL;
 		}
 
-		buffer = list_first_item(&dai_copier->bsource_list, struct comp_buffer, sink_list);
+		buffer = comp_dev_get_first_data_producer(dai_copier);
 		pipe_reg.stream_start_offset += latency *
 			audio_stream_period_bytes(&buffer->stream, dev->frames);
 		mailbox_sw_regs_write(cd->pipeline_reg_offset, &pipe_reg.stream_start_offset,
@@ -561,7 +561,7 @@ static int copier_multi_endpoint_dai_copy(struct copier_data *cd, struct comp_de
 		return -EINVAL;
 	}
 
-	src = list_first_item(&dev->bsource_list, struct comp_buffer, sink_list);
+	src = comp_dev_get_first_data_producer(dev);
 
 	/* gateway(s) on output */
 	ret = do_conversion_copy(dev, cd, src, cd->multi_endpoint_buffer, &processed_data);
diff --git a/src/audio/copier/copier_ipcgtw.c b/src/audio/copier/copier_ipcgtw.c
@@ -82,7 +82,7 @@ static inline struct comp_buffer *get_buffer(struct comp_dev *dev)
 
 	if (list_is_empty(&dev->bsource_list))
 		return NULL;
-	return list_first_item(&dev->bsource_list, struct comp_buffer, sink_list);
+	return comp_dev_get_first_data_producer(dev);
 }
 
 int copier_ipcgtw_process(const struct ipc4_ipcgtw_cmd *cmd,
diff --git a/src/audio/crossover/crossover.c b/src/audio/crossover/crossover.c
@@ -536,7 +536,7 @@ static int crossover_prepare(struct processing_module *mod,
 
 	/* Crossover has a variable number of sinks */
 	mod->max_sinks = SOF_CROSSOVER_MAX_STREAMS;
-	source = list_first_item(&dev->bsource_list, struct comp_buffer, sink_list);
+	source = comp_dev_get_first_data_producer(dev);
 
 	/* Get source data format */
 	cd->source_format = audio_stream_get_frm_fmt(&source->stream);
diff --git a/src/audio/crossover/crossover_ipc4.c b/src/audio/crossover/crossover_ipc4.c
@@ -118,7 +118,7 @@ void crossover_params(struct processing_module *mod)
 	ipc4_base_module_cfg_to_stream_params(&mod->priv.cfg.base_cfg, params);
 	component_set_nearest_period_frames(dev, params->rate);
 
-	sourceb = list_first_item(&dev->bsource_list, struct comp_buffer, sink_list);
+	sourceb = comp_dev_get_first_data_producer(dev);
 	ipc4_update_buffer_format(sourceb, &mod->priv.cfg.base_cfg.audio_fmt);
 
 	comp_dev_for_each_consumer(dev, sinkb) {
diff --git a/src/audio/dai-legacy.c b/src/audio/dai-legacy.c
@@ -493,9 +493,7 @@ int dai_common_params(struct dai_data *dd, struct comp_dev *dev,
 	}
 
 	if (dev->direction == SOF_IPC_STREAM_PLAYBACK)
-		dd->local_buffer = list_first_item(&dev->bsource_list,
-						   struct comp_buffer,
-						   sink_list);
+		dd->local_buffer = comp_dev_get_first_data_producer(dev);
 	else
 		dd->local_buffer = comp_dev_get_first_data_consumer(dev);
 
diff --git a/src/audio/dai-zephyr.c b/src/audio/dai-zephyr.c
@@ -848,8 +848,7 @@ static int dai_set_dma_buffer(struct dai_data *dd, struct comp_dev *dev,
 	comp_dbg(dev, "dai_set_dma_buffer()");
 
 	if (dev->direction == SOF_IPC_STREAM_PLAYBACK)
-		dd->local_buffer = list_first_item(&dev->bsource_list, struct comp_buffer,
-						   sink_list);
+		dd->local_buffer = comp_dev_get_first_data_producer(dev);
 	else
 		dd->local_buffer = comp_dev_get_first_data_consumer(dev);
 
@@ -1519,9 +1518,7 @@ static void set_new_local_buffer(struct dai_data *dd, struct comp_dev *dev)
 	uint32_t local_fmt;
 
 	if (dev->direction == SOF_IPC_STREAM_PLAYBACK)
-		dd->local_buffer = list_first_item(&dev->bsource_list,
-						   struct comp_buffer,
-						   sink_list);
+		dd->local_buffer = comp_dev_get_first_data_producer(dev);
 	else
 		dd->local_buffer = comp_dev_get_first_data_consumer(dev);
 
diff --git a/src/audio/dcblock/dcblock.c b/src/audio/dcblock/dcblock.c
@@ -199,7 +199,7 @@ static int dcblock_prepare(struct processing_module *mod,
 	dcblock_params(mod);
 
 	/* DC Filter component will only ever have one source and sink buffer */
-	sourceb = list_first_item(&dev->bsource_list, struct comp_buffer, sink_list);
+	sourceb = comp_dev_get_first_data_producer(dev);
 	sinkb = comp_dev_get_first_data_consumer(dev);
 
 	/* get source data format */
diff --git a/src/audio/dcblock/dcblock_ipc4.c b/src/audio/dcblock/dcblock_ipc4.c
@@ -64,7 +64,7 @@ void dcblock_params(struct processing_module *mod)
 	sinkb = comp_dev_get_first_data_consumer(dev);
 	ipc4_update_buffer_format(sinkb, &mod->priv.cfg.base_cfg.audio_fmt);
 
-	sourceb = list_first_item(&dev->bsource_list, struct comp_buffer, sink_list);
+	sourceb = comp_dev_get_first_data_producer(dev);
 	ipc4_update_buffer_format(sourceb, &mod->priv.cfg.base_cfg.audio_fmt);
 }
 
diff --git a/src/audio/drc/drc.c b/src/audio/drc/drc.c
@@ -306,7 +306,7 @@ static void drc_params(struct processing_module *mod)
 	sinkb = comp_dev_get_first_data_consumer(dev);
 	ipc4_update_buffer_format(sinkb, &mod->priv.cfg.base_cfg.audio_fmt);
 
-	sourceb = list_first_item(&dev->bsource_list, struct comp_buffer, sink_list);
+	sourceb = comp_dev_get_first_data_producer(dev);
 	ipc4_update_buffer_format(sourceb, &mod->priv.cfg.base_cfg.audio_fmt);
 }
 #endif /* CONFIG_IPC_MAJOR_4 */
@@ -329,7 +329,7 @@ static int drc_prepare(struct processing_module *mod,
 #endif
 
 	/* DRC component will only ever have 1 source and 1 sink buffer */
-	sourceb = list_first_item(&dev->bsource_list, struct comp_buffer, sink_list);
+	sourceb = comp_dev_get_first_data_producer(dev);
 	sinkb = comp_dev_get_first_data_consumer(dev);
 
 	/* get source data format */
diff --git a/src/audio/eq_fir/eq_fir.c b/src/audio/eq_fir/eq_fir.c
@@ -424,7 +424,7 @@ static int eq_fir_prepare(struct processing_module *mod,
 	}
 
 	/* EQ component will only ever have 1 source and 1 sink buffer. */
-	sourceb = list_first_item(&dev->bsource_list, struct comp_buffer, sink_list);
+	sourceb = comp_dev_get_first_data_producer(dev);
 	sinkb = comp_dev_get_first_data_consumer(dev);
 	eq_fir_set_alignment(&sourceb->stream, &sinkb->stream);
 	channels = audio_stream_get_channels(&sinkb->stream);
diff --git a/src/audio/eq_fir/eq_fir_ipc4.c b/src/audio/eq_fir/eq_fir_ipc4.c
@@ -59,7 +59,7 @@ int eq_fir_params(struct processing_module *mod)
 	ipc4_base_module_cfg_to_stream_params(&mod->priv.cfg.base_cfg, params);
 	component_set_nearest_period_frames(dev, params->rate);
 
-	sourceb = list_first_item(&dev->bsource_list, struct comp_buffer, sink_list);
+	sourceb = comp_dev_get_first_data_producer(dev);
 	ipc4_update_buffer_format(sourceb, &mod->priv.cfg.base_cfg.audio_fmt);
 
 	sinkb = comp_dev_get_first_data_consumer(dev);
diff --git a/src/audio/eq_iir/eq_iir.c b/src/audio/eq_iir/eq_iir.c
@@ -193,7 +193,7 @@ static int eq_iir_prepare(struct processing_module *mod,
 		return ret;
 
 	/* EQ component will only ever have 1 source and 1 sink buffer */
-	sourceb = list_first_item(&dev->bsource_list, struct comp_buffer, sink_list);
+	sourceb = comp_dev_get_first_data_producer(dev);
 	sinkb = comp_dev_get_first_data_consumer(dev);
 	eq_iir_set_alignment(&sourceb->stream, &sinkb->stream);
 
diff --git a/src/audio/eq_iir/eq_iir_ipc3.c b/src/audio/eq_iir/eq_iir_ipc3.c
@@ -274,8 +274,7 @@ static int eq_iir_verify_params(struct comp_dev *dev,
 	comp_dbg(dev, "eq_iir_verify_params()");
 
 	/* EQ component will only ever have 1 source and 1 sink buffer */
-	sourceb = list_first_item(&dev->bsource_list, struct comp_buffer,
-				  sink_list);
+	sourceb = comp_dev_get_first_data_producer(dev);
 	sinkb = comp_dev_get_first_data_consumer(dev);
 
 	/* we check whether we can support frame_fmt conversion (whether we have
diff --git a/src/audio/google/google_ctc_audio_processing.c b/src/audio/google/google_ctc_audio_processing.c
@@ -355,7 +355,7 @@ static int ctc_prepare(struct processing_module *mod,
 
 	comp_info(mod->dev, "ctc_prepare()");
 
-	source = list_first_item(&dev->bsource_list, struct comp_buffer, sink_list);
+	source = comp_dev_get_first_data_producer(dev);
 	switch (audio_stream_get_frm_fmt(&source->stream)) {
 #if CONFIG_FORMAT_S16LE
 	case SOF_IPC_FRAME_S16_LE:
diff --git a/src/audio/google/google_hotword_detect.c b/src/audio/google/google_hotword_detect.c
@@ -170,8 +170,7 @@ static int ghd_params(struct comp_dev *dev,
 	}
 
 	/* This detector component will only ever have 1 source */
-	sourceb = list_first_item(&dev->bsource_list, struct comp_buffer,
-				  sink_list);
+	sourceb = comp_dev_get_first_data_producer(dev);
 
 	if (audio_stream_get_channels(sourceb->stream) != 1) {
 		comp_err(dev, "ghd_params(): Only single-channel supported");
@@ -391,8 +390,7 @@ static int ghd_copy(struct comp_dev *dev)
 	}
 
 	/* keyword components will only ever have 1 source */
-	source = list_first_item(&dev->bsource_list,
-				 struct comp_buffer, sink_list);
+	source = comp_dev_get_first_data_producer(dev);
 	stream = &sourceb->stream;
 
 	bytes = audio_stream_get_avail_bytes(stream);
diff --git a/src/audio/google/google_rtc_audio_processing.c b/src/audio/google/google_rtc_audio_processing.c
@@ -633,10 +633,9 @@ static int google_rtc_audio_processing_prepare(struct processing_module *mod,
 	/* Don't need the ref buffer on IPC4 as pipelines are always
 	 * activated in tandem; also the API is deprecated
 	 */
-	cd->ref_comp_buffer = list_first_item(&dev->bsource_list,
-					      struct comp_buffer, sink_list);
+	cd->ref_comp_buffer = comp_dev_get_first_data_producer(dev);
 	if (cd->aec_reference_source == 1)
-		cd->ref_comp_buffer = list_next_item(cd->ref_comp_buffer, sink_list);
+		cd->ref_comp_buffer = comp_dev_get_next_data_producer(dev, cd->ref_comp_buffer);
 #endif
 
 #ifdef CONFIG_IPC_MAJOR_4
diff --git a/src/audio/host-legacy.c b/src/audio/host-legacy.c
@@ -714,9 +714,7 @@ int host_common_params(struct host_data *hd, struct comp_dev *dev,
 	if (dev->direction == SOF_IPC_STREAM_PLAYBACK)
 		hd->local_buffer = comp_dev_get_first_data_consumer(dev);
 	else
-		hd->local_buffer = list_first_item(&dev->bsource_list,
-						   struct comp_buffer,
-						   sink_list);
+		hd->local_buffer = comp_dev_get_first_data_producer(dev);
 
 	period_bytes = dev->frames *
 		audio_stream_frame_bytes(&hd->local_buffer->stream);
diff --git a/src/audio/host-zephyr.c b/src/audio/host-zephyr.c
@@ -795,9 +795,7 @@ int host_common_params(struct host_data *hd, struct comp_dev *dev,
 	if (params->direction == SOF_IPC_STREAM_PLAYBACK)
 		hd->local_buffer = comp_dev_get_first_data_consumer(dev);
 	else
-		hd->local_buffer = list_first_item(&dev->bsource_list,
-						   struct comp_buffer,
-						   sink_list);
+		hd->local_buffer = comp_dev_get_first_data_producer(dev);
 
 	period_bytes = dev->frames * get_frame_bytes(params->frame_fmt, params->channels);
 
diff --git a/src/audio/kpb.c b/src/audio/kpb.c
@@ -1182,8 +1182,7 @@ static int kpb_copy(struct comp_dev *dev)
 	}
 
 	/* Get source and sink buffers */
-	source = list_first_item(&dev->bsource_list, struct comp_buffer,
-				 sink_list);
+	source = comp_dev_get_first_data_producer(dev);
 
 	/* Validate source */
 	if (!audio_stream_get_rptr(&source->stream)) {
diff --git a/src/audio/mfcc/mfcc.c b/src/audio/mfcc/mfcc.c
@@ -192,7 +192,7 @@ static int mfcc_prepare(struct processing_module *mod,
 	comp_info(dev, "mfcc_prepare()");
 
 	/* MFCC component will only ever have 1 source and 1 sink buffer */
-	sourceb = list_first_item(&dev->bsource_list, struct comp_buffer, sink_list);
+	sourceb = comp_dev_get_first_data_producer(dev);
 	sinkb = comp_dev_get_first_data_consumer(dev);
 
 	/* get source data format */
diff --git a/src/audio/module_adapter/module/waves/waves.c b/src/audio/module_adapter/module/waves/waves.c
@@ -216,8 +216,7 @@ static int waves_effect_allocate(struct processing_module *mod)
 static int waves_effect_check(struct comp_dev *dev)
 {
 	struct comp_buffer *sink = comp_dev_get_first_data_consumer(dev);
-	struct comp_buffer *source = list_first_item(&dev->bsource_list, struct comp_buffer,
-						     sink_list);
+	struct comp_buffer *source = comp_dev_get_first_data_producer(dev);
 	const struct audio_stream *src_fmt = &source->stream;
 	const struct audio_stream *snk_fmt = &sink->stream;
 
@@ -283,8 +282,7 @@ static int waves_effect_check(struct comp_dev *dev)
 static int waves_effect_init(struct processing_module *mod)
 {
 	struct comp_dev *dev = mod->dev;
-	struct comp_buffer *source = list_first_item(&dev->bsource_list, struct comp_buffer,
-						     sink_list);
+	struct comp_buffer *source = comp_dev_get_first_data_producer(dev);
 	struct module_data *codec = &mod->priv;
 	struct waves_codec_data *waves_codec = codec->private;
 	const struct audio_stream *src_fmt = &source->stream;
diff --git a/src/audio/multiband_drc/multiband_drc.c b/src/audio/multiband_drc/multiband_drc.c
@@ -364,7 +364,7 @@ static int multiband_drc_prepare(struct processing_module *mod,
 		return ret;
 
 	/* DRC component will only ever have 1 source and 1 sink buffer */
-	sourceb = list_first_item(&dev->bsource_list, struct comp_buffer, sink_list);
+	sourceb = comp_dev_get_first_data_producer(dev);
 
 	/* get source data format */
 	cd->source_format = audio_stream_get_frm_fmt(&sourceb->stream);
diff --git a/src/audio/mux/mux_generic.c b/src/audio/mux/mux_generic.c
@@ -549,8 +549,7 @@ demux_func demux_get_processing_function(struct processing_module *mod)
 	if (list_is_empty(&dev->bsource_list))
 		return NULL;
 
-	sourceb = list_first_item(&dev->bsource_list, struct comp_buffer,
-				sink_list);
+	sourceb = comp_dev_get_first_data_producer(dev);
 
 	for (i = 0; i < ARRAY_SIZE(mux_func_map); i++) {
 		enum sof_ipc_frame fmt = audio_stream_get_frm_fmt(&sourceb->stream);
diff --git a/src/audio/rtnr/rtnr.c b/src/audio/rtnr/rtnr.c
@@ -781,7 +781,7 @@ static void rtnr_params(struct processing_module *mod)
 	ipc4_base_module_cfg_to_stream_params(&mod->priv.cfg.base_cfg, params);
 	component_set_nearest_period_frames(dev, params->rate);
 
-	sourceb = list_first_item(&dev->bsource_list, struct comp_buffer, sink_list);
+	sourceb = comp_dev_get_first_data_producer(dev);
 	ipc4_update_buffer_format(sourceb, &mod->priv.cfg.base_cfg.audio_fmt);
 
 	sinkb = comp_dev_get_first_data_consumer(dev);
@@ -817,7 +817,7 @@ static int rtnr_prepare(struct processing_module *mod,
 	sinkb = comp_dev_get_first_data_consumer(dev);
 	cd->sink_format = audio_stream_get_frm_fmt(&sinkb->stream);
 	cd->sink_stream.frame_fmt = audio_stream_get_frm_fmt(&sinkb->stream);
-	sourceb = list_first_item(&dev->bsource_list, struct comp_buffer, sink_list);
+	sourceb = comp_dev_get_first_data_producer(dev);
 	ret = rtnr_check_params(mod, &sourceb->stream, &sinkb->stream);
 	if (ret)
 		goto err;
diff --git a/src/audio/selector/selector.c b/src/audio/selector/selector.c
diff --git a/src/audio/tdfb/tdfb.c b/src/audio/tdfb/tdfb.c
diff --git a/src/audio/tdfb/tdfb_ipc4.c b/src/audio/tdfb/tdfb_ipc4.c
diff --git a/src/audio/tone.c b/src/audio/tone.c
diff --git a/src/audio/volume/volume.c b/src/audio/volume/volume.c
diff --git a/src/audio/volume/volume_ipc3.c b/src/audio/volume/volume_ipc3.c
diff --git a/src/audio/volume/volume_ipc4.c b/src/audio/volume/volume_ipc4.c
diff --git a/src/samples/audio/detect_test.c b/src/samples/audio/detect_test.c
diff --git a/test/cmocka/src/audio/eq_fir/eq_fir_process.c b/test/cmocka/src/audio/eq_fir/eq_fir_process.c
diff --git a/test/cmocka/src/audio/eq_iir/eq_iir_process.c b/test/cmocka/src/audio/eq_iir/eq_iir_process.c
diff --git a/tools/plugin/modules/alsa.c b/tools/plugin/modules/alsa.c
diff --git a/tools/plugin/modules/shm.c b/tools/plugin/modules/shm.c
diff --git a/tools/testbench/file.c b/tools/testbench/file.c

Original file line number	Diff line number	Diff line change
`@@ -82,7 +82,7 @@ static inline struct comp_buffer get_buffer(struct comp_dev dev)`
`82`	`82`
`83`	`83`	`if (list_is_empty(&dev->bsource_list))`
`84`	`84`	`return NULL;`
`85`		`- return list_first_item(&dev->bsource_list, struct comp_buffer, sink_list);`
	`85`	`+ return comp_dev_get_first_data_producer(dev);`
`86`	`86`	`}`
`87`	`87`
`88`	`88`	`int copier_ipcgtw_process(const struct ipc4_ipcgtw_cmd *cmd,`
Original file line number	Diff line number	Diff line change
`@@ -493,9 +493,7 @@ int dai_common_params(struct dai_data dd, struct comp_dev dev,`
`493`	`493`	`}`
`494`	`494`
`495`	`495`	`if (dev->direction == SOF_IPC_STREAM_PLAYBACK)`
`496`		`- dd->local_buffer = list_first_item(&dev->bsource_list,`
`497`		`- struct comp_buffer,`
`498`		`- sink_list);`
	`496`	`+ dd->local_buffer = comp_dev_get_first_data_producer(dev);`
`499`	`497`	`else`
`500`	`498`	`dd->local_buffer = comp_dev_get_first_data_consumer(dev);`
`501`	`499`