commit fc256542dc53448e9716af176416062adff31b99
author David Barker <david.barker@argondesign.com> Wed Aug 02 18:45:35 2017 +0100
committer Debargha Mukherjee <debargha@google.com> Wed Aug 02 20:49:43 2017 +0000
tree 9e30a252c17f3562aaeefeec626230e1d223f53b
parent 0b90540e27e49d7a5b22a56abf3e8e24229c204d

Fix inconsistency in compound-segment masks

The value of 'mask_base' passed to diffwtd_mask is currently
38 for the lowbd path and 42 for the highbd path. Going off of
the mode name (DIFFWTD_38), presumably these are both supposed
to be 38, so change the highbd path accordingly.

Change-Id: I5fb0099c4b8b3ca3c4f211562401b12012f5c002

av1/common/reconinter.c

diff --git a/av1/common/reconinter.c b/av1/common/reconinter.c
index e0bae2d..4967416 100644
--- a/av1/common/reconinter.c
+++ b/av1/common/reconinter.c
@@ -457,12 +457,12 @@
                                     BLOCK_SIZE sb_type, int h, int w, int bd) {
   switch (mask_type) {
     case DIFFWTD_38:
-      diffwtd_mask_highbd(mask, 0, 42, CONVERT_TO_SHORTPTR(src0), src0_stride,
+      diffwtd_mask_highbd(mask, 0, 38, CONVERT_TO_SHORTPTR(src0), src0_stride,
                           CONVERT_TO_SHORTPTR(src1), src1_stride, sb_type, h, w,
                           bd);
       break;
     case DIFFWTD_38_INV:
-      diffwtd_mask_highbd(mask, 1, 42, CONVERT_TO_SHORTPTR(src0), src0_stride,
+      diffwtd_mask_highbd(mask, 1, 38, CONVERT_TO_SHORTPTR(src0), src0_stride,
                           CONVERT_TO_SHORTPTR(src1), src1_stride, sb_type, h, w,
                           bd);
       break;