Skip to content

math: iir: reject series count that does not divide num_sections #11318

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

Open
Shrusti-pk wants to merge 1 commit into
base: main
Choose a base branch
from
+37 −3
Open

math: iir: reject series count that does not divide num_sections #11318

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 5 additions & 1 deletion src/math/iir_df1.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,12 @@ int iir_delay_size_df1(struct sof_eq_iir_header *config)
if (!n || n > SOF_EQ_IIR_BIQUADS_MAX)
return -EINVAL;

/* The filter runs num_sections_in_series biquads per parallel
* branch, so the sections must split evenly into branches.
*/
if (!config->num_sections_in_series ||
config->num_sections_in_series > n)
config->num_sections_in_series > n ||
n % config->num_sections_in_series)
return -EINVAL;

return 4 * n * sizeof(int32_t);
Expand Down
6 changes: 5 additions & 1 deletion src/math/iir_df2t.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,12 @@ int iir_delay_size_df2t(struct sof_eq_iir_header *config)
if (!n || n > SOF_EQ_IIR_BIQUADS_MAX)
return -EINVAL;

/* The filter runs num_sections_in_series biquads per parallel
* branch, so the sections must split evenly into branches.
*/
if (!config->num_sections_in_series ||
config->num_sections_in_series > n)
config->num_sections_in_series > n ||
n % config->num_sections_in_series)
return -EINVAL;

return 2 * n * sizeof(int64_t);
Expand Down
28 changes: 27 additions & 1 deletion test/cmocka/src/audio/eq_iir/eq_iir_process.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@
#include <sof/audio/sink_api.h>
#include <sof/audio/source_api.h>
#include <ipc/control.h>
#include <user/eq.h>
#include <errno.h>

#include "../../util.h"
#include "../../../include/cmocka_chirp_2ch.h"
Expand Down Expand Up @@ -517,11 +519,29 @@ static struct test_parameters parameters[] = {

};

static void test_iir_delay_size_df1_series(void **state)
{
struct sof_eq_iir_header hdr = { .num_sections = 11 };
const int size = 4 * 11 * sizeof(int32_t);

(void)state;

hdr.num_sections_in_series = 11;
assert_int_equal(iir_delay_size_df1(&hdr), size);

hdr.num_sections_in_series = 1;
assert_int_equal(iir_delay_size_df1(&hdr), size);

/* iir_df1() would run 20 biquads against 11 sections of state */
hdr.num_sections_in_series = 10;
assert_int_equal(iir_delay_size_df1(&hdr), -EINVAL);
}

int main(void)
{
int i;

struct CMUnitTest tests[ARRAY_SIZE(parameters)];
struct CMUnitTest tests[ARRAY_SIZE(parameters) + 1];

for (i = 0; i < ARRAY_SIZE(parameters); i++) {
tests[i].name = "test_audio_eq_iir";
Expand All @@ -531,6 +551,12 @@ int main(void)
tests[i].initial_state = &parameters[i];
}

tests[i].name = "test_iir_delay_size_df1_series";
tests[i].test_func = test_iir_delay_size_df1_series;
tests[i].setup_func = NULL;
tests[i].teardown_func = NULL;
tests[i].initial_state = NULL;

cmocka_set_message_output(CM_OUTPUT_TAP);

return cmocka_run_group_tests(tests, setup_group, NULL);
Expand Down
Loading