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

Show file tree
Hide file tree
Changes from all commits
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
114 changes: 64 additions & 50 deletions src/audio/volume/volume.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,6 +216,9 @@ static const struct comp_zc_func_map zc_func_map[] = {
*/
static inline int32_t volume_linear_ramp(struct vol_data *cd, int32_t ramp_time, int channel)
{
if (!cd->initial_ramp)
return cd->tvolume[channel];

return cd->rvolume[channel] + ramp_time * cd->ramp_coef[channel];
}
#endif
Expand Down Expand Up @@ -249,7 +252,7 @@ void volume_set_ramp_channel_counter(struct vol_data *cd, uint32_t channels_coun
bool is_same_volume = true;

for (i = 1; i < channels_count; i++) {
if (cd->tvolume[0] != cd->tvolume[i]) {
if (cd->tvolume[0] != cd->tvolume[i] || cd->volume[0] != cd->volume[i]) {
is_same_volume = false;
break;
}
Expand Down Expand Up @@ -344,7 +347,8 @@ static inline void volume_ramp(struct processing_module *mod)
}
}

set_volume_process(cd, dev, true);
if (cd->is_passthrough)
singalsu marked this conversation as resolved.
Show resolved Hide resolved
set_volume_process(cd, dev, true);
}

/**
Expand Down Expand Up @@ -415,6 +419,59 @@ static int volume_free(struct processing_module *mod)
return 0;
}

static void set_linear_ramp_coef(struct vol_data *cd, int chan, bool constant_rate_ramp)
{
int32_t delta;
int32_t delta_abs;
int32_t coef;

if (!cd->initial_ramp)
return;

/* Get volume transition delta and absolute value */
delta = cd->tvolume[chan] - cd->volume[chan];
if (!delta) {
cd->ramp_coef[chan] = 0;
return;
}

delta_abs = ABS(delta);

/* The ramp length (initial_ramp [ms]) describes time of mute
* to vol_max unmuting. Normally the volume ramp has a
* constant linear slope defined this way and variable
* completion time. However in streaming start it is feasible
* to apply the entire topology defined ramp time to unmute to
* any used volume. In this case the ramp rate is not constant.
* Note also the legacy mode without known vol_ramp_range where
* the volume transition always uses the topology defined time.
*/
if (constant_rate_ramp && cd->vol_ramp_range > 0)
coef = cd->vol_ramp_range;
else
coef = delta_abs;

/* Divide and round to nearest. Note that there will
* be some accumulated error in ramp time the longer
* the ramp and the smaller the transition is.
*/
coef = (2 * coef / cd->initial_ramp + 1) >> 1;
singalsu marked this conversation as resolved.
Show resolved Hide resolved

/* Scale coefficient by 1/8, round */
coef = ((coef >> 2) + 1) >> 1;
singalsu marked this conversation as resolved.
Show resolved Hide resolved

/* Ensure ramp coefficient is at least min. non-zero
* fractional value.
*/
coef = MAX(coef, 1);

/* Invert sign for volume down ramp step */
if (delta < 0)
coef = -coef;

cd->ramp_coef[chan] = coef;
}

/**
* \brief Sets channel target volume.
* \param[in,out] mod Volume processing module handle
Expand All @@ -429,9 +486,6 @@ int volume_set_chan(struct processing_module *mod, int chan,
{
struct vol_data *cd = module_get_private_data(mod);
int32_t v = vol;
int32_t delta;
int32_t delta_abs;
int32_t coef;

/* Limit received volume gain to MIN..MAX range before applying it.
* MAX is needed for now for the generic C gain arithmetic to prevent
Expand All @@ -456,52 +510,12 @@ int volume_set_chan(struct processing_module *mod, int chan,
cd->rvolume[chan] = cd->volume[chan];
cd->vol_ramp_elapsed_frames = 0;

/* Check ramp type */
if (cd->ramp_type == SOF_VOLUME_LINEAR ||
cd->ramp_type == SOF_VOLUME_LINEAR_ZC) {
/* Get volume transition delta and absolute value */
delta = cd->tvolume[chan] - cd->volume[chan];
delta_abs = ABS(delta);

/* The ramp length (initial_ramp [ms]) describes time of mute
* to vol_max unmuting. Normally the volume ramp has a
* constant linear slope defined this way and variable
* completion time. However in streaming start it is feasible
* to apply the entire topology defined ramp time to unmute to
* any used volume. In this case the ramp rate is not constant.
* Note also the legacy mode without known vol_ramp_range where
* the volume transition always uses the topology defined time.
*/
if (cd->initial_ramp > 0) {
if (constant_rate_ramp && cd->vol_ramp_range > 0)
coef = cd->vol_ramp_range;
else
coef = delta_abs;

/* Divide and round to nearest. Note that there will
* be some accumulated error in ramp time the longer
* the ramp and the smaller the transition is.
*/
coef = (2 * coef / cd->initial_ramp + 1) >> 1;
} else {
coef = delta_abs;
}

/* Scale coefficient by 1/8, round */
coef = ((coef >> 2) + 1) >> 1;
/* Ramp type specific initialize */
if (cd->ramp_type == SOF_VOLUME_LINEAR || cd->ramp_type == SOF_VOLUME_LINEAR_ZC)
set_linear_ramp_coef(cd, chan, constant_rate_ramp);

/* Ensure ramp coefficient is at least min. non-zero
* fractional value.
*/
coef = MAX(coef, 1);

/* Invert sign for volume down ramp step */
if (delta < 0)
coef = -coef;

cd->ramp_coef[chan] = coef;
comp_dbg(mod->dev, "cd->ramp_coef[%d] = %d", chan, cd->ramp_coef[chan]);
}
if (!cd->initial_ramp || cd->ramp_type == SOF_VOLUME_WINDOWS_NO_FADE)
cd->volume[chan] = v;

return 0;
}
Expand Down
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
Loading