OrgACRN
/
sof
mirror of https://github.com/thesofproject/sof.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

ipc4: Aligned names of fields in ipc4_peak_volume_regs structure 

Changed names of peak_meter_, current_volume_ and target_volume_
fields in the ipc4_peak_volume_regs structure to comply with the
convention used in the project - deleted postfix _.

Signed-off-by: Adrian Warecki <adrian.warecki@intel.com>
This commit is contained in:
Adrian Warecki 2022-06-15 14:06:01 +02:00 committed by Liam Girdwood
parent 75f6912b3d
commit bfa4af45ab
4 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/audio/module_adapter/module/volume/volume.c
View File

@ -467,9 +467,9 @@ static int set_volume_ipc4(struct vol_data *cd, uint32_t const channel,
uint64_t const curve_duration)
{
/* update target volume in peak_regs */
cd->peak_regs.target_volume_[channel] = target_volume;
cd->peak_regs.target_volume[channel] = target_volume;
/* update peak meter in peak_regs */
cd->peak_regs.peak_meter_[channel] = 0;
cd->peak_regs.peak_meter[channel] = 0;
/* init target volume */
cd->tvolume[channel] = target_volume;
@ -992,7 +992,7 @@ static int volume_get_config(struct processing_module *mod,
switch (config_id) {
case IPC4_VOLUME:
for (i = 0; i < cd->channels; i++) {
uint32_t volume = cd->peak_regs.target_volume_[i];
uint32_t volume = cd->peak_regs.target_volume[i];
cdata[i].channel_id = i;
cdata[i].target_volume = convert_volume_ipc3_to_ipc4(volume);
@ -1055,7 +1055,7 @@ static void volume_update_current_vol_ipc4(struct vol_data *cd)
assert(cd);
for (i = 0; i < cd->channels; i++)
cd->peak_regs.current_volume_[i] = cd->volume[i];
cd->peak_regs.current_volume[i] = cd->volume[i];
#endif
}

6
src/audio/module_adapter/module/volume/volume_generic.c
View File

@ -92,7 +92,7 @@ static void vol_s24_to_s24(struct processing_module *mod, struct input_stream_bu
y0 += nch;
}
#if CONFIG_COMP_PEAK_VOL
cd->peak_regs.peak_meter_[j] = tmp;
cd->peak_regs.peak_meter[j] = tmp;
#endif
}
remaining_samples -= n;
@ -158,7 +158,7 @@ static void vol_s32_to_s32(struct processing_module *mod, struct input_stream_bu
y0 += nch;
}
#if CONFIG_COMP_PEAK_VOL
cd->peak_regs.peak_meter_[j] = tmp;
cd->peak_regs.peak_meter[j] = tmp;
#endif
}
remaining_samples -= n;
@ -222,7 +222,7 @@ static void vol_s16_to_s16(struct processing_module *mod, struct input_stream_bu
y0 += nch;
}
#if CONFIG_COMP_PEAK_VOL
cd->peak_regs.peak_meter_[j] = tmp;
cd->peak_regs.peak_meter[j] = tmp;
#endif
}
remaining_samples -= n;

2
src/audio/module_adapter/module/volume/volume_hifi3.c
View File

@ -47,7 +47,7 @@ static void vol_store_gain(struct vol_data *cd, const int channels_count)
static inline void peak_vol_calc(struct vol_data *cd, ae_f32x2 out_sample, size_t channel)
{
#if CONFIG_COMP_PEAK_VOL
cd->peak_regs.peak_meter_[channel] = AE_MAX32(out_sample, cd->peak_regs.peak_meter_[channel]);
cd->peak_regs.peak_meter[channel] = AE_MAX32(out_sample, cd->peak_regs.peak_meter[channel]);
#endif
}

6
src/include/ipc4/fw_reg.h
View File

@ -71,9 +71,9 @@ struct ipc4_pipeline_registers {
#define IPC4_PV_MAX_SUPPORTED_CHANNELS 8
struct ipc4_peak_volume_regs {
uint32_t peak_meter_[IPC4_PV_MAX_SUPPORTED_CHANNELS];
uint32_t current_volume_[IPC4_PV_MAX_SUPPORTED_CHANNELS];
uint32_t target_volume_[IPC4_PV_MAX_SUPPORTED_CHANNELS];
uint32_t peak_meter[IPC4_PV_MAX_SUPPORTED_CHANNELS];
uint32_t current_volume[IPC4_PV_MAX_SUPPORTED_CHANNELS];
uint32_t target_volume[IPC4_PV_MAX_SUPPORTED_CHANNELS];
} __attribute__((packed, aligned(4)));
struct ipc4_llp_reading {