commit 4007fa6852e6fe793d1a00b1826682bbf3581c7c
author Yaowu Xu <yaowu@google.com> Mon Nov 07 22:03:00 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Nov 07 22:03:01 2016 +0000
tree 7001e53a8cc6690ddbfbd0a89b93a1b1bcfcbd6b
parent c4c21734d68013a5dad309735248f6d07074b4fa
parent 3442b4b1591ea7418d61b225c4e6e39c6076fe04

Merge "change to call fwd_txfm()" into nextgenv2

av1/common/warped_motion.c

diff --git a/av1/common/warped_motion.c b/av1/common/warped_motion.c
index 2534345..7bbf20f 100644
--- a/av1/common/warped_motion.c
+++ b/av1/common/warped_motion.c
@@ -186,9 +186,9 @@
 
 static int32_t do_cubic_filter(int32_t *p, int x) {
   if (x == 0) {
-    return p[0];
+    return p[0] * (1 << WARPEDPIXEL_FILTER_BITS);
   } else if (x == (1 << WARPEDPIXEL_PREC_BITS)) {
-    return p[1];
+    return p[1] * (1 << WARPEDPIXEL_FILTER_BITS);
   } else {
     const int64_t v1 = (int64_t)x * x * x * (3 * (p[0] - p[1]) + p[2] - p[-1]);
     const int64_t v2 = x * x * (2 * p[-1] - 5 * p[0] + 4 * p[1] - p[2]);