Skip to content
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

Jump to bottom

Audio: Volume: Fix ongoing gain ramp stop and wrong final gain #8950

Merged
merged 5 commits into from
Apr 11, 2024
Merged

Audio: Volume: Fix ongoing gain ramp stop and wrong final gain #8950

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1c2d6ac
Audio: Volume: Fix ongoing gain ramp stop and wrong final gain
singalsu Mar 14, 2024
5efacbc
Audio: Volume: Add linear ramp coefficient function with fixes
singalsu Mar 15, 2024
3bd5d02
Audio: Volume: Fix condition for identical ramp
singalsu Mar 15, 2024
cb9d1ae
Audio: Volume: Jump volume directly to target when no ramp
singalsu Mar 20, 2024
ba8af58
Audio: Volume: No update of process function for every ramp value
singalsu Mar 20, 2024
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
31 changes: 8 additions & 23 deletions src/audio/volume/volume_ipc4.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,8 @@ static uint32_t convert_volume_ipc3_to_ipc4(uint32_t volume)

static void init_ramp(struct vol_data *cd, uint32_t curve_duration, uint32_t target_volume)
{
cd->ramp_finished = false;

/* In IPC4 driver sends curve_duration in hundred of ns - it should be
* converted into ms value required by firmware
*/
Expand Down Expand Up @@ -213,8 +215,6 @@ static int volume_set_volume(struct processing_module *mod, const uint8_t *data,
}

init_ramp(cd, cdata.curve_duration, cdata.target_volume);
cd->ramp_finished = true;

channels_count = mod->priv.cfg.base_cfg.audio_fmt.channels_count;
if (channels_count > SOF_IPC_MAX_CHANNELS) {
comp_err(dev, "Invalid channels count %u", channels_count);
Expand All @@ -232,8 +232,6 @@ static int volume_set_volume(struct processing_module *mod, const uint8_t *data,

singalsu marked this conversation as resolved.
Show resolved Hide resolved
volume_set_chan(mod, i, cd->tvolume[i], true);
}
if (cd->volume[i] != cd->tvolume[i])
cd->ramp_finished = false;
}
} else {
if (cd->muted[cdata.channel_id]) {
Expand All @@ -247,25 +245,12 @@ static int volume_set_volume(struct processing_module *mod, const uint8_t *data,
volume_set_chan(mod, cdata.channel_id,
cd->tvolume[cdata.channel_id], true);
}
if (cd->volume[cdata.channel_id] != cd->tvolume[cdata.channel_id])
cd->ramp_finished = false;
}

cd->is_passthrough = cd->ramp_finished;

for (i = 0; i < channels_count; i++) {
if (cd->volume[i] != VOL_ZERO_DB) {
cd->is_passthrough = false;
break;
}
}

cd->is_passthrough = false;
lyakh marked this conversation as resolved.
Show resolved Hide resolved
volume_set_ramp_channel_counter(cd, channels_count);

cd->scale_vol = vol_get_processing_function(dev, cd);

volume_prepare_ramp(dev, cd);

return 0;
}

Expand Down Expand Up @@ -322,8 +307,6 @@ static int volume_set_switch(struct processing_module *mod, const uint8_t *data,

ctl = (struct sof_ipc4_control_msg_payload *)data;

cd->ramp_finished = true;

channels_count = mod->priv.cfg.base_cfg.audio_fmt.channels_count;
if (channels_count > SOF_IPC_MAX_CHANNELS) {
comp_err(dev, "Invalid channels count %u", channels_count);
Expand All @@ -344,11 +327,13 @@ static int volume_set_switch(struct processing_module *mod, const uint8_t *data,
volume_set_chan_unmute(mod, i);
else
volume_set_chan_mute(mod, i);

if (cd->volume[i] != cd->tvolume[i])
cd->ramp_finished = false;
}

cd->ramp_finished = false;
cd->is_passthrough = false;
volume_set_ramp_channel_counter(cd, channels_count);
cd->scale_vol = vol_get_processing_function(dev, cd);
volume_prepare_ramp(dev, cd);
return 0;
}

Expand Down