Skip to content

Commit f5db20a

Browse files
buf: make all the modules use comp_dev_get_first_data_consumer
Change all access to the first element of dev->bsink_list from direct to API call comp_dev_get_first_data_consumer access in pipeline management code, like module adapter, is omitted intentionally Signed-off-by: Marcin Szkudlinski <marcin.szkudlinski@intel.com>
1 parent 1b5d1fe commit f5db20a

File tree

36 files changed

+54
-80
lines changed

36 files changed

+54
-80
lines changed

src/audio/aria/aria.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ static int aria_prepare(struct processing_module *mod,
181181
source = list_first_item(&dev->bsource_list, struct comp_buffer, sink_list);
182182
aria_set_stream_params(source, mod);
183183

184-
sink = list_first_item(&dev->bsink_list, struct comp_buffer, source_list);
184+
sink = comp_dev_get_first_data_consumer(dev);
185185
aria_set_stream_params(sink, mod);
186186

187187
if (audio_stream_get_valid_fmt(&source->stream) != SOF_IPC_FRAME_S24_4LE ||

src/audio/asrc/asrc.c

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -398,8 +398,7 @@ static int asrc_params(struct processing_module *mod)
398398

399399
sourceb = list_first_item(&dev->bsource_list, struct comp_buffer,
400400
sink_list);
401-
sinkb = list_first_item(&dev->bsink_list, struct comp_buffer,
402-
source_list);
401+
sinkb = comp_dev_get_first_data_consumer(dev);
403402

404403
/* update the source/sink buffer formats. Sink rate will be modified below */
405404
asrc_update_buffer_format(sourceb, cd);
@@ -452,7 +451,7 @@ static int asrc_dai_find(struct comp_dev *dev, struct comp_data *cd)
452451
if (cd->mode == ASRC_OM_PUSH) {
453452
/* In push mode check if sink component is DAI */
454453
do {
455-
sinkb = list_first_item(&dev->bsink_list, struct comp_buffer, source_list);
454+
sinkb = comp_dev_get_first_data_consumer(dev);
456455

457456
dev = sinkb->sink;
458457

@@ -547,8 +546,7 @@ static int asrc_prepare(struct processing_module *mod,
547546
/* SRC component will only ever have 1 source and 1 sink buffer */
548547
sourceb = list_first_item(&dev->bsource_list,
549548
struct comp_buffer, sink_list);
550-
sinkb = list_first_item(&dev->bsink_list,
551-
struct comp_buffer, source_list);
549+
sinkb = comp_dev_get_first_data_consumer(dev);
552550

553551
/* get source data format and period bytes */
554552
cd->source_format = audio_stream_get_frm_fmt(&sourceb->stream);
@@ -798,8 +796,7 @@ static int asrc_process(struct processing_module *mod,
798796
/* asrc component needs 1 source and 1 sink buffer */
799797
source = list_first_item(&dev->bsource_list, struct comp_buffer,
800798
sink_list);
801-
sink = list_first_item(&dev->bsink_list, struct comp_buffer,
802-
source_list);
799+
sink = comp_dev_get_first_data_consumer(dev);
803800

804801
frames_src = audio_stream_get_avail_frames(source_s);
805802
frames_snk = audio_stream_get_free_frames(sink_s);

src/audio/copier/copier_ipcgtw.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ static inline struct comp_buffer *get_buffer(struct comp_dev *dev)
7575
if (dev->direction == SOF_IPC_STREAM_PLAYBACK) {
7676
if (list_is_empty(&dev->bsink_list))
7777
return NULL;
78-
return list_first_item(&dev->bsink_list, struct comp_buffer, source_list);
78+
return comp_dev_get_first_data_consumer(dev);
7979
}
8080

8181
assert(dev->direction == SOF_IPC_STREAM_CAPTURE);

src/audio/dai-legacy.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -497,9 +497,7 @@ int dai_common_params(struct dai_data *dd, struct comp_dev *dev,
497497
struct comp_buffer,
498498
sink_list);
499499
else
500-
dd->local_buffer = list_first_item(&dev->bsink_list,
501-
struct comp_buffer,
502-
source_list);
500+
dd->local_buffer = comp_dev_get_first_data_consumer(dev);
503501

504502
/* check if already configured */
505503
if (dev->state == COMP_STATE_PREPARE) {

src/audio/dai-zephyr.c

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -855,8 +855,7 @@ static int dai_set_dma_buffer(struct dai_data *dd, struct comp_dev *dev,
855855
dd->local_buffer = list_first_item(&dev->bsource_list, struct comp_buffer,
856856
sink_list);
857857
else
858-
dd->local_buffer = list_first_item(&dev->bsink_list, struct comp_buffer,
859-
source_list);
858+
dd->local_buffer = comp_dev_get_first_data_consumer(dev);
860859

861860
/* check if already configured */
862861
if (dev->state == COMP_STATE_PREPARE) {
@@ -1528,9 +1527,7 @@ static void set_new_local_buffer(struct dai_data *dd, struct comp_dev *dev)
15281527
struct comp_buffer,
15291528
sink_list);
15301529
else
1531-
dd->local_buffer = list_first_item(&dev->bsink_list,
1532-
struct comp_buffer,
1533-
source_list);
1530+
dd->local_buffer = comp_dev_get_first_data_consumer(dev);
15341531

15351532
local_fmt = audio_stream_get_frm_fmt(&dd->local_buffer->stream);
15361533

src/audio/dcblock/dcblock.c

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

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

205205
/* get source data format */
206206
cd->source_format = audio_stream_get_frm_fmt(&sourceb->stream);

src/audio/dcblock/dcblock_ipc4.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ void dcblock_params(struct processing_module *mod)
6161
ipc4_base_module_cfg_to_stream_params(&mod->priv.cfg.base_cfg, params);
6262
component_set_nearest_period_frames(dev, params->rate);
6363

64-
sinkb = list_first_item(&dev->bsink_list, struct comp_buffer, source_list);
64+
sinkb = comp_dev_get_first_data_consumer(dev);
6565
ipc4_update_buffer_format(sinkb, &mod->priv.cfg.base_cfg.audio_fmt);
6666

6767
sourceb = list_first_item(&dev->bsource_list, struct comp_buffer, sink_list);

src/audio/drc/drc.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -303,7 +303,7 @@ static void drc_params(struct processing_module *mod)
303303
ipc4_base_module_cfg_to_stream_params(&mod->priv.cfg.base_cfg, params);
304304
component_set_nearest_period_frames(dev, params->rate);
305305

306-
sinkb = list_first_item(&dev->bsink_list, struct comp_buffer, source_list);
306+
sinkb = comp_dev_get_first_data_consumer(dev);
307307
ipc4_update_buffer_format(sinkb, &mod->priv.cfg.base_cfg.audio_fmt);
308308

309309
sourceb = list_first_item(&dev->bsource_list, struct comp_buffer, sink_list);
@@ -330,7 +330,7 @@ static int drc_prepare(struct processing_module *mod,
330330

331331
/* DRC component will only ever have 1 source and 1 sink buffer */
332332
sourceb = list_first_item(&dev->bsource_list, struct comp_buffer, sink_list);
333-
sinkb = list_first_item(&dev->bsink_list, struct comp_buffer, source_list);
333+
sinkb = comp_dev_get_first_data_consumer(dev);
334334

335335
/* get source data format */
336336
cd->source_format = audio_stream_get_frm_fmt(&sourceb->stream);

src/audio/eq_fir/eq_fir.c

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

426426
/* EQ component will only ever have 1 source and 1 sink buffer. */
427427
sourceb = list_first_item(&dev->bsource_list, struct comp_buffer, sink_list);
428-
sinkb = list_first_item(&dev->bsink_list, struct comp_buffer, source_list);
428+
sinkb = comp_dev_get_first_data_consumer(dev);
429429
eq_fir_set_alignment(&sourceb->stream, &sinkb->stream);
430430
channels = audio_stream_get_channels(&sinkb->stream);
431431
frame_fmt = audio_stream_get_frm_fmt(&sourceb->stream);

src/audio/eq_fir/eq_fir_ipc4.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ int eq_fir_params(struct processing_module *mod)
6262
sourceb = list_first_item(&dev->bsource_list, struct comp_buffer, sink_list);
6363
ipc4_update_buffer_format(sourceb, &mod->priv.cfg.base_cfg.audio_fmt);
6464

65-
sinkb = list_first_item(&dev->bsink_list, struct comp_buffer, source_list);
65+
sinkb = comp_dev_get_first_data_consumer(dev);
6666
ipc4_update_buffer_format(sinkb, &mod->priv.cfg.base_cfg.audio_fmt);
6767

6868
return 0;

0 commit comments

Comments
 (0)