Remove the double-check in multiply_and_scale()
Revert commit 72b1f1d. It has been three months.
Bug: b:319140742
Bug: oss-fuzz:66474
Change-Id: I862715e70d47666333e36565e99447e073019856
diff --git a/av1/encoder/pickrst.c b/av1/encoder/pickrst.c
index 0b0ca1c..f604994 100644
--- a/av1/encoder/pickrst.c
+++ b/av1/encoder/pickrst.c
@@ -1127,15 +1127,6 @@
// Let y = x * w / WIENER_TAP_SCALE_FACTOR
// = x * (w1 * WIENER_TAP_SCALE_FACTOR + w2) / WIENER_TAP_SCALE_FACTOR
const int64_t y = x * w1 + x * w2 / WIENER_TAP_SCALE_FACTOR;
- // Double-check the calculation using __int128.
- // TODO(wtc): Remove after 2024-04-30.
-#if !defined(NDEBUG) && defined(__GNUC__) && defined(__LP64__)
- const int32_t w = w1 * WIENER_TAP_SCALE_FACTOR + w2;
- const __int128 z = (__int128)x * w / WIENER_TAP_SCALE_FACTOR;
- assert(z >= INT64_MIN);
- assert(z <= INT64_MAX);
- assert(y == (int64_t)z);
-#endif
return y;
}
