Skip to content

cherry-pick: smart_amp fix and pdm1 topology from main #7121

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
johnylin76 wants to merge 4 commits into from
Closed

cherry-pick: smart_amp fix and pdm1 topology from main #7121

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
3197a49
module_adapter: waves: fix unfreed rballoc memory block
johnylin76 Feb 10, 2023
d06a125
topology1: add PDM1 version for sof-adl-max98360a-rt5682-2way
johnylin76 Feb 12, 2023
c85be7b
smart_amp: fix buffer acquisition
lyakh Apr 13, 2022
6f7cc43
smart_amp: eliminat pops when switch device between speaker and headp…
LongWang100 Feb 7, 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: 2 additions & 1 deletion src/audio/module_adapter/module/waves.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -622,7 +622,7 @@ static int waves_codec_init(struct processing_module *mod)
struct module_config *setup_cfg = &waves_codec->setup_cfg;

/* allocate memory for set up config */
setup_cfg->data = rballoc(0, SOF_MEM_CAPS_RAM, codec->cfg.size);
setup_cfg->data = module_allocate_memory(mod, codec->cfg.size, 16);
if (!setup_cfg->data) {
comp_err(dev, "waves_codec_init(): failed to alloc setup config");
module_free_memory(mod, waves_codec);
Expand All @@ -634,6 +634,7 @@ static int waves_codec_init(struct processing_module *mod)
ret = memcpy_s(setup_cfg->data, setup_cfg->size, codec->cfg.data, setup_cfg->size);
if (ret) {
comp_err(dev, "waves_codec_init(): failed to copy setup config %d", ret);
module_free_memory(mod, setup_cfg->data);
module_free_memory(mod, waves_codec);
return ret;
}
Expand Down
165 changes: 81 additions & 84 deletions src/audio/smart_amp/smart_amp.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ DECLARE_TR_CTX(maxim_dsm_comp_tr, SOF_UUID(maxim_dsm_comp_uuid),
#define SOF_SMART_AMP_MODEL 1

typedef int(*smart_amp_proc)(struct comp_dev *dev,
const struct audio_stream *source,
const struct audio_stream *sink, uint32_t frames,
const struct audio_stream __sparse_cache *source,
const struct audio_stream __sparse_cache *sink, uint32_t frames,
int8_t *chan_map, bool is_feedback);

struct smart_amp_data {
Expand Down Expand Up @@ -516,8 +516,11 @@ static int smart_amp_trigger(struct comp_dev *dev, int cmd)
switch (cmd) {
case COMP_TRIGGER_START:
case COMP_TRIGGER_RELEASE:
if (sad->feedback_buf)
buffer_zero(sad->feedback_buf);
if (sad->feedback_buf) {
struct comp_buffer __sparse_cache *buf = buffer_acquire(sad->feedback_buf);
buffer_zero(buf);
buffer_release(buf);
}
break;
case COMP_TRIGGER_PAUSE:
case COMP_TRIGGER_STOP:
Expand All @@ -530,8 +533,8 @@ static int smart_amp_trigger(struct comp_dev *dev, int cmd)
}

static int smart_amp_process(struct comp_dev *dev,
const struct audio_stream *source,
const struct audio_stream *sink,
const struct audio_stream __sparse_cache *source,
const struct audio_stream __sparse_cache *sink,
uint32_t frames, int8_t *chan_map,
bool is_feedback)
{
Expand All @@ -540,14 +543,14 @@ static int smart_amp_process(struct comp_dev *dev,

if (!is_feedback)
ret = smart_amp_ff_copy(dev, frames,
sad->source_buf, sad->sink_buf,
source, sink,
chan_map, sad->mod_handle,
sad->in_channels, sad->out_channels);
else
ret = smart_amp_fb_copy(dev, frames,
sad->feedback_buf, sad->sink_buf,
source, sink,
chan_map, sad->mod_handle,
sad->feedback_buf->stream.channels);
source->channels);
return ret;
}

Expand All @@ -569,83 +572,70 @@ static smart_amp_proc get_smart_amp_process(struct comp_dev *dev)
static int smart_amp_copy(struct comp_dev *dev)
{
struct smart_amp_data *sad = comp_get_drvdata(dev);
struct comp_buffer *source_buf = sad->source_buf;
struct comp_buffer *sink_buf = sad->sink_buf;
struct comp_buffer __sparse_cache *source_buf = buffer_acquire(sad->source_buf);
struct comp_buffer __sparse_cache *sink_buf = buffer_acquire(sad->sink_buf);
uint32_t avail_passthrough_frames;
uint32_t avail_feedback_frames;
uint32_t avail_frames;
uint32_t source_bytes;
uint32_t sink_bytes;
uint32_t feedback_bytes;
int ret = 0;

comp_dbg(dev, "smart_amp_copy()");

source_buf = buffer_acquire(source_buf);
sink_buf = buffer_acquire(sink_buf);

/* available bytes and samples calculation */
avail_passthrough_frames =
audio_stream_avail_frames(&sad->source_buf->stream,
&sad->sink_buf->stream);

source_buf = buffer_release(source_buf);
sink_buf = buffer_release(sink_buf);
avail_passthrough_frames = audio_stream_avail_frames(&source_buf->stream,
&sink_buf->stream);

avail_frames = avail_passthrough_frames;

if (sad->feedback_buf) {
struct comp_buffer *buf = sad->feedback_buf;
struct comp_buffer __sparse_cache *feedback_buf = buffer_acquire(sad->feedback_buf);

buf = buffer_acquire(buf);
if (comp_get_state(dev, buf->source) == dev->state) {
if (comp_get_state(dev, feedback_buf->source) == dev->state) {
/* feedback */
avail_feedback_frames =
audio_stream_get_avail_frames(&buf->stream);
audio_stream_get_avail_frames(&feedback_buf->stream);

avail_frames = MIN(avail_passthrough_frames,
avail_feedback_frames);
avail_feedback_frames = MIN(avail_passthrough_frames,
avail_feedback_frames);

feedback_bytes = avail_frames *
audio_stream_frame_bytes(&buf->stream);

buffer_release(buf);
feedback_bytes = avail_feedback_frames *
audio_stream_frame_bytes(&feedback_buf->stream);

comp_dbg(dev, "smart_amp_copy(): processing %d feedback frames (avail_passthrough_frames: %d)",
avail_frames, avail_passthrough_frames);
avail_feedback_frames, avail_passthrough_frames);

/* perform buffer writeback after source_buf process */
buffer_stream_invalidate(sad->feedback_buf, feedback_bytes);
sad->process(dev, &sad->feedback_buf->stream,
&sad->sink_buf->stream, avail_frames,
buffer_stream_invalidate(feedback_buf, feedback_bytes);
sad->process(dev, &feedback_buf->stream,
&sink_buf->stream, avail_feedback_frames,
sad->config.feedback_ch_map, true);

comp_update_buffer_consume(sad->feedback_buf, feedback_bytes);
} else {
buffer_release(buf);
comp_update_buffer_cached_consume(feedback_buf, feedback_bytes);
}

buffer_release(feedback_buf);
}

/* bytes calculation */
source_buf = buffer_acquire(source_buf);
source_bytes = avail_frames * audio_stream_frame_bytes(&source_buf->stream);
source_buf = buffer_release(source_buf);

sink_buf = buffer_acquire(sink_buf);
sink_bytes = avail_frames * audio_stream_frame_bytes(&sink_buf->stream);
sink_buf = buffer_release(sink_buf);

/* process data */
buffer_stream_invalidate(sad->source_buf, source_bytes);
sad->process(dev, &sad->source_buf->stream, &sad->sink_buf->stream,
buffer_stream_invalidate(source_buf, source_bytes);
sad->process(dev, &source_buf->stream, &sink_buf->stream,
avail_frames, sad->config.source_ch_map, false);
buffer_stream_writeback(sad->sink_buf, sink_bytes);
buffer_stream_writeback(sink_buf, sink_bytes);

/* source/sink buffer pointers update */
comp_update_buffer_consume(sad->source_buf, source_bytes);
comp_update_buffer_produce(sad->sink_buf, sink_bytes);
comp_update_buffer_cached_consume(source_buf, source_bytes);
comp_update_buffer_cached_produce(sink_buf, sink_bytes);

return ret;
buffer_release(sink_buf);
buffer_release(source_buf);

return 0;
}

static int smart_amp_reset(struct comp_dev *dev)
Expand All @@ -666,7 +656,7 @@ static int smart_amp_reset(struct comp_dev *dev)
static int smart_amp_prepare(struct comp_dev *dev)
{
struct smart_amp_data *sad = comp_get_drvdata(dev);
struct comp_buffer *source_buffer;
struct comp_buffer __sparse_cache *source_c, *buf_c;
struct list_item *blist;
int ret;
int bitwidth;
Expand All @@ -679,40 +669,47 @@ static int smart_amp_prepare(struct comp_dev *dev)

/* searching for stream and feedback source buffers */
list_for_item(blist, &dev->bsource_list) {
source_buffer = container_of(blist, struct comp_buffer,
sink_list);
source_buffer = buffer_acquire(source_buffer);
if (source_buffer->source->ipc_config.type == SOF_COMP_DEMUX)
struct comp_buffer *source_buffer = container_of(blist, struct comp_buffer,
sink_list);
source_c = buffer_acquire(source_buffer);

if (source_c->source->ipc_config.type == SOF_COMP_DEMUX) {
sad->feedback_buf = source_buffer;
else
} else {
sad->source_buf = source_buffer;
source_buffer = buffer_release(source_buffer);
sad->in_channels = source_c->stream.channels;
}

buffer_release(source_c);
}

sad->sink_buf = list_first_item(&dev->bsink_list, struct comp_buffer,
source_list);

sad->in_channels = sad->source_buf->stream.channels;
sad->out_channels = sad->sink_buf->stream.channels;
buf_c = buffer_acquire(sad->sink_buf);
sad->out_channels = buf_c->stream.channels;
buffer_release(buf_c);

source_c = buffer_acquire(sad->source_buf);

if (sad->feedback_buf) {
struct comp_buffer *buf = sad->feedback_buf;

buf = buffer_acquire(buf);
buf->stream.channels = sad->config.feedback_channels;
buf->stream.rate = sad->source_buf->stream.rate;
buffer_release(buf);
ret = smart_amp_check_audio_fmt(sad->source_buf->stream.rate,
sad->source_buf->stream.channels);
buf_c = buffer_acquire(sad->feedback_buf);

buf_c->stream.channels = sad->config.feedback_channels;
buf_c->stream.rate = source_c->stream.rate;
buffer_release(buf_c);

ret = smart_amp_check_audio_fmt(source_c->stream.rate,
source_c->stream.channels);
if (ret) {
comp_err(dev, "[DSM] Format not supported, sample rate: %d, ch: %d",
sad->source_buf->stream.rate,
sad->source_buf->stream.channels);
source_c->stream.rate,
source_c->stream.channels);
goto error;
}
}

switch (sad->source_buf->stream.frame_fmt) {
switch (source_c->stream.frame_fmt) {
case SOF_IPC_FRAME_S16_LE:
bitwidth = 16;
break;
Expand All @@ -724,33 +721,33 @@ static int smart_amp_prepare(struct comp_dev *dev)
break;
default:
comp_err(dev, "[DSM] smart_amp_process() error: not supported frame format %d",
sad->source_buf->stream.frame_fmt);
source_c->stream.frame_fmt);
goto error;
}
if (sad->mod_handle->bitwidth != bitwidth) {
sad->mod_handle->bitwidth = bitwidth;
comp_info(dev, "[DSM] Re-initialized for %d bit processing", bitwidth);

ret = smart_amp_init(sad->mod_handle, dev);
if (ret) {
comp_err(dev, "[DSM] Re-initialization error.");
goto error;
}
ret = maxim_dsm_restore_param(sad->mod_handle, dev);
if (ret) {
comp_err(dev, "[DSM] Restoration error.");
goto error;
}
sad->mod_handle->bitwidth = bitwidth;
comp_info(dev, "[DSM] Re-initialized for %d bit processing", bitwidth);

ret = smart_amp_init(sad->mod_handle, dev);
if (ret) {
comp_err(dev, "[DSM] Re-initialization error.");
goto error;
}
ret = maxim_dsm_restore_param(sad->mod_handle, dev);
if (ret) {
comp_err(dev, "[DSM] Restoration error.");
goto error;
}

sad->process = get_smart_amp_process(dev);
if (!sad->process) {
comp_err(dev, "smart_amp_prepare(): get_smart_amp_process failed");
ret = -EINVAL;
goto error;
}

error:
buffer_release(source_c);

smart_amp_flush(sad->mod_handle, dev);
return ret;
}
Expand Down
36 changes: 18 additions & 18 deletions src/audio/smart_amp/smart_amp_generic.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@ static void smart_amp_fb_generic(int32_t x)

#if CONFIG_FORMAT_S16LE
static void smart_amp_s16_ff_default(const struct comp_dev *dev,
const struct audio_stream *source,
const struct audio_stream *sink,
const struct audio_stream *feedback,
const struct audio_stream __sparse_cache *source,
const struct audio_stream __sparse_cache *sink,
const struct audio_stream __sparse_cache *feedback,
uint32_t frames)
{
int16_t *x;
Expand All @@ -52,9 +52,9 @@ static void smart_amp_s16_ff_default(const struct comp_dev *dev,

#if CONFIG_FORMAT_S24LE
static void smart_amp_s24_ff_default(const struct comp_dev *dev,
const struct audio_stream *source,
const struct audio_stream *sink,
const struct audio_stream *feedback,
const struct audio_stream __sparse_cache *source,
const struct audio_stream __sparse_cache *sink,
const struct audio_stream __sparse_cache *feedback,
uint32_t frames)
{
int32_t *x;
Expand All @@ -80,9 +80,9 @@ static void smart_amp_s24_ff_default(const struct comp_dev *dev,

#if CONFIG_FORMAT_S32LE
static void smart_amp_s32_ff_default(const struct comp_dev *dev,
const struct audio_stream *source,
const struct audio_stream *sink,
const struct audio_stream *feedback,
const struct audio_stream __sparse_cache *source,
const struct audio_stream __sparse_cache *sink,
const struct audio_stream __sparse_cache *feedback,
uint32_t frames)
{
int32_t *x;
Expand All @@ -106,9 +106,9 @@ static void smart_amp_s32_ff_default(const struct comp_dev *dev,

#if CONFIG_FORMAT_S16LE
static void smart_amp_s16_fb_default(const struct comp_dev *dev,
const struct audio_stream *source,
const struct audio_stream *sink,
const struct audio_stream *feedback,
const struct audio_stream __sparse_cache *source,
const struct audio_stream __sparse_cache *sink,
const struct audio_stream __sparse_cache *feedback,
uint32_t frames)
{
int16_t *x;
Expand All @@ -130,9 +130,9 @@ static void smart_amp_s16_fb_default(const struct comp_dev *dev,

#if CONFIG_FORMAT_S24LE
static void smart_amp_s24_fb_default(const struct comp_dev *dev,
const struct audio_stream *source,
const struct audio_stream *sink,
const struct audio_stream *feedback,
const struct audio_stream __sparse_cache *source,
const struct audio_stream __sparse_cache *sink,
const struct audio_stream __sparse_cache *feedback,
uint32_t frames)
{
int32_t *x;
Expand All @@ -154,9 +154,9 @@ static void smart_amp_s24_fb_default(const struct comp_dev *dev,

#if CONFIG_FORMAT_S32LE
static void smart_amp_s32_fb_default(const struct comp_dev *dev,
const struct audio_stream *source,
const struct audio_stream *sink,
const struct audio_stream *feedback,
const struct audio_stream __sparse_cache *source,
const struct audio_stream __sparse_cache *sink,
const struct audio_stream __sparse_cache *feedback,
uint32_t frames)
{
int32_t *x;
Expand Down
Loading