Skip to content

P20 drc #11001

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
+703 −125
Open

P20 drc #11001

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
27505f3
test(cmocka, drc): add DRC process unit test
piotrhoppeintel Jul 10, 2026
5b67ca0
test(cmocka, drc): adopt test to use SOF API
piotrhoppeintel Jul 10, 2026
ce1d88e
audio: drc: switch to source/sink processing API
piotrhoppeintel Jul 10, 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
55 changes: 42 additions & 13 deletions src/audio/drc/drc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
#include <sof/audio/format.h>
#include <sof/audio/ipc-config.h>
#include <sof/audio/pipeline.h>
#include <sof/audio/sink_source_utils.h>
#include <sof/ipc/msg.h>
#include <sof/lib/memory.h>
#include <sof/lib/uuid.h>
Expand Down Expand Up @@ -269,25 +270,30 @@ __cold static int drc_get_config(struct processing_module *mod,
}

static int drc_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 drc_comp_data *cd = module_get_private_data(mod);
struct comp_dev *dev = mod->dev;
struct audio_stream *source = input_buffers[0].data;
struct audio_stream *sink = output_buffers[0].data;
int frames = input_buffers[0].size;
struct sof_source *source = sources[0];
struct sof_sink *sink = sinks[0];
struct cir_buf_source source_buf;
struct cir_buf_sink sink_buf;
size_t source_frame_bytes = source_get_frame_bytes(source);
size_t sink_frame_bytes = sink_get_frame_bytes(sink);
size_t source_bytes, sink_bytes, bytes;
uint32_t frames;
int ret;

comp_dbg(dev, "entry");

/* Check for changed configuration */
if (comp_is_new_data_blob_available(cd->model_handler)) {
cd->config = comp_get_data_blob(cd->model_handler, NULL, NULL);
ret = drc_setup(mod, audio_stream_get_channels(source),
audio_stream_get_rate(source));
ret = drc_setup(mod, source_get_channels(source),
source_get_rate(source));
if (ret < 0) {
comp_err(dev, "drc_copy(), failed DRC setup");
return ret;
Expand All @@ -309,10 +315,32 @@ static int drc_process(struct processing_module *mod,
/* Control pass-though in processing function with switch control */
cd->enabled = cd->config && cd->config->params.enabled && cd->enable_switch;

cd->drc_func(mod, source, sink, frames);
frames = source_sink_avail_frames_aligned(source, sink);
if (!frames)
return 0;

source_bytes = frames * source_frame_bytes;
sink_bytes = frames * sink_frame_bytes;

/* acquire source and sink circular buffers for the whole period */
ret = source_get_data(source, source_bytes, &source_buf.ptr,
&source_buf.buf_start, &bytes);
if (ret < 0)
return ret;
source_buf.buf_end = (const char *)source_buf.buf_start + bytes;

ret = sink_get_buffer(sink, sink_bytes, &sink_buf.ptr, &sink_buf.buf_start, &bytes);
if (ret < 0) {
source_release_data(source, 0);
return ret;
}
sink_buf.buf_end = (char *)sink_buf.buf_start + bytes;
Comment on lines +325 to +337

cd->drc_func(mod, &source_buf, &sink_buf, frames);

/* calc new free and available */
module_update_buffer_position(&input_buffers[0], &output_buffers[0], frames);
/* commit the consumed and produced data */
source_release_data(source, source_bytes);
sink_commit_buffer(sink, sink_bytes);
return 0;
}

Expand Down Expand Up @@ -367,6 +395,7 @@ static int drc_prepare(struct processing_module *mod,
cd->source_format = audio_stream_get_frm_fmt(&sourceb->stream);
channels = audio_stream_get_channels(&sinkb->stream);
rate = audio_stream_get_rate(&sinkb->stream);
cd->channels = channels;

/* Initialize DRC */
comp_info(dev, "source_format=%d", cd->source_format);
Expand Down Expand Up @@ -414,7 +443,7 @@ static int drc_reset(struct processing_module *mod)
static const struct module_interface drc_interface = {
.init = drc_init,
.prepare = drc_prepare,
.process_audio_stream = drc_process,
.process = drc_process,
.set_configuration = drc_set_config,
.get_configuration = drc_get_config,
.reset = drc_reset,
Expand Down
11 changes: 7 additions & 4 deletions src/audio/drc/drc.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@
#include "drc_user.h"

struct audio_stream;
struct cir_buf_source;
struct cir_buf_sink;
struct comp_dev;

/* Define CONFIG_DRC_MAX_PRE_DELAY_FRAMES for the build purposes without Kconfig,
Expand Down Expand Up @@ -66,8 +68,8 @@ struct drc_state {
};

typedef void (*drc_func)(struct processing_module *mod,
const struct audio_stream *source,
struct audio_stream *sink,
const struct cir_buf_source *source,
struct cir_buf_sink *sink,
uint32_t frames);

/* DRC component private data */
Expand All @@ -79,6 +81,7 @@ struct drc_comp_data {
bool enabled; /**< control processing via blob and switch */
bool enable_switch; /**< enable switch state */
enum sof_ipc_frame source_format; /**< source frame format */
int channels; /**< number of channels */
drc_func drc_func; /**< processing function */
};

Expand All @@ -91,8 +94,8 @@ extern const struct drc_proc_fnmap drc_proc_fnmap[];
extern const size_t drc_proc_fncount;

void drc_default_pass(struct processing_module *mod,
const struct audio_stream *source,
struct audio_stream *sink, uint32_t frames);
const struct cir_buf_source *source,
struct cir_buf_sink *sink, uint32_t frames);
/**
* \brief Returns DRC processing function.
*/
Expand Down
Loading
Loading