commit 6cd5a82b8cf34e09769ce36fb190d9c363ae9c15
author David Barker <david.barker@argondesign.com> Mon Mar 05 16:19:28 2018 +0000
committer Debargha Mukherjee <debargha@google.com> Thu Mar 08 16:59:29 2018 +0000
tree 5b293d8478fa6c600533a1d8a415c3e46f2269bd
parent f01bbc3b8fd411092c9370f24d727140f1376cd5

[NORMATIVE-SYNTAX] Fix max tile width/area calculation

As per the linked bug report, the maximum #pixels in each tile
was previously being computed in a way which depended on the
superblock size. This patch fixes this by making max_tile_width_sb
and max_tile_area_sb depend on the superblock size.

One potential source of confusion comes from the fact that we
already have a variable called max_tile_width_sb elsewhere in
the code, which tracks the width of the widest tile in the current
frame. To avoid confusion, this is renamed to widest_tile_sb,
so that max_* always means a limit in this context.

BUG=aomedia:1508

Change-Id: I94ebbc46e54cb5b1e8eda5f8ab3f0a3cd61698e8

av1/encoder/bitstream.c

diff --git a/av1/encoder/bitstream.c b/av1/encoder/bitstream.c
index d0a2e9d..1bf5b35 100644
--- a/av1/encoder/bitstream.c
+++ b/av1/encoder/bitstream.c
@@ -2303,7 +2303,8 @@
     // columns
     for (i = 0; i < cm->tile_cols; i++) {
       size_sb = cm->tile_col_start_sb[i + 1] - cm->tile_col_start_sb[i];
-      wb_write_uniform(wb, AOMMIN(width_sb, MAX_TILE_WIDTH_SB), size_sb - 1);
+      wb_write_uniform(wb, AOMMIN(width_sb, cm->max_tile_width_sb),
+                       size_sb - 1);
       width_sb -= size_sb;
     }
     assert(width_sb == 0);