commit 9a65bb01df32267843ad5e44fff84e8864ce1fb8
author Debargha Mukherjee <debargha@google.com> Thu Mar 01 10:35:03 2018 -0800
committer Debargha Mukherjee <debargha@google.com> Thu Mar 01 21:07:36 2018 +0000
tree 08bf6ab5ef152d682d2d00fd09aab0e054ac48bd
parent 1c583019701e4db51e2ac28afcc9ea3396863bf9

[NORMATIVE] Correct round1 for 12-bit compound

Bug-fix.
For 12-bit compound, the round0 / round1 should be {5, 7},
and not {5, 5}.

Change-Id: I86fe31380e6adb630686251af505bc496c1a005d

av1/common/convolve.h

diff --git a/av1/common/convolve.h b/av1/common/convolve.h
index 112c9c7..62e86ba 100644
--- a/av1/common/convolve.h
+++ b/av1/common/convolve.h
@@ -111,7 +111,7 @@
   if (bd < 12) assert(intbufrange <= 16);
   if (intbufrange > 16) {
     conv_params.round_0 += intbufrange - 16;
-    conv_params.round_1 -= intbufrange - 16;
+    if (!is_compound) conv_params.round_1 -= intbufrange - 16;
   }
 #else
   (void)bd;