commit 3df52f86420bf60944927a782a217af7b6450212
author James Zern <jzern@google.com> Mon Feb 26 12:57:14 2018 -0800
committer James Zern <jzern@google.com> Tue Feb 27 04:03:38 2018 +0000
tree 1089befb3edcf799f0e0143f30e563c4576ee196
parent a60ff588f59cbac70fcc94bc794415026d354c07

read_tile_info: simplify EXT_TILE ifdefs

remove else and return immediately from the large_scale_tile branch

Change-Id: I934fa46c6abd7d65aeb4ef177163744a145ca046

av1/decoder/decodeframe.c

diff --git a/av1/decoder/decodeframe.c b/av1/decoder/decodeframe.c
index 4d67750..6285ffa 100644
--- a/av1/decoder/decodeframe.c
+++ b/av1/decoder/decodeframe.c
@@ -1555,11 +1555,12 @@
           ((i * cm->tile_height - 1) >> cm->seq_params.mib_size_log2) + 1;
     }
 #endif  // CONFIG_MAX_TILE
-  } else {
+    return;
+  }
 #endif  // CONFIG_EXT_TILE
 
 #if CONFIG_MAX_TILE
-    read_tile_info_max_tile(cm, rb);
+  read_tile_info_max_tile(cm, rb);
 #else
   int min_log2_tile_cols, max_log2_tile_cols, max_ones;
   av1_get_tile_n_bits(cm->mi_cols, &min_log2_tile_cols, &max_log2_tile_cols);
@@ -1584,38 +1585,33 @@
 
 #endif  // CONFIG_MAX_TILE
 #if CONFIG_DEPENDENT_HORZTILES
-    if (cm->tile_rows > 1)
-      cm->dependent_horz_tiles = aom_rb_read_bit(rb);
-    else
-      cm->dependent_horz_tiles = 0;
+  if (cm->tile_rows > 1)
+    cm->dependent_horz_tiles = aom_rb_read_bit(rb);
+  else
+    cm->dependent_horz_tiles = 0;
 #endif
 #if CONFIG_LOOPFILTERING_ACROSS_TILES
 #if CONFIG_LOOPFILTERING_ACROSS_TILES_EXT
-    if (cm->tile_cols > 1) {
-      cm->loop_filter_across_tiles_v_enabled = aom_rb_read_bit(rb);
-    } else {
-      cm->loop_filter_across_tiles_v_enabled = 1;
-    }
-    if (cm->tile_rows > 1) {
-      cm->loop_filter_across_tiles_h_enabled = aom_rb_read_bit(rb);
-    } else {
-      cm->loop_filter_across_tiles_h_enabled = 1;
-    }
+  if (cm->tile_cols > 1) {
+    cm->loop_filter_across_tiles_v_enabled = aom_rb_read_bit(rb);
+  } else {
+    cm->loop_filter_across_tiles_v_enabled = 1;
+  }
+  if (cm->tile_rows > 1) {
+    cm->loop_filter_across_tiles_h_enabled = aom_rb_read_bit(rb);
+  } else {
+    cm->loop_filter_across_tiles_h_enabled = 1;
+  }
 #else
-    if (cm->tile_cols * cm->tile_rows > 1)
-      cm->loop_filter_across_tiles_enabled = aom_rb_read_bit(rb);
-    else
-      cm->loop_filter_across_tiles_enabled = 1;
+  if (cm->tile_cols * cm->tile_rows > 1)
+    cm->loop_filter_across_tiles_enabled = aom_rb_read_bit(rb);
+  else
+    cm->loop_filter_across_tiles_enabled = 1;
 #endif  // CONFIG_LOOPFILTERING_ACROSS_TILES_EXT
 #endif  // CONFIG_LOOPFILTERING_ACROSS_TILES
 
-    // tile size magnitude
-    pbi->tile_size_bytes = aom_rb_read_literal(rb, 2) + 1;
-#if CONFIG_EXT_TILE
-  }
-#endif  // CONFIG_EXT_TILE
-
-  // each tile group header is in its own tile group OBU
+  // tile size magnitude
+  pbi->tile_size_bytes = aom_rb_read_literal(rb, 2) + 1;
 }
 
 static int mem_get_varsize(const uint8_t *src, int sz) {