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

sof: drc: sat_int32 after left-shift to avoid overflow 

Q_SHIFT_LEFT doesn't check overflow itself. We should do saturation
after left shifts to avoid erroreous value after left shifts.

Signed-off-by: Pin-chih Lin <johnylin@google.com>
This commit is contained in:
Pin-chih Lin 2021-02-26 13:27:02 +08:00 committed by Curtis Malainey
parent f20b3ee1ef
commit bdb9af48d8
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/audio/drc/drc_generic.c
View File

@ -41,8 +41,10 @@ static int32_t knee_curveK(const struct sof_drc_params *p, int32_t x)
* output and input signal. */
static int32_t volume_gain(const struct sof_drc_params *p, int32_t x)
{
const int32_t knee_threshold = Q_SHIFT_LEFT(p->knee_threshold, 24, 31);
const int32_t linear_threshold = Q_SHIFT_LEFT(p->linear_threshold, 30, 31);
const int32_t knee_threshold =
sat_int32(Q_SHIFT_LEFT((int64_t)p->knee_threshold, 24, 31));
const int32_t linear_threshold =
sat_int32(Q_SHIFT_LEFT((int64_t)p->linear_threshold, 30, 31));
int32_t exp_knee;
int32_t y;
@ -234,7 +236,7 @@ void drc_update_envelope(struct drc_state *state, const struct sof_drc_params *p
*/
state->max_attack_compression_diff_db =
MAX(state->max_attack_compression_diff_db,
Q_SHIFT_LEFT(compression_diff_db, 21, 24));
sat_int32(Q_SHIFT_LEFT((int64_t)compression_diff_db, 21, 24)));
eff_atten_diff_db =
MAX(HALF_Q24, state->max_attack_compression_diff_db); /* Q8.24 */
@ -246,7 +248,7 @@ void drc_update_envelope(struct drc_state *state, const struct sof_drc_params *p
envelope_rate = ONE_Q20 - drc_pow_fixed(x, p->one_over_attack_frames); /* Q12.20 */
}
state->envelope_rate = Q_SHIFT_LEFT(envelope_rate, 20, 30);
state->envelope_rate = sat_int32(Q_SHIFT_LEFT((int64_t)envelope_rate, 20, 30));
state->scaled_desired_gain = scaled_desired_gain;
}

2
src/audio/drc/drc_math_generic.c
View File

@ -238,7 +238,7 @@ inline int32_t drc_inv_fixed(int32_t x, int32_t precision_x, int32_t precision_y
if (precision_inv > precision_y)
return Q_SHIFT_RND(inv, precision_inv, precision_y);
if (precision_inv < precision_y)
return Q_SHIFT_LEFT(inv, precision_inv, precision_y);
return sat_int32(Q_SHIFT_LEFT((int64_t)inv, precision_inv, precision_y));
return inv;
#undef qc
}