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

smart_amp_test: fix crash due to different source formats 

Smart amp test chooses a process function based on the sink only. Because
of this, there's a possibility that one of the sources has a 16bit format,
which can't be safely processed by the 32bit process function. The crash
only happened when dai_copier sent one less sample than usual to the
smart_amp. This makes total sample count an odd number, making the data in
the audio_stream buffer misaligned.

This patch changes the prepare function of smart_amp_test to consider all
the sources and sinks while deciding which process function to use.

Signed-off-by: Tobiasz Dryjanski <tobiaszx.dryjanski@intel.com>
This commit is contained in:
Tobiasz Dryjanski 2024-04-08 16:08:06 +02:00 committed by Liam Girdwood
parent a485f27757
commit 821f961fba
1 changed files with 28 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/samples/audio/smart_amp_test_ipc4.c
View File

@ -327,18 +327,35 @@ static int smart_amp_reset(struct processing_module *mod)
return 0; return 0;
} }
static smart_amp_proc get_smart_amp_process(struct sof_sink *sink) static smart_amp_proc get_smart_amp_process(struct sof_source **sources, int num_of_sources,
struct sof_sink **sinks, int num_of_sinks)
{ {
switch (sink_get_frm_fmt(sink)) { /* Find if any of the sources/sinks needs 16bit process, else use 32bit */
case SOF_IPC_FRAME_S16_LE: for (int i = 0; i < num_of_sources; i++) {
return process_s16; switch (source_get_frm_fmt(sources[i])) {
case SOF_IPC_FRAME_S24_4LE: case SOF_IPC_FRAME_S16_LE:
case SOF_IPC_FRAME_S32_LE: return process_s16;
return process_s32; case SOF_IPC_FRAME_S24_4LE:
default: case SOF_IPC_FRAME_S32_LE:
LOG_ERR("smart_amp_process() error: not supported frame format"); break;
return NULL; default:
LOG_ERR("smart_amp_process() error: not supported frame format");
return NULL;
}
} }
for (int i = 0; i < num_of_sinks; i++) {
switch (sink_get_frm_fmt(sinks[i])) {
case SOF_IPC_FRAME_S16_LE:
return process_s16;
case SOF_IPC_FRAME_S24_4LE:
case SOF_IPC_FRAME_S32_LE:
break;
default:
LOG_ERR("smart_amp_process() error: not supported frame format");
return NULL;
}
}
return process_s32;
} }
static int smart_amp_prepare(struct processing_module *mod, static int smart_amp_prepare(struct processing_module *mod,
@ -349,7 +366,7 @@ static int smart_amp_prepare(struct processing_module *mod,
LOG_DBG("smart_amp_prepare()"); LOG_DBG("smart_amp_prepare()");
sad->process = get_smart_amp_process(sinks[0]); sad->process = get_smart_amp_process(sources, num_of_sources, sinks, num_of_sinks);
if (!sad->process) { if (!sad->process) {
LOG_ERR("smart_amp_prepare(): get_smart_amp_process failed"); LOG_ERR("smart_amp_prepare(): get_smart_amp_process failed");
return -EINVAL; return -EINVAL;