Skip to content

Commit 3da554f

Browse files
softwareckiabonislawski
softwarecki
authored and
abonislawski
committed
audio: aria: Add int gain-state loop iterator
Use a dedicated int idx for the loops iterating over ARIA_MAX_GAIN_STATES instead of reusing the sample counter. Signed-off-by: Adrian Warecki <adrian.warecki@intel.com>
1 parent d926953 commit 3da554f

3 files changed

Lines changed: 30 additions & 25 deletions

File tree

‎src/audio/aria/aria_generic.c‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -49,18 +49,19 @@ static void aria_algo_get_data(struct processing_module *mod,
4949
int32_t gain_end = cd->gains[sof_aria_index_tab[gain_state_add_3]];
5050
size_t m, n, i;
5151
unsigned int ch;
52+
int idx;
5253
size_t samples = frames * cd->chan_cnt;
5354
int32_t *out = sink->ptr;
5455
const int32_t *in = cd->data_ptr;
5556
int32_t gain;
5657
const unsigned int ch_n = cd->chan_cnt;
5758
const int shift = 31 - cd->att;
5859

59-
for (i = 1; i < ARIA_MAX_GAIN_STATES - 1; i++) {
60-
if (cd->gains[sof_aria_index_tab[gain_state_add_2 + i]] < gain_begin)
61-
gain_begin = cd->gains[sof_aria_index_tab[gain_state_add_2 + i]];
62-
if (cd->gains[sof_aria_index_tab[gain_state_add_3 + i]] < gain_end)
63-
gain_end = cd->gains[sof_aria_index_tab[gain_state_add_3 + i]];
60+
for (idx = 1; idx < ARIA_MAX_GAIN_STATES - 1; idx++) {
61+
if (cd->gains[sof_aria_index_tab[gain_state_add_2 + idx]] < gain_begin)
62+
gain_begin = cd->gains[sof_aria_index_tab[gain_state_add_2 + idx]];
63+
if (cd->gains[sof_aria_index_tab[gain_state_add_3 + idx]] < gain_end)
64+
gain_end = cd->gains[sof_aria_index_tab[gain_state_add_3 + idx]];
6465
}
6566
step = (gain_end - gain_begin) / (int32_t)frames;
6667
gain = gain_begin;

‎src/audio/aria/aria_hifi3.c‎

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -76,12 +76,13 @@ static void aria_algo_get_data_odd_channel(struct processing_module *mod,
7676
const int shift_bits = 31 - cd->att - 24;
7777
unsigned int ch;
7878
ae_int64 out1;
79+
int idx;
7980

80-
for (i = 1; i < ARIA_MAX_GAIN_STATES - 1; i++) {
81-
if (cd->gains[sof_aria_index_tab[gain_state_add_2 + i]] < gain_begin)
82-
gain_begin = cd->gains[sof_aria_index_tab[gain_state_add_2 + i]];
83-
if (cd->gains[sof_aria_index_tab[gain_state_add_3 + i]] < gain_end)
84-
gain_end = cd->gains[sof_aria_index_tab[gain_state_add_3 + i]];
81+
for (idx = 1; idx < ARIA_MAX_GAIN_STATES - 1; idx++) {
82+
if (cd->gains[sof_aria_index_tab[gain_state_add_2 + idx]] < gain_begin)
83+
gain_begin = cd->gains[sof_aria_index_tab[gain_state_add_2 + idx]];
84+
if (cd->gains[sof_aria_index_tab[gain_state_add_3 + idx]] < gain_end)
85+
gain_end = cd->gains[sof_aria_index_tab[gain_state_add_3 + idx]];
8586
}
8687

8788
step = (gain_end - gain_begin) / (int32_t)frames;
@@ -135,12 +136,13 @@ static void aria_algo_get_data_even_channel(struct processing_module *mod,
135136
const int shift_bits = 31 - cd->att - 24;
136137
unsigned int ch;
137138
ae_int64 out1, out2;
139+
int idx;
138140

139-
for (i = 1; i < ARIA_MAX_GAIN_STATES - 1; i++) {
140-
if (cd->gains[sof_aria_index_tab[gain_state_add_2 + i]] < gain_begin)
141-
gain_begin = cd->gains[sof_aria_index_tab[gain_state_add_2 + i]];
142-
if (cd->gains[sof_aria_index_tab[gain_state_add_3 + i]] < gain_end)
143-
gain_end = cd->gains[sof_aria_index_tab[gain_state_add_3 + i]];
141+
for (idx = 1; idx < ARIA_MAX_GAIN_STATES - 1; idx++) {
142+
if (cd->gains[sof_aria_index_tab[gain_state_add_2 + idx]] < gain_begin)
143+
gain_begin = cd->gains[sof_aria_index_tab[gain_state_add_2 + idx]];
144+
if (cd->gains[sof_aria_index_tab[gain_state_add_3 + idx]] < gain_end)
145+
gain_end = cd->gains[sof_aria_index_tab[gain_state_add_3 + idx]];
144146
}
145147

146148
step = (gain_end - gain_begin) / (int32_t)frames;

‎src/audio/aria/aria_hifi5.c‎

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -89,12 +89,13 @@ static void aria_algo_get_data_odd_channel(struct processing_module *mod,
8989
const int shift_bits = 31 - cd->att - 24;
9090
unsigned int ch;
9191
ae_int64 out1;
92+
int idx;
9293

93-
for (i = 1; i < ARIA_MAX_GAIN_STATES - 1; i++) {
94-
if (cd->gains[sof_aria_index_tab[gain_state_add_2 + i]] < gain_begin)
95-
gain_begin = cd->gains[sof_aria_index_tab[gain_state_add_2 + i]];
96-
if (cd->gains[sof_aria_index_tab[gain_state_add_3 + i]] < gain_end)
97-
gain_end = cd->gains[sof_aria_index_tab[gain_state_add_3 + i]];
94+
for (idx = 1; idx < ARIA_MAX_GAIN_STATES - 1; idx++) {
95+
if (cd->gains[sof_aria_index_tab[gain_state_add_2 + idx]] < gain_begin)
96+
gain_begin = cd->gains[sof_aria_index_tab[gain_state_add_2 + idx]];
97+
if (cd->gains[sof_aria_index_tab[gain_state_add_3 + idx]] < gain_end)
98+
gain_end = cd->gains[sof_aria_index_tab[gain_state_add_3 + idx]];
9899
}
99100

100101
step = (gain_end - gain_begin) / (int32_t)frames;
@@ -140,12 +141,13 @@ static void aria_algo_get_data_even_channel(struct processing_module *mod,
140141
const int shift_bits = 31 - cd->att - 24;
141142
unsigned int ch;
142143
ae_int64 out1, out2;
144+
int idx;
143145

144-
for (i = 1; i < ARIA_MAX_GAIN_STATES - 1; i++) {
145-
if (cd->gains[sof_aria_index_tab[gain_state_add_2 + i]] < gain_begin)
146-
gain_begin = cd->gains[sof_aria_index_tab[gain_state_add_2 + i]];
147-
if (cd->gains[sof_aria_index_tab[gain_state_add_3 + i]] < gain_end)
148-
gain_end = cd->gains[sof_aria_index_tab[gain_state_add_3 + i]];
146+
for (idx = 1; idx < ARIA_MAX_GAIN_STATES - 1; idx++) {
147+
if (cd->gains[sof_aria_index_tab[gain_state_add_2 + idx]] < gain_begin)
148+
gain_begin = cd->gains[sof_aria_index_tab[gain_state_add_2 + idx]];
149+
if (cd->gains[sof_aria_index_tab[gain_state_add_3 + idx]] < gain_end)
150+
gain_end = cd->gains[sof_aria_index_tab[gain_state_add_3 + idx]];
149151
}
150152

151153
step = (gain_end - gain_begin) / (int32_t)frames;

0 commit comments

Comments
 (0)