-
Notifications
You must be signed in to change notification settings - Fork 361
Audio: Level multiplier: Add new component #10176
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.
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
Changes from 1 commit
7dee064
99637fa
7aea06f
af635da
36bd4b2
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| # SPDX-License-Identifier: BSD-3-Clause | ||
|
|
||
| if(CONFIG_COMP_LEVEL_MULTIPLIER STREQUAL "m") | ||
| add_subdirectory(llext ${PROJECT_BINARY_DIR}/level_multiplier_llext) | ||
| add_dependencies(app level_multiplier) | ||
| else() | ||
| add_local_sources(sof level_multiplier.c) | ||
| add_local_sources(sof level_multiplier-generic.c) | ||
|
|
||
| if(CONFIG_IPC_MAJOR_4) | ||
| add_local_sources(sof level_multiplier-ipc4.c) | ||
| endif() | ||
| endif() |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| # SPDX-License-Identifier: BSD-3-Clause | ||
|
|
||
| config COMP_LEVEL_MULTIPLIER | ||
| tristate "Level multiplier component" | ||
| default y | ||
| help | ||
| Select for Level multiplier component. This component | ||
| applies a fixed gain to audio. The amount of gain | ||
| is configured in the bytes control that is typically | ||
| set in boot time from topology. It can e.g. increase | ||
| capture sensitivity of voice applications by 20 dB | ||
| compared to media capture. | ||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,262 @@ | ||
| // SPDX-License-Identifier: BSD-3-Clause | ||
| // | ||
| // Copyright(c) 2025 Intel Corporation. | ||
|
|
||
| #include <sof/audio/module_adapter/module/generic.h> | ||
| #include <sof/audio/component.h> | ||
| #include <sof/audio/sink_api.h> | ||
| #include <sof/audio/sink_source_utils.h> | ||
| #include <sof/audio/source_api.h> | ||
| #include <stdint.h> | ||
| #include "level_multiplier.h" | ||
|
|
||
| #define LEVEL_MULTIPLIER_S16_SHIFT Q_SHIFT_BITS_32(15, LEVEL_MULTIPLIER_QXY_Y, 15) | ||
| #define LEVEL_MULTIPLIER_S24_SHIFT Q_SHIFT_BITS_64(23, LEVEL_MULTIPLIER_QXY_Y, 23) | ||
| #define LEVEL_MULTIPLIER_S32_SHIFT Q_SHIFT_BITS_64(31, LEVEL_MULTIPLIER_QXY_Y, 31) | ||
|
|
||
| #if CONFIG_FORMAT_S16LE | ||
| /** | ||
| * level_multiplier_s16() - Process S16_LE format. | ||
| * @mod: Pointer to module data. | ||
| * @source: Source for PCM samples data. | ||
| * @sink: Sink for PCM samples data. | ||
| * @frames: Number of audio data frames to process. | ||
| * | ||
| * This is the processing function for 16-bit signed integer PCM formats. The | ||
| * audio samples are copied from source to sink with gain defined in cd->gain. | ||
| * | ||
| * Return: Value zero for success, otherwise an error code. | ||
| */ | ||
| static int level_multiplier_s16(const struct processing_module *mod, | ||
| struct sof_source *source, | ||
| struct sof_sink *sink, | ||
| uint32_t frames) | ||
| { | ||
| struct level_multiplier_comp_data *cd = module_get_private_data(mod); | ||
| const int32_t gain = cd->gain; | ||
| int16_t const *x, *x_start, *x_end; | ||
| int16_t *y, *y_start, *y_end; | ||
| int x_size, y_size; | ||
| int source_samples_without_wrap; | ||
| int samples_without_wrap; | ||
| int remaining_samples = frames * cd->channels; | ||
| int bytes = frames * cd->frame_bytes; | ||
| int ret; | ||
| int i; | ||
|
|
||
| ret = source_get_data_s16(source, bytes, &x, &x_start, &x_size); | ||
| if (ret) | ||
| return ret; | ||
|
|
||
| /* Similarly get pointer to sink data in circular buffer, buffer start and size. */ | ||
| ret = sink_get_buffer_s16(sink, bytes, &y, &y_start, &y_size); | ||
| if (ret) | ||
| return ret; | ||
|
|
||
| /* Set helper pointers to buffer end for wrap check. Then loop until all | ||
| * samples are processed. | ||
| */ | ||
| x_end = x_start + x_size; | ||
| y_end = y_start + y_size; | ||
| while (remaining_samples) { | ||
| /* Find out samples to process before first wrap or end of data. */ | ||
| source_samples_without_wrap = x_end - x; | ||
| samples_without_wrap = y_end - y; | ||
| samples_without_wrap = MIN(samples_without_wrap, source_samples_without_wrap); | ||
| samples_without_wrap = MIN(samples_without_wrap, remaining_samples); | ||
| for (i = 0; i < samples_without_wrap; i++) { | ||
| *y = q_multsr_sat_32x32_16(*x, gain, LEVEL_MULTIPLIER_S16_SHIFT); | ||
| x++; | ||
| y++; | ||
| } | ||
|
|
||
| /* One of the buffers needs a wrap (or end of data), so check for wrap */ | ||
| x = (x >= x_end) ? x - x_size : x; | ||
| y = (y >= y_end) ? y - y_size : y; | ||
|
|
||
| remaining_samples -= samples_without_wrap; | ||
| } | ||
|
|
||
| /* Update the source and sink for bytes consumed and produced. Return success. */ | ||
| source_release_data(source, bytes); | ||
| sink_commit_buffer(sink, bytes); | ||
| return 0; | ||
| } | ||
| #endif /* CONFIG_FORMAT_S16LE */ | ||
|
|
||
| #if CONFIG_FORMAT_S24LE | ||
| /** | ||
| * level_multiplier_s24() - Process S24_4LE format. | ||
| * @mod: Pointer to module data. | ||
| * @source: Source for PCM samples data. | ||
| * @sink: Sink for PCM samples data. | ||
| * @frames: Number of audio data frames to process. | ||
| * | ||
| * This is the processing function for 24-bit signed integer PCM formats. The | ||
| * audio samples are copied from source to sink with gain defined in cd->gain. | ||
| * | ||
| * Return: Value zero for success, otherwise an error code. | ||
| */ | ||
| static int level_multiplier_s24(const struct processing_module *mod, | ||
| struct sof_source *source, | ||
| struct sof_sink *sink, | ||
| uint32_t frames) | ||
| { | ||
| struct level_multiplier_comp_data *cd = module_get_private_data(mod); | ||
| const int32_t gain = cd->gain; | ||
| int32_t const *x, *x_start, *x_end; | ||
| int32_t *y, *y_start, *y_end; | ||
| int x_size, y_size; | ||
| int source_samples_without_wrap; | ||
| int samples_without_wrap; | ||
| int remaining_samples = frames * cd->channels; | ||
| int bytes = frames * cd->frame_bytes; | ||
| int ret; | ||
| int i; | ||
|
|
||
| ret = source_get_data_s32(source, bytes, &x, &x_start, &x_size); | ||
| if (ret) | ||
| return ret; | ||
|
|
||
| /* Similarly get pointer to sink data in circular buffer, buffer start and size. */ | ||
| ret = sink_get_buffer_s32(sink, bytes, &y, &y_start, &y_size); | ||
| if (ret) | ||
| return ret; | ||
|
|
||
| /* Set helper pointers to buffer end for wrap check. Then loop until all | ||
| * samples are processed. | ||
| */ | ||
| x_end = x_start + x_size; | ||
| y_end = y_start + y_size; | ||
| while (remaining_samples) { | ||
| /* Find out samples to process before first wrap or end of data. */ | ||
| source_samples_without_wrap = x_end - x; | ||
| samples_without_wrap = y_end - y; | ||
| samples_without_wrap = MIN(samples_without_wrap, source_samples_without_wrap); | ||
| samples_without_wrap = MIN(samples_without_wrap, remaining_samples); | ||
| for (i = 0; i < samples_without_wrap; i++) { | ||
| *y = q_multsr_sat_32x32_24(sign_extend_s24(*x), gain, | ||
| LEVEL_MULTIPLIER_S24_SHIFT); | ||
| x++; | ||
| y++; | ||
| } | ||
|
|
||
| /* One of the buffers needs a wrap (or end of data), so check for wrap */ | ||
| x = (x >= x_end) ? x - x_size : x; | ||
| y = (y >= y_end) ? y - y_size : y; | ||
|
|
||
| remaining_samples -= samples_without_wrap; | ||
| } | ||
|
|
||
| /* Update the source and sink for bytes consumed and produced. Return success. */ | ||
| source_release_data(source, bytes); | ||
| sink_commit_buffer(sink, bytes); | ||
| return 0; | ||
| } | ||
| #endif /* CONFIG_FORMAT_S24LE */ | ||
|
|
||
| #if CONFIG_FORMAT_S32LE | ||
| /** | ||
| * level_multiplier_s32() - Process S32_LE format. | ||
| * @mod: Pointer to module data. | ||
| * @source: Source for PCM samples data. | ||
| * @sink: Sink for PCM samples data. | ||
| * @frames: Number of audio data frames to process. | ||
| * | ||
| * This is the processing function for 32-bit signed integer PCM formats. The | ||
| * audio samples are copied from source to sink with gain defined in cd->gain. | ||
| * | ||
| * Return: Value zero for success, otherwise an error code. | ||
| */ | ||
| static int level_multiplier_s32(const struct processing_module *mod, | ||
| struct sof_source *source, | ||
| struct sof_sink *sink, | ||
| uint32_t frames) | ||
| { | ||
| struct level_multiplier_comp_data *cd = module_get_private_data(mod); | ||
| const int32_t gain = cd->gain; | ||
| int32_t const *x, *x_start, *x_end; | ||
| int32_t *y, *y_start, *y_end; | ||
| int x_size, y_size; | ||
| int source_samples_without_wrap; | ||
| int samples_without_wrap; | ||
| int remaining_samples = frames * cd->channels; | ||
| int bytes = frames * cd->frame_bytes; | ||
| int ret; | ||
| int i; | ||
|
|
||
| ret = source_get_data_s32(source, bytes, &x, &x_start, &x_size); | ||
| if (ret) | ||
| return ret; | ||
|
|
||
| /* Similarly get pointer to sink data in circular buffer, buffer start and size. */ | ||
| ret = sink_get_buffer_s32(sink, bytes, &y, &y_start, &y_size); | ||
| if (ret) | ||
| return ret; | ||
|
|
||
| /* Set helper pointers to buffer end for wrap check. Then loop until all | ||
| * samples are processed. | ||
| */ | ||
| x_end = x_start + x_size; | ||
| y_end = y_start + y_size; | ||
| while (remaining_samples) { | ||
| /* Find out samples to process before first wrap or end of data. */ | ||
| source_samples_without_wrap = x_end - x; | ||
| samples_without_wrap = y_end - y; | ||
| samples_without_wrap = MIN(samples_without_wrap, source_samples_without_wrap); | ||
| samples_without_wrap = MIN(samples_without_wrap, remaining_samples); | ||
| for (i = 0; i < samples_without_wrap; i++) { | ||
| *y = q_multsr_sat_32x32(*x, gain, LEVEL_MULTIPLIER_S32_SHIFT); | ||
| x++; | ||
| y++; | ||
| } | ||
|
|
||
| /* One of the buffers needs a wrap (or end of data), so check for wrap */ | ||
| x = (x >= x_end) ? x - x_size : x; | ||
| y = (y >= y_end) ? y - y_size : y; | ||
|
|
||
| remaining_samples -= samples_without_wrap; | ||
| } | ||
|
|
||
| /* Update the source and sink for bytes consumed and produced. Return success. */ | ||
| source_release_data(source, bytes); | ||
| sink_commit_buffer(sink, bytes); | ||
| return 0; | ||
| } | ||
| #endif /* CONFIG_FORMAT_S32LE */ | ||
|
|
||
| /* This struct array defines the used processing functions for | ||
| * the PCM formats | ||
| */ | ||
| const struct level_multiplier_proc_fnmap level_multiplier_proc_fnmap[] = { | ||
| #if CONFIG_FORMAT_S16LE | ||
| { SOF_IPC_FRAME_S16_LE, level_multiplier_s16 }, | ||
| #endif | ||
| #if CONFIG_FORMAT_S24LE | ||
| { SOF_IPC_FRAME_S24_4LE, level_multiplier_s24 }, | ||
| #endif | ||
| #if CONFIG_FORMAT_S32LE | ||
| { SOF_IPC_FRAME_S32_LE, level_multiplier_s32 }, | ||
| #endif | ||
| }; | ||
|
|
||
| /** | ||
| * level_multiplier_find_proc_func() - Find suitable processing function. | ||
| * @src_fmt: Enum value for PCM format. | ||
| * | ||
| * This function finds the suitable processing function to use for | ||
| * the used PCM format. If not found, return NULL. | ||
| * | ||
| * Return: Pointer to processing function for the requested PCM format. | ||
| */ | ||
| level_multiplier_func level_multiplier_find_proc_func(enum sof_ipc_frame src_fmt) | ||
| { | ||
| int i; | ||
|
|
||
| /* Find suitable processing function from map */ | ||
| for (i = 0; i < ARRAY_SIZE(level_multiplier_proc_fnmap); i++) | ||
| if (src_fmt == level_multiplier_proc_fnmap[i].frame_fmt) | ||
| return level_multiplier_proc_fnmap[i].level_multiplier_proc_func; | ||
|
|
||
| return NULL; | ||
| } |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,41 @@ | ||
| // SPDX-License-Identifier: BSD-3-Clause | ||
| // | ||
| // Copyright(c) 2025 Intel Corporation. | ||
|
|
||
| #include <sof/audio/module_adapter/module/generic.h> | ||
| #include <sof/audio/component.h> | ||
| #include "level_multiplier.h" | ||
|
|
||
| LOG_MODULE_DECLARE(level_multiplier, CONFIG_SOF_LOG_LEVEL); | ||
|
|
||
| /* IPC4 controls handler */ | ||
| __cold int level_multiplier_set_config(struct processing_module *mod, | ||
| uint32_t param_id, | ||
| enum module_cfg_fragment_position pos, | ||
| uint32_t data_offset_size, | ||
| const uint8_t *fragment, | ||
| size_t fragment_size, | ||
| uint8_t *response, | ||
| size_t response_size) | ||
| { | ||
| struct level_multiplier_comp_data *cd = module_get_private_data(mod); | ||
| struct comp_dev *dev = mod->dev; | ||
|
|
||
| assert_can_be_cold(); | ||
|
|
||
| switch (param_id) { | ||
| case SOF_IPC4_SWITCH_CONTROL_PARAM_ID: | ||
| case SOF_IPC4_ENUM_CONTROL_PARAM_ID: | ||
| comp_err(dev, "Illegal control param_id %d.", param_id); | ||
| return -EINVAL; | ||
| } | ||
|
|
||
|
singalsu marked this conversation as resolved.
|
||
| if (fragment_size != sizeof(int32_t)) { | ||
| comp_err(dev, "Illegal fragment size %d.", fragment_size); | ||
| return -EINVAL; | ||
| } | ||
|
|
||
| memcpy_s(&cd->gain, sizeof(int32_t), fragment, sizeof(int32_t)); | ||
| comp_dbg(mod->dev, "Gain set to %d", cd->gain); | ||
| return 0; | ||
| } | ||
|
Collaborator
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. just don't use
Collaborator
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Yep I removed it and also removed level_multiplier-ipc3.c. I defined set_config for IPC3 build as inline dummy function. The define trick didn't build.
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Sorry, not following, why do we not have a get config here ? i.e. userspace will probably find it useful to know any gain or attenuation in the pipeline. |
||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
btw - mix of tabs/spaces ? Not a blocker.