Remove mi_grid_visible
(prev)?_mi_grid_base and (prev)?_mi_grid_visible both point to the same
pointer in the codebase, so only one is needed.
Change-Id: I70e73a7738a893df6b694fd0c40ca22602fe56f9
diff --git a/av1/common/av1_loopfilter.c b/av1/common/av1_loopfilter.c
index 7b23e31..ee01a82 100644
--- a/av1/common/av1_loopfilter.c
+++ b/av1/common/av1_loopfilter.c
@@ -256,7 +256,7 @@
// and mi_col should be odd number for chroma plane.
const int mi_row = scale_vert | ((y << scale_vert) >> MI_SIZE_LOG2);
const int mi_col = scale_horz | ((x << scale_horz) >> MI_SIZE_LOG2);
- MB_MODE_INFO **mi = cm->mi_grid_visible + mi_row * cm->mi_stride + mi_col;
+ MB_MODE_INFO **mi = cm->mi_grid_base + mi_row * cm->mi_stride + mi_col;
const MB_MODE_INFO *mbmi = mi[0];
// If current mbmi is not correctly setup, return an invalid value to stop
// filtering. One example is that if this tile is not coded, then its mbmi
diff --git a/av1/common/cdef.c b/av1/common/cdef.c
index f4a8869..8c6375f 100644
--- a/av1/common/cdef.c
+++ b/av1/common/cdef.c
@@ -35,7 +35,7 @@
int av1_cdef_compute_sb_list(const AV1_COMMON *const cm, int mi_row, int mi_col,
cdef_list *dlist, BLOCK_SIZE bs) {
- MB_MODE_INFO **grid = cm->mi_grid_visible;
+ MB_MODE_INFO **grid = cm->mi_grid_base;
int maxc = cm->mi_cols - mi_col;
int maxr = cm->mi_rows - mi_row;
@@ -169,10 +169,10 @@
int nhb, nvb;
int cstart = 0;
curr_row_cdef[fbc] = 0;
- if (cm->mi_grid_visible[MI_SIZE_64X64 * fbr * cm->mi_stride +
- MI_SIZE_64X64 * fbc] == NULL ||
- cm->mi_grid_visible[MI_SIZE_64X64 * fbr * cm->mi_stride +
- MI_SIZE_64X64 * fbc]
+ if (cm->mi_grid_base[MI_SIZE_64X64 * fbr * cm->mi_stride +
+ MI_SIZE_64X64 * fbc] == NULL ||
+ cm->mi_grid_base[MI_SIZE_64X64 * fbr * cm->mi_stride +
+ MI_SIZE_64X64 * fbc]
->cdef_strength == -1) {
cdef_left = 0;
continue;
@@ -207,8 +207,8 @@
frame_right = 1;
const int mbmi_cdef_strength =
- cm->mi_grid_visible[MI_SIZE_64X64 * fbr * cm->mi_stride +
- MI_SIZE_64X64 * fbc]
+ cm->mi_grid_base[MI_SIZE_64X64 * fbr * cm->mi_stride +
+ MI_SIZE_64X64 * fbc]
->cdef_strength;
level =
cdef_info->cdef_strengths[mbmi_cdef_strength] / CDEF_SEC_STRENGTHS;
diff --git a/av1/common/debugmodes.c b/av1/common/debugmodes.c
index b26c7dd..50d1e60 100644
--- a/av1/common/debugmodes.c
+++ b/av1/common/debugmodes.c
@@ -27,7 +27,7 @@
static void print_mi_data(AV1_COMMON *cm, FILE *file, const char *descriptor,
size_t member_offset) {
int mi_row, mi_col;
- MB_MODE_INFO **mi = cm->mi_grid_visible;
+ MB_MODE_INFO **mi = cm->mi_grid_base;
int rows = cm->mi_rows;
int cols = cm->mi_cols;
char prefix = descriptor[0];
@@ -49,7 +49,7 @@
int mi_row;
int mi_col;
FILE *mvs = fopen(file, "a");
- MB_MODE_INFO **mi = cm->mi_grid_visible;
+ MB_MODE_INFO **mi = cm->mi_grid_base;
int rows = cm->mi_rows;
int cols = cm->mi_cols;
@@ -74,7 +74,7 @@
// output motion vectors.
log_frame_info(cm, "Vectors ", mvs);
- mi = cm->mi_grid_visible;
+ mi = cm->mi_grid_base;
for (mi_row = 0; mi_row < rows; mi_row++) {
fprintf(mvs, "V ");
for (mi_col = 0; mi_col < cols; mi_col++) {
diff --git a/av1/common/onyxc_int.h b/av1/common/onyxc_int.h
index 81de9e5..ad4eab6 100644
--- a/av1/common/onyxc_int.h
+++ b/av1/common/onyxc_int.h
@@ -434,9 +434,7 @@
// Grid of pointers to 4x4 MB_MODE_INFO structs. Any 4x4 not in the visible
// area will be NULL.
MB_MODE_INFO **mi_grid_base;
- MB_MODE_INFO **mi_grid_visible;
MB_MODE_INFO **prev_mi_grid_base;
- MB_MODE_INFO **prev_mi_grid_visible;
// Whether to use previous frames' motion vectors for prediction.
int allow_ref_frame_mvs;
@@ -1280,7 +1278,7 @@
if (mi_row >= cm->mi_rows || mi_col >= cm->mi_cols) return PARTITION_INVALID;
const int offset = mi_row * cm->mi_stride + mi_col;
- MB_MODE_INFO **mi = cm->mi_grid_visible + offset;
+ MB_MODE_INFO **mi = cm->mi_grid_base + offset;
const BLOCK_SIZE subsize = mi[0]->sb_type;
if (subsize == bsize) return PARTITION_NONE;
diff --git a/av1/decoder/decodeframe.c b/av1/decoder/decodeframe.c
index cf2780b..8deefdf 100644
--- a/av1/decoder/decodeframe.c
+++ b/av1/decoder/decodeframe.c
@@ -341,7 +341,7 @@
const int offset = mi_row * cm->mi_stride + mi_col;
const TileInfo *const tile = &xd->tile;
- xd->mi = cm->mi_grid_visible + offset;
+ xd->mi = cm->mi_grid_base + offset;
xd->mi[0] = &cm->mi[offset];
// TODO(slavarnway): Generate sb_type based on bwl and bhl, instead of
// passing bsize from decode_partition().
@@ -1470,7 +1470,7 @@
const int offset = mi_row * cm->mi_stride + mi_col;
const TileInfo *const tile = &xd->tile;
- xd->mi = cm->mi_grid_visible + offset;
+ xd->mi = cm->mi_grid_base + offset;
xd->cfl.mi_row = mi_row;
xd->cfl.mi_col = mi_col;
diff --git a/av1/decoder/decodemv.c b/av1/decoder/decodemv.c
index c6f469b..31634f8 100644
--- a/av1/decoder/decodemv.c
+++ b/av1/decoder/decodemv.c
@@ -56,11 +56,11 @@
const int index = cm->seq_params.sb_size == BLOCK_128X128
? !!(mi_col & mask) + 2 * !!(mi_row & mask)
: 0;
- cm->mi_grid_visible[(mi_row & m) * cm->mi_stride + (mi_col & m)]
- ->cdef_strength = xd->cdef_preset[index] =
- xd->cdef_preset[index] == -1 && !mbmi->skip
- ? aom_read_literal(r, cm->cdef_info.cdef_bits, ACCT_STR)
- : xd->cdef_preset[index];
+ cm->mi_grid_base[(mi_row & m) * cm->mi_stride + (mi_col & m)]->cdef_strength =
+ xd->cdef_preset[index] =
+ xd->cdef_preset[index] == -1 && !mbmi->skip
+ ? aom_read_literal(r, cm->cdef_info.cdef_bits, ACCT_STR)
+ : xd->cdef_preset[index];
}
static int read_delta_qindex(AV1_COMMON *cm, const MACROBLOCKD *xd,
diff --git a/av1/decoder/decoder.c b/av1/decoder/decoder.c
index 51578ba..50eace3 100644
--- a/av1/decoder/decoder.c
+++ b/av1/decoder/decoder.c
@@ -46,7 +46,7 @@
}
static void dec_setup_mi(AV1_COMMON *cm) {
- cm->mi_grid_visible = cm->mi_grid_base;
+ cm->mi_grid_base = cm->mi_grid_base;
memset(cm->mi_grid_base, 0,
cm->mi_stride * cm->mi_rows * sizeof(*cm->mi_grid_base));
}
diff --git a/av1/decoder/inspection.c b/av1/decoder/inspection.c
index eeed1d3..dc53829 100644
--- a/av1/decoder/inspection.c
+++ b/av1/decoder/inspection.c
@@ -68,7 +68,7 @@
}
for (j = 0; j < cm->mi_rows; j++) {
for (i = 0; i < cm->mi_cols; i++) {
- const MB_MODE_INFO *mbmi = cm->mi_grid_visible[j * cm->mi_stride + i];
+ const MB_MODE_INFO *mbmi = cm->mi_grid_base[j * cm->mi_stride + i];
insp_mi_data *mi = &fd->mi_grid[j * cm->mi_cols + i];
// Segment
mi->segment_id = mbmi->segment_id;
diff --git a/av1/encoder/bitstream.c b/av1/encoder/bitstream.c
index b27601a..a225b49 100644
--- a/av1/encoder/bitstream.c
+++ b/av1/encoder/bitstream.c
@@ -878,7 +878,7 @@
const int m = ~((1 << (6 - MI_SIZE_LOG2)) - 1);
const MB_MODE_INFO *mbmi =
- cm->mi_grid_visible[(mi_row & m) * cm->mi_stride + (mi_col & m)];
+ cm->mi_grid_base[(mi_row & m) * cm->mi_stride + (mi_col & m)];
// Initialise when at top left part of the superblock
if (!(mi_row & (cm->seq_params.mib_size - 1)) &&
!(mi_col & (cm->seq_params.mib_size - 1))) { // Top left?
@@ -1274,7 +1274,7 @@
static void enc_dump_logs(AV1_COMP *cpi, int mi_row, int mi_col) {
AV1_COMMON *const cm = &cpi->common;
const MB_MODE_INFO *const *mbmi =
- *(cm->mi_grid_visible + (mi_row * cm->mi_stride + mi_col));
+ *(cm->mi_grid_base + (mi_row * cm->mi_stride + mi_col));
const MB_MODE_INFO_EXT *const *mbmi_ext =
cpi->mbmi_ext_base + (mi_row * cm->mi_cols + mi_col);
if (is_inter_block(mbmi)) {
@@ -1461,7 +1461,7 @@
int mi_col) {
const AV1_COMMON *cm = &cpi->common;
MACROBLOCKD *xd = &cpi->td.mb.e_mbd;
- xd->mi = cm->mi_grid_visible + (mi_row * cm->mi_stride + mi_col);
+ xd->mi = cm->mi_grid_base + (mi_row * cm->mi_stride + mi_col);
cpi->td.mb.mbmi_ext = cpi->mbmi_ext_base + (mi_row * cm->mi_cols + mi_col);
const MB_MODE_INFO *mbmi = xd->mi[0];
diff --git a/av1/encoder/encodeframe.c b/av1/encoder/encodeframe.c
index d6f1068..c1c1ada 100644
--- a/av1/encoder/encodeframe.c
+++ b/av1/encoder/encodeframe.c
@@ -4052,7 +4052,7 @@
td->mb.cb_coef_buff = av1_get_cb_coeff_buffer(cpi, mi_row, mi_col);
const int idx_str = cm->mi_stride * mi_row + mi_col;
- MB_MODE_INFO **mi = cm->mi_grid_visible + idx_str;
+ MB_MODE_INFO **mi = cm->mi_grid_base + idx_str;
x->source_variance = UINT_MAX;
x->simple_motion_pred_sse = UINT_MAX;
const struct segmentation *const seg = &cm->seg;
@@ -4572,7 +4572,7 @@
cm->setup_mi(cm);
}
- xd->mi = cm->mi_grid_visible;
+ xd->mi = cm->mi_grid_base;
xd->mi[0] = cm->mi;
av1_zero(*td->counts);
diff --git a/av1/encoder/encoder.c b/av1/encoder/encoder.c
index 60995a6..7137e04 100644
--- a/av1/encoder/encoder.c
+++ b/av1/encoder/encoder.c
@@ -386,8 +386,8 @@
// Clear left border column
for (i = 0; i < mi_rows_sb_aligned; ++i)
memset(&cm->prev_mi[i * cm->mi_stride], 0, sizeof(*cm->prev_mi));
- cm->mi_grid_visible = cm->mi_grid_base;
- cm->prev_mi_grid_visible = cm->prev_mi_grid_base;
+ cm->mi_grid_base = cm->mi_grid_base;
+ cm->prev_mi_grid_base = cm->prev_mi_grid_base;
memset(cm->mi_grid_base, 0,
cm->mi_stride * mi_rows_sb_aligned * sizeof(*cm->mi_grid_base));
@@ -432,8 +432,8 @@
// Update the upper left visible macroblock ptrs.
cm->prev_mi_grid_base = cm->mi_grid_base;
cm->mi_grid_base = temp_base;
- cm->mi_grid_visible = cm->mi_grid_base;
- cm->prev_mi_grid_visible = cm->prev_mi_grid_base;
+ cm->mi_grid_base = cm->mi_grid_base;
+ cm->prev_mi_grid_base = cm->prev_mi_grid_base;
}
void av1_initialize_enc(void) {
@@ -773,7 +773,7 @@
static void update_reference_segmentation_map(AV1_COMP *cpi) {
AV1_COMMON *const cm = &cpi->common;
- MB_MODE_INFO **mi_4x4_ptr = cm->mi_grid_visible;
+ MB_MODE_INFO **mi_4x4_ptr = cm->mi_grid_base;
uint8_t *cache_ptr = cm->cur_frame->seg_map;
int row, col;
diff --git a/av1/encoder/encoder.h b/av1/encoder/encoder.h
index 0341fbf..a4e4c56 100644
--- a/av1/encoder/encoder.h
+++ b/av1/encoder/encoder.h
@@ -1293,7 +1293,7 @@
int mi_col) {
const AV1_COMMON *const cm = &cpi->common;
const int idx_str = xd->mi_stride * mi_row + mi_col;
- xd->mi = cm->mi_grid_visible + idx_str;
+ xd->mi = cm->mi_grid_base + idx_str;
xd->mi[0] = cm->mi + idx_str;
x->mbmi_ext = cpi->mbmi_ext_base + (mi_row * cm->mi_cols + mi_col);
}
diff --git a/av1/encoder/ethread.c b/av1/encoder/ethread.c
index 52e69ba..13b5b76 100644
--- a/av1/encoder/ethread.c
+++ b/av1/encoder/ethread.c
@@ -46,7 +46,7 @@
for (int mi_col = tile_info->mi_col_start;
mi_col < tile_info->mi_col_end; mi_col += mib_size) {
const int idx_str = cm->mi_stride * mi_row + mi_col;
- MB_MODE_INFO **mi = cm->mi_grid_visible + idx_str;
+ MB_MODE_INFO **mi = cm->mi_grid_base + idx_str;
MB_MODE_INFO *mbmi = mi[0];
if (mbmi->skip == 1 && (mbmi->sb_type == cm->seq_params.sb_size)) {
for (int lf_id = 0; lf_id < frame_lf_count; ++lf_id)
diff --git a/av1/encoder/firstpass.c b/av1/encoder/firstpass.c
index 9841ea2..9eda3ee 100644
--- a/av1/encoder/firstpass.c
+++ b/av1/encoder/firstpass.c
@@ -387,7 +387,7 @@
av1_setup_frame_size(cpi);
aom_clear_system_state();
- xd->mi = cm->mi_grid_visible;
+ xd->mi = cm->mi_grid_base;
xd->mi[0] = cm->mi;
x->e_mbd.mi[0]->sb_type = BLOCK_16X16;
@@ -412,7 +412,7 @@
av1_setup_pre_planes(xd, 0, lst_yv12, 0, 0, NULL, num_planes);
}
- xd->mi = cm->mi_grid_visible;
+ xd->mi = cm->mi_grid_base;
xd->mi[0] = cm->mi;
// Don't store luma on the fist pass since chroma is not computed
@@ -464,7 +464,7 @@
aom_clear_system_state();
const int idx_str = xd->mi_stride * mb_row * mb_scale + mb_col * mb_scale;
- xd->mi = cm->mi_grid_visible + idx_str;
+ xd->mi = cm->mi_grid_base + idx_str;
xd->mi[0] = cm->mi + idx_str;
xd->plane[0].dst.buf = new_yv12->y_buffer + recon_yoffset;
xd->plane[1].dst.buf = new_yv12->u_buffer + recon_uvoffset;
diff --git a/av1/encoder/pickcdef.c b/av1/encoder/pickcdef.c
index 3cfe02b..beada59 100644
--- a/av1/encoder/pickcdef.c
+++ b/av1/encoder/pickcdef.c
@@ -293,7 +293,7 @@
const int maxr = AOMMIN(cm->mi_rows - mi_row, MI_SIZE_64X64);
const int maxc = AOMMIN(cm->mi_cols - mi_col, MI_SIZE_64X64);
const int stride = cm->mi_stride;
- MB_MODE_INFO **mbmi = cm->mi_grid_visible + mi_row * stride + mi_col;
+ MB_MODE_INFO **mbmi = cm->mi_grid_base + mi_row * stride + mi_col;
for (int r = 0; r < maxr; ++r, mbmi += stride) {
for (int c = 0; c < maxc; ++c) {
if (!mbmi[c]->skip) return 0;
@@ -349,7 +349,7 @@
const int nvfb = (cm->mi_rows + MI_SIZE_64X64 - 1) / MI_SIZE_64X64;
const int nhfb = (cm->mi_cols + MI_SIZE_64X64 - 1) / MI_SIZE_64X64;
- MB_MODE_INFO **mbmi = cm->mi_grid_visible;
+ MB_MODE_INFO **mbmi = cm->mi_grid_base;
for (int r = 0; r < nvfb; ++r) {
for (int c = 0; c < nhfb; ++c) {
mbmi[MI_SIZE_64X64 * c]->cdef_strength = 0;
@@ -452,8 +452,8 @@
if (sb_all_skip(cm, fbr * MI_SIZE_64X64, fbc * MI_SIZE_64X64)) continue;
const MB_MODE_INFO *const mbmi =
- cm->mi_grid_visible[MI_SIZE_64X64 * fbr * cm->mi_stride +
- MI_SIZE_64X64 * fbc];
+ cm->mi_grid_base[MI_SIZE_64X64 * fbr * cm->mi_stride +
+ MI_SIZE_64X64 * fbc];
if (((fbc & 1) &&
(mbmi->sb_type == BLOCK_128X128 || mbmi->sb_type == BLOCK_128X64)) ||
((fbr & 1) &&
@@ -569,7 +569,7 @@
best_mse = curr;
}
}
- cm->mi_grid_visible[sb_index[i]]->cdef_strength = best_gi;
+ cm->mi_grid_base[sb_index[i]]->cdef_strength = best_gi;
}
if (fast) {
diff --git a/av1/encoder/segmentation.c b/av1/encoder/segmentation.c
index 71af388..9c1ede1 100644
--- a/av1/encoder/segmentation.c
+++ b/av1/encoder/segmentation.c
@@ -189,7 +189,7 @@
for (tile_col = 0; tile_col < cm->tile_cols; tile_col++) {
MB_MODE_INFO **mi_ptr;
av1_tile_set_col(&tile_info, cm, tile_col);
- mi_ptr = cm->mi_grid_visible + tile_info.mi_row_start * cm->mi_stride +
+ mi_ptr = cm->mi_grid_base + tile_info.mi_row_start * cm->mi_stride +
tile_info.mi_col_start;
for (mi_row = tile_info.mi_row_start; mi_row < tile_info.mi_row_end;
mi_row += cm->seq_params.mib_size,
diff --git a/av1/encoder/tpl_model.c b/av1/encoder/tpl_model.c
index 4f98c09..d014729 100644
--- a/av1/encoder/tpl_model.c
+++ b/av1/encoder/tpl_model.c
@@ -496,7 +496,7 @@
}
}
- xd->mi = cm->mi_grid_visible;
+ xd->mi = cm->mi_grid_base;
xd->mi[0] = cm->mi;
xd->block_ref_scale_factors[0] = &sf;
