Skip to content

audio: dai: add NULL converter guard in IPC4 playback fanout #10775

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
abonislawski wants to merge 1 commit into
base: main
Choose a base branch
from
+27 −23
Open

audio: dai: add NULL converter guard in IPC4 playback fanout #10775

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 27 additions & 23 deletions src/audio/dai-zephyr.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -310,37 +310,41 @@ dai_dma_cb(struct dai_data *dd, struct comp_dev *dev, uint32_t bytes,
/*
* copy from local buffer to all sinks that are not gateway buffers
* using the right PCM converter function.
* Skip in case of endpoint DAI devices created by the copier.
*/
struct comp_buffer *sink;
if (converter) {
struct comp_buffer *sink;

comp_dev_for_each_consumer(dev, sink) {
struct comp_dev *sink_dev;
int j;
comp_dev_for_each_consumer(dev, sink) {
struct comp_dev *sink_dev;
int j;

if (sink == dd->dma_buffer)
continue;
if (sink == dd->dma_buffer)
continue;

sink_dev = comp_buffer_get_sink_component(sink);
sink_dev = comp_buffer_get_sink_component(sink);

j = IPC4_SRC_QUEUE_ID(buf_get_id(sink));
j = IPC4_SRC_QUEUE_ID(buf_get_id(sink));

if (j >= IPC4_COPIER_MODULE_OUTPUT_PINS_COUNT) {
comp_err(dev, "Sink queue ID: %d >= max output pin count: %d\n",
j, IPC4_COPIER_MODULE_OUTPUT_PINS_COUNT);
ret = -EINVAL;
continue;
}
if (j >= IPC4_COPIER_MODULE_OUTPUT_PINS_COUNT) {
comp_err(dev, "Sink queue ID: %d >= max output pin count: %d\n",
j, IPC4_COPIER_MODULE_OUTPUT_PINS_COUNT);
ret = -EINVAL;
continue;
}

if (!converter[j]) {
comp_err(dev, "No PCM converter for sink queue %d\n", j);
ret = -EINVAL;
continue;
}
if (!converter[j]) {
comp_err(dev, "No PCM converter for sink queue %d\n", j);
ret = -EINVAL;
continue;
}

if (sink_dev && sink_dev->state == COMP_STATE_ACTIVE &&
audio_buffer_hw_params_configured(&sink->audio_buffer)) {
ret = stream_copy_from_no_consume(dev, dd->local_buffer, sink,
converter[j], bytes, dd->chmap);
if (sink_dev && sink_dev->state == COMP_STATE_ACTIVE &&
audio_buffer_hw_params_configured(&sink->audio_buffer)) {
ret = stream_copy_from_no_consume(dev, dd->local_buffer,
sink, converter[j],
bytes, dd->chmap);
}
}
}
#endif
Expand Down
Loading