commit 3874cb50720e0b1b9257e3bb232b5b87b5c0f2eb
author Rostislav Pehlivanov <rpehlivanov@mozilla.com> Thu Jan 11 17:29:00 2018 +0000
committer Rostislav Pehlivanov <rpehlivanov@mozilla.com> Tue Jan 16 16:24:37 2018 +0000
tree d7b344ff1265fa5aad79cf10969c9fb7d6493e8c
parent a77c871ee03f9a3445f3bdb7cfd7dad4e3fd2db1

Avoid crosstile dependency on coding spat. segid

BUG=aomedia:1215

Change-Id: Idc2d732e2574b61b5970d3fe9aa3723790a2be36

av1/encoder/bitstream.c

diff --git a/av1/encoder/bitstream.c b/av1/encoder/bitstream.c
index d483f19..41b7c9d 100644
--- a/av1/encoder/bitstream.c
+++ b/av1/encoder/bitstream.c
@@ -596,26 +596,22 @@
                              struct segmentation_probs *segp, int mi_row,
                              int mi_col, int skip) {
   AV1_COMMON *const cm = &cpi->common;
+  MACROBLOCKD *const xd = &cpi->td.mb.e_mbd;
   int prev_ul = 0; /* Top left segment_id */
   int prev_l = 0;  /* Current left segment_id */
   int prev_u = 0;  /* Current top segment_id */
 
   if (!seg->enabled || !seg->update_map) return;
 
-  MODE_INFO *const mi = cm->mi + mi_row * cm->mi_stride + mi_col;
-  int tinfo = mi->mbmi.boundary_info;
-  int above = (!(tinfo & TILE_ABOVE_BOUNDARY)) && ((mi_row - 1) >= 0);
-  int left = (!(tinfo & TILE_LEFT_BOUNDARY)) && ((mi_col - 1) >= 0);
-
-  if (above && left)
+  if ((xd->up_available) && (xd->left_available))
     prev_ul = get_segment_id(cm, cm->current_frame_seg_map, BLOCK_4X4,
                              mi_row - 1, mi_col - 1);
 
-  if (above)
+  if (xd->up_available)
     prev_u = get_segment_id(cm, cm->current_frame_seg_map, BLOCK_4X4,
                             mi_row - 1, mi_col - 0);
 
-  if (left)
+  if (xd->left_available)
     prev_l = get_segment_id(cm, cm->current_frame_seg_map, BLOCK_4X4,
                             mi_row - 0, mi_col - 1);