deblocking_across_tiles->loopfilter_across_tiles
This commit renames deblocking_across_tiles to loopfilter_across_tiles,
to get ready for dering and clpf integration.
Change-Id: Id25b051da9b1e5cb92f35a9619662597462d9537
diff --git a/av1/encoder/bitstream.c b/av1/encoder/bitstream.c
index 018f88a..d2cd5a9 100644
--- a/av1/encoder/bitstream.c
+++ b/av1/encoder/bitstream.c
@@ -3663,9 +3663,9 @@
if (cm->log2_tile_rows != 0) aom_wb_write_bit(wb, cm->log2_tile_rows != 1);
#endif // CONFIG_EXT_TILE
-#if CONFIG_DEBLOCKING_ACROSS_TILES
+#if CONFIG_LOOPFILTERING_ACROSS_TILES
aom_wb_write_bit(wb, cm->loop_filter_across_tiles_enabled);
-#endif // CONFIG_DEBLOCKING_ACROSS_TILES
+#endif // CONFIG_LOOPFILTERING_ACROSS_TILES
}
static int get_refresh_mask(AV1_COMP *cpi) {
diff --git a/av1/encoder/encodeframe.c b/av1/encoder/encodeframe.c
index 5ca471e..e6ce637 100644
--- a/av1/encoder/encodeframe.c
+++ b/av1/encoder/encodeframe.c
@@ -4543,11 +4543,8 @@
MODE_INFO **mi = cm->mi_grid_visible + idx_str;
PC_TREE *const pc_root = td->pc_root[cm->mib_size_log2 - MIN_MIB_SIZE_LOG2];
-#if CONFIG_DEBLOCKING_ACROSS_TILES
- if (av1_disable_loopfilter_on_tile_boundary(cm)) {
- av1_update_tile_boundary_info(cm, tile_info, mi_row, mi_col);
- }
-#endif // CONFIG_DEBLOCKING_ACROSS_TILES
+ av1_update_boundary_info(cm, tile_info, mi_row, mi_col);
+
if (sf->adaptive_pred_interp_filter) {
for (i = 0; i < leaf_nodes; ++i)
td->leaf_tree[i].pred_interp_filter = SWITCHABLE;
diff --git a/av1/encoder/encoder.c b/av1/encoder/encoder.c
index 2b51b40..d119268 100644
--- a/av1/encoder/encoder.c
+++ b/av1/encoder/encoder.c
@@ -868,10 +868,10 @@
cm->tile_height = ALIGN_POWER_OF_TWO(cm->tile_height, MAX_MIB_SIZE_LOG2);
#endif // CONFIG_EXT_TILE
-#if CONFIG_DEBLOCKING_ACROSS_TILES
+#if CONFIG_LOOPFILTERING_ACROSS_TILES
cm->loop_filter_across_tiles_enabled =
cpi->oxcf.loop_filter_across_tiles_enabled;
-#endif // CONFIG_DEBLOCKING_ACROSS_TILES
+#endif // CONFIG_LOOPFILTERING_ACROSS_TILES
}
static void update_frame_size(AV1_COMP *cpi) {
diff --git a/av1/encoder/encoder.h b/av1/encoder/encoder.h
index 1bcb7b8..cb83027 100644
--- a/av1/encoder/encoder.h
+++ b/av1/encoder/encoder.h
@@ -242,9 +242,9 @@
int tile_columns;
int tile_rows;
-#if CONFIG_DEBLOCKING_ACROSS_TILES
+#if CONFIG_LOOPFILTERING_ACROSS_TILES
int loop_filter_across_tiles_enabled;
-#endif // CONFIG_DEBLOCKING_ACROSS_TILES
+#endif // CONFIG_LOOPFILTERING_ACROSS_TILES
int max_threads;