decodeframe.c: remove special case for CONFIG_OBU

And deduplicate the call to decode_tiles

Change-Id: I527e77e3f7ec36cbc1ce723455d0fa31c6646515

av1/decoder/decodeframe.c

diff --git a/av1/decoder/decodeframe.c b/av1/decoder/decodeframe.c
index 3284f1e..8b969d3 100644
--- a/av1/decoder/decodeframe.c
+++ b/av1/decoder/decodeframe.c
@@ -2088,10 +2088,8 @@
   if (!(cm->allow_intrabc && NO_FILTER_FOR_IBC))
 #endif  // CONFIG_INTRABC
   {
-// Loopfilter the whole frame.
-#if CONFIG_OBU
+    // Loopfilter the whole frame.
     if (endTile == cm->tile_rows * cm->tile_cols - 1)
-#endif
 #if CONFIG_LOOPFILTER_LEVEL
       if (cm->lf.filter_level[0] || cm->lf.filter_level[1]) {
         av1_loop_filter_frame(get_frame_new_buffer(cm), cm, &pbi->mb,
@@ -2105,8 +2103,8 @@
                               0);
       }
 #else
-    av1_loop_filter_frame(get_frame_new_buffer(cm), cm, &pbi->mb,
-                          cm->lf.filter_level, 0, 0);
+      av1_loop_filter_frame(get_frame_new_buffer(cm), cm, &pbi->mb,
+                            cm->lf.filter_level, 0, 0);
 #endif  // CONFIG_LOOPFILTER_LEVEL
   }
   if (cm->frame_parallel_decode)
@@ -2123,12 +2121,7 @@
   }
 #endif  // CONFIG_EXT_TILE
 
-#if !CONFIG_OBU
-  // Get last tile data.
-  TileData *const td = pbi->tile_data + tile_cols * tile_rows - 1;
-#else
   TileData *const td = pbi->tile_data + endTile;
-#endif
 
   return aom_reader_find_end(&td->bit_reader);
 }
@@ -3389,13 +3382,7 @@
 
   if (initialize_flag) setup_frame_info(pbi);
 
-#if CONFIG_OBU
   *p_data_end = decode_tiles(pbi, data, data_end, startTile, endTile);
-#else
-  *p_data_end =
-      decode_tiles(pbi, data + pbi->uncomp_hdr_size + pbi->first_partition_size,
-                   data_end, startTile, endTile);
-#endif
 
 #if CONFIG_MONO_VIDEO
   // If the bit stream is monochrome, set the U and V buffers to a constant.

av1/decoder/decoder.c

diff --git a/av1/decoder/decoder.c b/av1/decoder/decoder.c
index 88f6817..9affe4a 100644
--- a/av1/decoder/decoder.c
+++ b/av1/decoder/decoder.c
@@ -374,7 +374,9 @@
 #if !CONFIG_OBU
   av1_decode_frame_headers_and_setup(pbi, source, source + size, psource);
   if (!cm->show_existing_frame) {
-    av1_decode_tg_tiles_and_wrapup(pbi, source, source + size, psource, 0,
+    const uint8_t *data =
+        source + pbi->uncomp_hdr_size + pbi->first_partition_size;
+    av1_decode_tg_tiles_and_wrapup(pbi, data, source + size, psource, 0,
                                    cm->tile_rows * cm->tile_cols - 1, 1);
   }
 #else