Add scaling change to fix b/281219978.
Enable relevant test, 12bitSignedIntegerOverflowInUpdateBSepSym.
(Minor changes are possible in potential overflow conditions.)
STATS_CHANGED
Bug: b/281219978
Change-Id: Iac1c5c7d93a5463897e2b936b27c6a9dda9956d4
diff --git a/av1/encoder/pickrst.c b/av1/encoder/pickrst.c
index f2fc6ab..7212469 100644
--- a/av1/encoder/pickrst.c
+++ b/av1/encoder/pickrst.c
@@ -1122,7 +1122,7 @@
if (abs_akj > max_abs_akj) max_abs_akj = abs_akj;
}
const int scale_threshold = 1 << 22;
- const int scaler_A = max_abs_akj < scale_threshold ? 1 : (1 << 4);
+ const int scaler_A = max_abs_akj < scale_threshold ? 1 : (1 << 5);
const int scaler_c = max_abs_akj < scale_threshold ? 1 : (1 << 7);
const int scaler = scaler_c * scaler_A;
diff --git a/test/wiener_test.cc b/test/wiener_test.cc
index 3390795..8be6a64 100644
--- a/test/wiener_test.cc
+++ b/test/wiener_test.cc
@@ -804,7 +804,7 @@
// A test that reproduces b/281219978: signed integer overflow in
// update_b_sep_sym().
-TEST(SearchWienerTest, DISABLED_12bitSignedIntegerOverflowInUpdateBSepSym) {
+TEST(SearchWienerTest, 12bitSignedIntegerOverflowInUpdateBSepSym) {
constexpr int kWidth = 311;
constexpr int kHeight = 3;
static const uint16_t buffer[3 * kWidth * kHeight] = {
