Skip to content

[DNM] Google aec sink src dp #8469

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

Closed
marcinszkudlinski wants to merge 4 commits into from
Closed

[DNM] Google aec sink src dp #8469

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5fad8de
SQUASH od Deps
marcinszkudlinski Nov 9, 2023
4617712
AEC: remove IPC3 support
marcinszkudlinski Oct 18, 2023
502355f
AEC: convert aec to use sink/src interface
marcinszkudlinski Oct 30, 2023
a551a05
AEC: Enable Google AEC with Mock compliation
marcinszkudlinski Oct 18, 2023
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
3 changes: 3 additions & 0 deletions app/boards/intel_adsp_ace15_mtpm.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,3 +90,6 @@ CONFIG_DEBUG_COREDUMP_MEMORY_DUMP_MIN=y

CONFIG_PROBE=y
CONFIG_PROBE_DMA_MAX=2

CONFIG_COMP_GOOGLE_RTC_AUDIO_PROCESSING=y
CONFIG_COMP_STUBS=y
Copy link
Collaborator

@marc-hb marc-hb Dec 16, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Missing newline, please configure your editor.

6 changes: 3 additions & 3 deletions src/audio/copier/copier.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -405,7 +405,7 @@ static int do_conversion_copy(struct comp_dev *dev,

comp_get_copy_limits(src, sink, processed_data);

i = IPC4_SINK_QUEUE_ID(sink->id);
i = IPC4_SINK_QUEUE_ID(buf_get_id(sink));
if (i >= IPC4_COPIER_MODULE_OUTPUT_PINS_COUNT)
return -EINVAL;
buffer_stream_invalidate(src, processed_data->source_bytes);
Expand Down Expand Up @@ -483,7 +483,7 @@ static int copier_module_copy(struct processing_module *mod,
uint32_t samples;
int sink_queue_id;

sink_queue_id = IPC4_SINK_QUEUE_ID(sink_c->id);
sink_queue_id = IPC4_SINK_QUEUE_ID(buf_get_id(sink_c));
if (sink_queue_id >= IPC4_COPIER_MODULE_OUTPUT_PINS_COUNT)
return -EINVAL;

Expand Down Expand Up @@ -668,7 +668,7 @@ static int copier_set_sink_fmt(struct comp_dev *dev, const void *data,

sink = container_of(sink_list, struct comp_buffer, source_list);

sink_id = IPC4_SINK_QUEUE_ID(sink->id);
sink_id = IPC4_SINK_QUEUE_ID(buf_get_id(sink));
if (sink_id == sink_fmt->sink_id) {
ipc4_update_buffer_format(sink, &sink_fmt->sink_fmt);
break;
Expand Down
2 changes: 1 addition & 1 deletion src/audio/copier/copier_generic.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ void copier_update_params(struct copier_data *cd, struct comp_dev *dev,

sink = container_of(sink_list, struct comp_buffer, source_list);

j = IPC4_SINK_QUEUE_ID(sink->id);
j = IPC4_SINK_QUEUE_ID(buf_get_id(sink));

ipc4_update_buffer_format(sink, &cd->out_fmt[j]);
}
Expand Down
4 changes: 2 additions & 2 deletions src/audio/dai-zephyr.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -284,7 +284,7 @@ dai_dma_cb(struct dai_data *dd, struct comp_dev *dev, uint32_t bytes,

sink_dev = sink->sink;

j = IPC4_SINK_QUEUE_ID(sink->id);
j = IPC4_SINK_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",
Expand Down Expand Up @@ -1635,7 +1635,7 @@ int dai_zephyr_unbind(struct dai_data *dd, struct comp_dev *dev, void *data)
buf_id = IPC4_COMP_ID(bu->extension.r.src_queue, bu->extension.r.dst_queue);

if (dd && dd->local_buffer) {
if (dd->local_buffer->id == buf_id) {
if (buf_get_id(dd->local_buffer) == buf_id) {
comp_dbg(dev, "dai_zephyr_unbind: local_buffer %x unbound", buf_id);
dd->local_buffer = NULL;
}
Expand Down
8 changes: 5 additions & 3 deletions src/audio/dp_queue.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,8 @@ static const struct sink_ops dp_queue_sink_ops = {
.audio_set_ipc_params = dp_queue_set_ipc_params_sink,
};

struct dp_queue *dp_queue_create(size_t min_available, size_t min_free_space, uint32_t flags)
struct dp_queue *dp_queue_create(size_t min_available, size_t min_free_space, uint32_t flags,
uint32_t id)
{
struct dp_queue *dp_queue;

Expand Down Expand Up @@ -286,8 +287,9 @@ struct dp_queue *dp_queue_create(size_t min_available, size_t min_free_space, ui
if (!dp_queue->_data_buffer)
goto err;

tr_info(&dp_queue_tr, "DpQueue created, shared: %u min_available: %u min_free_space %u, size %u",
dp_queue_is_shared(dp_queue), min_available, min_free_space,
dp_queue->audio_stream_params.id = id;
tr_info(&dp_queue_tr, "DpQueue created, id: %u shared: %u min_available: %u min_free_space %u, size %u",
id, dp_queue_is_shared(dp_queue), min_available, min_free_space,
dp_queue->data_buffer_size);

/* return a pointer to allocated structure */
Expand Down
3 changes: 2 additions & 1 deletion src/audio/google/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ config COMP_GOOGLE_RTC_AUDIO_PROCESSING
bool "Google Real Time Communication Audio processing"
select COMP_BLOB
select GOOGLE_RTC_AUDIO_PROCESSING_MOCK if COMP_STUBS
depends on IPC_MAJOR_4
Copy link
Collaborator

@marc-hb marc-hb Dec 16, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@cujomalainey, @andyross I think this is how this PR excluded google_rtc_audio_processing.c from the compilation check:

https://github.com/thesofproject/sof/actions/runs/6815375008/job/18534330110?pr=8469

warning: COMP_GOOGLE_RTC_AUDIO_PROCESSING (defined at
/home/runner/work/sof/sof/workspace/sof/zephyr/../src/audio/google/Kconfig:15) was assigned the
value 'y' but got the value 'n'. Check these unsatisfied dependencies: IPC_MAJOR_4 (=n)

CONFIG_COMP_GOOGLE_RTC_AUDIO_PROCESSING=y is in app/stub_build_all_ipc3.conf but not in app/stub_build_all_ipc4.conf. I've noticed other differences between these two .conf files; you may want to bring them somewhat back in sync again.

default n
help
Select for Google real-time communication audio processing. It
Expand All @@ -35,7 +36,7 @@ config COMP_GOOGLE_RTC_AUDIO_PROCESSING_SAMPLE_RATE_HZ
config COMP_GOOGLE_RTC_AUDIO_PROCESSING_NUM_CHANNELS
depends on COMP_GOOGLE_RTC_AUDIO_PROCESSING
int "Number of channels to process for Google Real Time Communication Audio processing"
default 1
default 4
help
Sets the number of channels to process in the Google real-time
communication audio processing.
Expand Down
Loading