shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "VP9_COMMON: drop cur_tile_{row,col}_idx"

--- a/vp9/common/vp9_onyxc_int.h

+++ b/vp9/common/vp9_onyxc_int.h

@@ -220,8 +220,8 @@

   int frame_parallel_decoding_mode;

   int log2_tile_cols, log2_tile_rows;

-  int cur_tile_mi_col_start, cur_tile_mi_col_end, cur_tile_col_idx;

-  int cur_tile_mi_row_start, cur_tile_mi_row_end, cur_tile_row_idx;

+  int cur_tile_mi_col_start, cur_tile_mi_col_end;

+  int cur_tile_mi_row_start, cur_tile_mi_row_end;

 } VP9_COMMON;

 static int get_free_fb(VP9_COMMON *cm) {

--- a/vp9/common/vp9_tile_common.c

+++ b/vp9/common/vp9_tile_common.c

@@ -28,13 +28,11 @@

 }

 void vp9_get_tile_col_offsets(VP9_COMMON *cm, int tile_col_idx) {

-  cm->cur_tile_col_idx = tile_col_idx;

   vp9_get_tile_offsets(&cm->cur_tile_mi_col_start, &cm->cur_tile_mi_col_end,

                        tile_col_idx, cm->log2_tile_cols, cm->mi_cols);

 }

 void vp9_get_tile_row_offsets(VP9_COMMON *cm, int tile_row_idx) {

-  cm->cur_tile_row_idx = tile_row_idx;

   vp9_get_tile_offsets(&cm->cur_tile_mi_row_start, &cm->cur_tile_mi_row_end,

                        tile_row_idx, cm->log2_tile_rows, cm->mi_rows);

 }