commit d1c222d76bc84e36b034e2833df8ef90cc5741a7
author Angie Chiang <angiebird@google.com> Wed Feb 28 19:41:01 2018 -0800
committer Yaowu Xu <yaowu@google.com> Fri Mar 02 20:53:50 2018 +0000
tree df676808003d9b6bd3305f636431616237d232dc
parent 8112d2f719ace34ddcd3a145e872b6aff6d63d93

[NORMATIVE] TXMG: Remove clamping in half_btf

bug=aomedia:1446

Change-Id: I14dd47ae9664b56befae2eb38755067df5580761

av1/common/av1_txfm.h

diff --git a/av1/common/av1_txfm.h b/av1/common/av1_txfm.h
index 3d844a4..7c6ba0b 100644
--- a/av1/common/av1_txfm.h
+++ b/av1/common/av1_txfm.h
@@ -120,9 +120,11 @@
 
 static INLINE int32_t half_btf(int32_t w0, int32_t in0, int32_t w1, int32_t in1,
                                int bit) {
-  int32_t result_32 = (int32_t)clamp64((int64_t)w0 * in0 + (int64_t)w1 * in1,
-                                       (int64_t)INT32_MIN, (int64_t)INT32_MAX);
-  return round_shift(result_32, bit);
+  int64_t result_64 = (int64_t)(w0 * in0) + (int64_t)(w1 * in1);
+#if CONFIG_COEFFICIENT_RANGE_CHECKING
+  assert(result_64 >= INT32_MIN && result_64 <= INT32_MAX);
+#endif
+  return round_shift((int32_t)result_64, bit);
 }
 
 typedef void (*TxfmFunc)(const int32_t *input, int32_t *output, int8_t cos_bit,