Merge master@5406228 into git_qt-dev-plus-aosp.

Change-Id: If61b3c300c06b376410bc091576599f326b8b448
BUG: 129345239
This commit is contained in:
Bill Rassieur 2019-03-29 04:15:19 +00:00
commit 7cfdb62fe6

View file

@ -157,7 +157,7 @@ VOID ixheaacd_voronoi_idx_dec(WORD32 *kv, WORD32 m, WORD32 *y, WORD32 count) {
for (i = 6; i >= 1; i--) {
tmp = ixheaacd_shl32_sat(kv[i], 1);
sum = ixheaacd_add32_sat(sum, tmp);
y[i] += tmp;
y[i] = ixheaacd_add32_sat(y[i], tmp);
z[i] = y[i] >> count;
rem1[i] = y[i] & (m - 1);
}