commit efa76d7e60217c4b0bacf9ebd7ab3b03c99b2763
author Rupert Swarbrick <rupert.swarbrick@argondesign.com> Mon Nov 06 17:13:46 2017 +0000
committer Debargha Mukherjee <debargha@google.com> Mon Nov 06 20:59:13 2017 +0000
tree a16a93906dbbe8a2f74fb1a4acba05c7ed8863af
parent 0edbdcde848a17fb60666b5a0f828792b3504c9f

Correct a loop restoration buffer size

On subsampled planes, the frame is narrower but the padding by
RESTORATION_EXTRA_HORZ on each side is the same width as usual.

Change-Id: Id68c0dd674efaa769412825b119ae5ebe56548ad

av1/common/alloccommon.c

diff --git a/av1/common/alloccommon.c b/av1/common/alloccommon.c
index 30ccb08..4f1ad49 100644
--- a/av1/common/alloccommon.c
+++ b/av1/common/alloccommon.c
@@ -150,7 +150,7 @@
     const int is_uv = p > 0;
     const int ss_x = is_uv && cm->subsampling_x;
 
-    const int plane_w = (frame_w + 2 * RESTORATION_EXTRA_HORZ + ss_x) >> ss_x;
+    const int plane_w = ((frame_w + ss_x) >> ss_x) + 2 * RESTORATION_EXTRA_HORZ;
     const int align_bits = 5;  // align for efficiency
     const int stride = ALIGN_POWER_OF_TWO(plane_w, align_bits);