Skip to content

Commit f42fb8b

Browse files
buf: make all the modules use comp_dev_get_first_data_producer
Change all access to the first element of dev->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 <marcin.szkudlinski@intel.com>
1 parent 5c35b40 commit f42fb8b

File tree

40 files changed

+65
-99
lines changed

40 files changed

+65
-99
lines changed

src/audio/aria/aria.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ static int aria_prepare(struct processing_module *mod,
178178

179179
comp_info(dev, "aria_prepare()");
180180

181-
source = list_first_item(&dev->bsource_list, struct comp_buffer, sink_list);
181+
source = comp_dev_get_first_data_producer(dev);
182182
aria_set_stream_params(source, mod);
183183

184184
sink = comp_dev_get_first_data_consumer(dev);

src/audio/asrc/asrc.c

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -396,8 +396,7 @@ static int asrc_params(struct processing_module *mod)
396396
return -EINVAL;
397397
}
398398

399-
sourceb = list_first_item(&dev->bsource_list, struct comp_buffer,
400-
sink_list);
399+
sourceb = comp_dev_get_first_data_producer(dev);
401400
sinkb = comp_dev_get_first_data_consumer(dev);
402401

403402
/* 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)
469468
} else {
470469
/* In pull mode check if source component is DAI */
471470
do {
472-
sourceb = list_first_item(&dev->bsource_list, struct comp_buffer, sink_list);
471+
sourceb = comp_dev_get_first_data_producer(dev);
473472

474473
dev = sourceb->source;
475474

@@ -544,8 +543,7 @@ static int asrc_prepare(struct processing_module *mod,
544543
return ret;
545544

546545
/* SRC component will only ever have 1 source and 1 sink buffer */
547-
sourceb = list_first_item(&dev->bsource_list,
548-
struct comp_buffer, sink_list);
546+
sourceb = comp_dev_get_first_data_producer(dev);
549547
sinkb = comp_dev_get_first_data_consumer(dev);
550548

551549
/* get source data format and period bytes */
@@ -794,8 +792,7 @@ static int asrc_process(struct processing_module *mod,
794792
return ret;
795793

796794
/* asrc component needs 1 source and 1 sink buffer */
797-
source = list_first_item(&dev->bsource_list, struct comp_buffer,
798-
sink_list);
795+
source = comp_dev_get_first_data_producer(dev);
799796
sink = comp_dev_get_first_data_consumer(dev);
800797

801798
frames_src = audio_stream_get_avail_frames(source_s);

src/audio/codec/dts/dts.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,7 @@ static int dts_effect_convert_sof_interface_result(struct comp_dev *dev,
7676
static int dts_effect_populate_buffer_configuration(struct comp_dev *dev,
7777
DtsSofInterfaceBufferConfiguration *buffer_config)
7878
{
79-
struct comp_buffer *source = list_first_item(&dev->bsource_list, struct comp_buffer,
80-
sink_list);
79+
struct comp_buffer *source = comp_dev_get_first_data_producer(dev);
8180
const struct audio_stream *stream;
8281
DtsSofInterfaceBufferLayout buffer_layout;
8382
DtsSofInterfaceBufferFormat buffer_format;

src/audio/copier/copier.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -388,7 +388,7 @@ static int copier_comp_trigger(struct comp_dev *dev, int cmd)
388388
return -EINVAL;
389389
}
390390

391-
buffer = list_first_item(&dai_copier->bsource_list, struct comp_buffer, sink_list);
391+
buffer = comp_dev_get_first_data_producer(dai_copier);
392392
pipe_reg.stream_start_offset = posn.dai_posn +
393393
latency * audio_stream_period_bytes(&buffer->stream, dev->frames);
394394
pipe_reg.stream_end_offset = 0;
@@ -412,7 +412,7 @@ static int copier_comp_trigger(struct comp_dev *dev, int cmd)
412412
return -EINVAL;
413413
}
414414

415-
buffer = list_first_item(&dai_copier->bsource_list, struct comp_buffer, sink_list);
415+
buffer = comp_dev_get_first_data_producer(dai_copier);
416416
pipe_reg.stream_start_offset += latency *
417417
audio_stream_period_bytes(&buffer->stream, dev->frames);
418418
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
561561
return -EINVAL;
562562
}
563563

564-
src = list_first_item(&dev->bsource_list, struct comp_buffer, sink_list);
564+
src = comp_dev_get_first_data_producer(dev);
565565

566566
/* gateway(s) on output */
567567
ret = do_conversion_copy(dev, cd, src, cd->multi_endpoint_buffer, &processed_data);

src/audio/copier/copier_ipcgtw.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ static inline struct comp_buffer *get_buffer(struct comp_dev *dev)
8282

8383
if (list_is_empty(&dev->bsource_list))
8484
return NULL;
85-
return list_first_item(&dev->bsource_list, struct comp_buffer, sink_list);
85+
return comp_dev_get_first_data_producer(dev);
8686
}
8787

8888
int copier_ipcgtw_process(const struct ipc4_ipcgtw_cmd *cmd,

src/audio/crossover/crossover.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -536,7 +536,7 @@ static int crossover_prepare(struct processing_module *mod,
536536

537537
/* Crossover has a variable number of sinks */
538538
mod->max_sinks = SOF_CROSSOVER_MAX_STREAMS;
539-
source = list_first_item(&dev->bsource_list, struct comp_buffer, sink_list);
539+
source = comp_dev_get_first_data_producer(dev);
540540

541541
/* Get source data format */
542542
cd->source_format = audio_stream_get_frm_fmt(&source->stream);

src/audio/crossover/crossover_ipc4.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ void crossover_params(struct processing_module *mod)
118118
ipc4_base_module_cfg_to_stream_params(&mod->priv.cfg.base_cfg, params);
119119
component_set_nearest_period_frames(dev, params->rate);
120120

121-
sourceb = list_first_item(&dev->bsource_list, struct comp_buffer, sink_list);
121+
sourceb = comp_dev_get_first_data_producer(dev);
122122
ipc4_update_buffer_format(sourceb, &mod->priv.cfg.base_cfg.audio_fmt);
123123

124124
comp_dev_for_each_consumer(dev, sinkb) {

src/audio/dai-legacy.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -493,9 +493,7 @@ int dai_common_params(struct dai_data *dd, struct comp_dev *dev,
493493
}
494494

495495
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);
499497
else
500498
dd->local_buffer = comp_dev_get_first_data_consumer(dev);
501499

src/audio/dai-zephyr.c

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -848,8 +848,7 @@ static int dai_set_dma_buffer(struct dai_data *dd, struct comp_dev *dev,
848848
comp_dbg(dev, "dai_set_dma_buffer()");
849849

850850
if (dev->direction == SOF_IPC_STREAM_PLAYBACK)
851-
dd->local_buffer = list_first_item(&dev->bsource_list, struct comp_buffer,
852-
sink_list);
851+
dd->local_buffer = comp_dev_get_first_data_producer(dev);
853852
else
854853
dd->local_buffer = comp_dev_get_first_data_consumer(dev);
855854

@@ -1519,9 +1518,7 @@ static void set_new_local_buffer(struct dai_data *dd, struct comp_dev *dev)
15191518
uint32_t local_fmt;
15201519

15211520
if (dev->direction == SOF_IPC_STREAM_PLAYBACK)
1522-
dd->local_buffer = list_first_item(&dev->bsource_list,
1523-
struct comp_buffer,
1524-
sink_list);
1521+
dd->local_buffer = comp_dev_get_first_data_producer(dev);
15251522
else
15261523
dd->local_buffer = comp_dev_get_first_data_consumer(dev);
15271524

src/audio/dcblock/dcblock.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@ static int dcblock_prepare(struct processing_module *mod,
199199
dcblock_params(mod);
200200

201201
/* DC Filter component will only ever have one source and sink buffer */
202-
sourceb = list_first_item(&dev->bsource_list, struct comp_buffer, sink_list);
202+
sourceb = comp_dev_get_first_data_producer(dev);
203203
sinkb = comp_dev_get_first_data_consumer(dev);
204204

205205
/* get source data format */

0 commit comments

Comments
 (0)