Skip to content

P20 selector - convert the selector module to only use the sink/source #11243

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
piotrhoppeintel wants to merge 3 commits into
base: main
Choose a base branch
from
Open

P20 selector - convert the selector module to only use the sink/source #11243

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c148646
audio: sink_source_utils: add source release and commit helper
piotrhoppeintel Sep 28, 2026
3d27b5e
audio: selector: rework module to use sink/source api
piotrhoppeintel May 29, 2026
8baa6ed
test: selector: update unit test for sink/source API
piotrhoppeintel Sep 28, 2026
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
63 changes: 27 additions & 36 deletions src/audio/selector/selector.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
#include <sof/audio/component.h>
#include <sof/audio/pipeline.h>
#include <sof/audio/selector.h>
#include <sof/audio/sink_source_utils.h>
#include <sof/audio/ipc-config.h>
#include <sof/common.h>
#include <rtos/panic.h>
Expand Down Expand Up @@ -450,36 +451,32 @@ static int selector_copy(struct comp_dev *dev)
{
struct comp_data *cd = comp_get_drvdata(dev);
struct comp_buffer *sink, *source;
uint32_t frames;
uint32_t source_bytes;
uint32_t sink_bytes;
struct sof_source *src;
struct sof_sink *snk;
size_t frames;

comp_dbg(dev, "entry");

/* selector component will have 1 source and 1 sink buffer */
source = comp_dev_get_first_data_producer(dev);
sink = comp_dev_get_first_data_consumer(dev);

if (!audio_stream_get_avail(&source->stream))
return PPL_STATUS_PATH_STOP;
src = audio_buffer_get_source(&source->audio_buffer);
snk = audio_buffer_get_sink(&sink->audio_buffer);

frames = audio_stream_avail_frames(&source->stream, &sink->stream);
source_bytes = frames * audio_stream_frame_bytes(&source->stream);
sink_bytes = frames * audio_stream_frame_bytes(&sink->stream);
if (!source_get_data_available(src))
return PPL_STATUS_PATH_STOP;

comp_dbg(dev, "source_bytes = 0x%x, sink_bytes = 0x%x",
source_bytes, sink_bytes);
frames = MIN(source_get_data_frames_available(src),
sink_get_free_frames(snk));

/* copy selected channels from in to out */
buffer_stream_invalidate(source, source_bytes);
cd->sel_func(dev, &sink->stream, &source->stream, frames);
buffer_stream_writeback(sink, sink_bytes);
comp_dbg(dev, "frames = 0x%zx", frames);

/* calculate new free and available */
comp_update_buffer_produce(sink, sink_bytes);
comp_update_buffer_consume(source, source_bytes);
if (!frames)
return 0;

return 0;
/* copy selected channels from in to out */
return cd->sel_func(dev, snk, src, frames);
}

/**
Expand Down Expand Up @@ -1021,15 +1018,11 @@ static int selector_find_coefficients(struct processing_module *mod)
* \return Error code.
*/
static int selector_process(struct processing_module *mod,
struct input_stream_buffer *input_buffers,
int num_input_buffers,
struct output_stream_buffer *output_buffers,
int num_output_buffers)
struct sof_source **sources, int num_of_sources,
struct sof_sink **sinks, int num_of_sinks)
{
struct audio_stream *source;
struct audio_stream *sink;
struct comp_data *cd = module_get_private_data(mod);
uint32_t avail_frames = input_buffers[0].size;
size_t frames;
int ret;

comp_dbg(mod->dev, "entry");
Expand All @@ -1041,19 +1034,17 @@ static int selector_process(struct processing_module *mod,
return ret;
}

if (cd->passthrough) {
source = input_buffers->data;
sink = output_buffers->data;
audio_stream_copy(source, 0, sink, 0, avail_frames * cd->config.in_channels_count);
module_update_buffer_position(input_buffers, output_buffers, avail_frames);
frames = MIN(source_get_data_frames_available(sources[0]),
sink_get_free_frames(sinks[0]));
if (!frames)
return 0;
}

if (avail_frames)
/* copy selected channels from in to out */
cd->sel_func(mod, input_buffers, output_buffers, avail_frames);
if (cd->passthrough)
return source_to_sink_copy(sources[0], sinks[0], false,
frames * source_get_frame_bytes(sources[0]));

return 0;
/* copy selected channels from in to out */
return cd->sel_func(mod, sources[0], sinks[0], frames);
}

/**
Expand Down Expand Up @@ -1157,7 +1148,7 @@ static int selector_reset(struct processing_module *mod)
static const struct module_interface selector_interface = {
.init = selector_init,
.prepare = selector_prepare,
.process_audio_stream = selector_process,
.process = selector_process,
.set_configuration = selector_set_config,
.get_configuration = selector_get_config,
.reset = selector_reset,
Expand Down
Loading
Loading