commit 5a4cfcd95e2150fb570726e4a2c9b60d85f8408b
author Urvang Joshi <urvang@google.com> Thu Jul 19 13:20:48 2018 -0700
committer Urvang Joshi <urvang@google.com> Fri Jul 20 00:48:09 2018 +0000
tree caeb2ce6eab5c99b4bd4fdee0764b1d1800c1325
parent 20cf30e6d6675769093566591c4a61187b47924b

Revert "highbd_dc_pred_rect: Assert on valid only"

Reason for reverting:
This was a temporary workaround, fixing the symptom.

Now that the core issue has been fixed (in this patch:
https://aomedia-review.googlesource.com/c/aom/+/65581), the
workaround is no longer needed.

BUG=oss-fuzz:9323

This reverts commit f7bd5623e4b990e522e640d6a0db8e56fa4cb9aa.

Change-Id: I3535d22a2fcaf8b315066c4af75be85aec2a0b1f

aom_dsp/intrapred.c

diff --git a/aom_dsp/intrapred.c b/aom_dsp/intrapred.c
index 4c7868c..c6aa6b2 100644
--- a/aom_dsp/intrapred.c
+++ b/aom_dsp/intrapred.c
@@ -594,9 +594,7 @@
 
   const int expected_dc = divide_using_multiply_shift(
       sum + ((bw + bh) >> 1), shift1, multiplier, HIGHBD_DC_SHIFT2);
-
-  // Sanity check: valid input should result in valid 'expected_dc'.
-  assert(IMPLIES(sum <= ((1 << bd) - 1) * (bw + bh), expected_dc < (1 << bd)));
+  assert(expected_dc < (1 << bd));
 
   for (int r = 0; r < bh; r++) {
     aom_memset16(dst, expected_dc, bw);