commit 0308ac9ab7c255b1774b913a448d03d58c8c3a7b
author Yaowu Xu <yaowu@google.com> Mon Jan 14 12:32:14 2019 -0800
committer Yaowu Xu <yaowu@google.com> Mon Jan 14 22:50:03 2019 +0000
tree 975a60e767f283ba17d5005663abedf9832df510
parent 811ff85ec8603087996e56fb5435118195ddb2e9

set_offsets(): minor clean-ups

Change-Id: I36d16b58f332ec112ca90d88b36d0c8f7fda8315

av1/encoder/encodeframe.c

diff --git a/av1/encoder/encodeframe.c b/av1/encoder/encodeframe.c
index 2fabef6..2ec2813 100644
--- a/av1/encoder/encodeframe.c
+++ b/av1/encoder/encodeframe.c
@@ -277,25 +277,24 @@
 
   // required by av1_append_sub8x8_mvs_for_idx() and av1_find_best_ref_mvs()
   xd->tile = *tile;
+
+  xd->cfl.mi_row = mi_row;
+  xd->cfl.mi_col = mi_col;
 }
 
 static void set_offsets(const AV1_COMP *const cpi, const TileInfo *const tile,
                         MACROBLOCK *const x, int mi_row, int mi_col,
                         BLOCK_SIZE bsize) {
   const AV1_COMMON *const cm = &cpi->common;
+  const struct segmentation *const seg = &cm->seg;
   MACROBLOCKD *const xd = &x->e_mbd;
   MB_MODE_INFO *mbmi;
-  const struct segmentation *const seg = &cm->seg;
 
   set_offsets_without_segment_id(cpi, tile, x, mi_row, mi_col, bsize);
 
-  mbmi = xd->mi[0];
-  xd->cfl.mi_row = mi_row;
-  xd->cfl.mi_col = mi_col;
-
-  mbmi->segment_id = 0;
-
   // Setup segment ID.
+  mbmi = xd->mi[0];
+  mbmi->segment_id = 0;
   if (seg->enabled) {
     if (seg->enabled && !cpi->vaq_refresh) {
       const uint8_t *const map =