commit 1a0ae84dabb38752c64233448b36a7ce151fc8fe
author Debargha Mukherjee <debargha@google.com> Thu Jan 26 16:45:22 2017 -0800
committer Debargha Mukherjee <debargha@google.com> Fri Jan 27 06:06:04 2017 +0000
tree b38f24f70aeb9f52e5c53750469f649bcc846ae7
parent 04305c68a7603847b8fbe9a3a190133809ae7a87

Fix OneByOneVideoTest for loop-restoration

Fixes and turns on the test.

BUG=aomedia:312

Change-Id: I6c7d1970e743ec2b025a798070761d22624e796a

av1/common/restoration.c

diff --git a/av1/common/restoration.c b/av1/common/restoration.c
index 2921cb9..8563c09 100644
--- a/av1/common/restoration.c
+++ b/av1/common/restoration.c
@@ -1338,7 +1338,8 @@
   if ((components_pattern >> AOM_PLANE_U) & 1) {
     if (rsi[AOM_PLANE_U].frame_restoration_type != RESTORE_NONE) {
       cm->rst_internal.ntiles = av1_get_rest_ntiles(
-          cm->width >> cm->subsampling_x, cm->height >> cm->subsampling_y,
+          ROUND_POWER_OF_TWO(cm->width, cm->subsampling_x),
+          ROUND_POWER_OF_TWO(cm->height, cm->subsampling_y),
           &cm->rst_internal.tile_width, &cm->rst_internal.tile_height,
           &cm->rst_internal.nhtiles, &cm->rst_internal.nvtiles);
       cm->rst_internal.rsi = &rsi[AOM_PLANE_U];
@@ -1365,7 +1366,8 @@
   if ((components_pattern >> AOM_PLANE_V) & 1) {
     if (rsi[AOM_PLANE_V].frame_restoration_type != RESTORE_NONE) {
       cm->rst_internal.ntiles = av1_get_rest_ntiles(
-          cm->width >> cm->subsampling_x, cm->height >> cm->subsampling_y,
+          ROUND_POWER_OF_TWO(cm->width, cm->subsampling_x),
+          ROUND_POWER_OF_TWO(cm->height, cm->subsampling_y),
           &cm->rst_internal.tile_width, &cm->rst_internal.tile_height,
           &cm->rst_internal.nhtiles, &cm->rst_internal.nvtiles);
       cm->rst_internal.rsi = &rsi[AOM_PLANE_V];