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/common/tile_common.c b/av1/common/tile_common.c
index 62ceb12..76a7e9d 100644
--- a/av1/common/tile_common.c
+++ b/av1/common/tile_common.c
@@ -60,28 +60,39 @@
}
#endif // !CONFIG_EXT_TILE
-#if CONFIG_DEBLOCKING_ACROSS_TILES
-void av1_update_tile_boundary_info(const struct AV1Common *cm,
- const TileInfo *const tile_info, int mi_row,
- int mi_col) {
+void av1_update_boundary_info(const struct AV1Common *cm,
+ const TileInfo *const tile_info, int mi_row,
+ int mi_col) {
int row, col;
for (row = mi_row; row < (mi_row + cm->mib_size); row++)
for (col = mi_col; col < (mi_col + cm->mib_size); col++) {
MODE_INFO *const mi = cm->mi + row * cm->mi_stride + col;
- mi->mbmi.tile_boundary_info = 0;
- if (row == tile_info->mi_row_start)
- mi->mbmi.tile_boundary_info |= TILE_ABOVE_BOUNDARY;
- if (col == tile_info->mi_col_start)
- mi->mbmi.tile_boundary_info |= TILE_LEFT_BOUNDARY;
- if ((row + 1) >= tile_info->mi_row_end)
- mi->mbmi.tile_boundary_info |= TILE_BOTTOM_BOUNDARY;
- if ((col + 1) >= tile_info->mi_col_end)
- mi->mbmi.tile_boundary_info |= TILE_RIGHT_BOUNDARY;
+ mi->mbmi.boundary_info = 0;
+ if (cm->tile_cols * cm->tile_rows > 1) {
+ if (row == tile_info->mi_row_start)
+ mi->mbmi.boundary_info |= TILE_ABOVE_BOUNDARY;
+ if (col == tile_info->mi_col_start)
+ mi->mbmi.boundary_info |= TILE_LEFT_BOUNDARY;
+ if ((row + 1) >= tile_info->mi_row_end)
+ mi->mbmi.boundary_info |= TILE_BOTTOM_BOUNDARY;
+ if ((col + 1) >= tile_info->mi_col_end)
+ mi->mbmi.boundary_info |= TILE_RIGHT_BOUNDARY;
+ }
+ // Frame boundary is treated as tile boundary
+ if (row == 0)
+ mi->mbmi.boundary_info |= FRAME_ABOVE_BOUNDARY | TILE_ABOVE_BOUNDARY;
+ if (col == 0)
+ mi->mbmi.boundary_info |= FRAME_LEFT_BOUNDARY | TILE_LEFT_BOUNDARY;
+ if ((row + 1) >= cm->mi_rows)
+ mi->mbmi.boundary_info |= FRAME_BOTTOM_BOUNDARY | TILE_BOTTOM_BOUNDARY;
+ if ((col + 1) >= cm->mi_cols)
+ mi->mbmi.boundary_info |= FRAME_RIGHT_BOUNDARY | TILE_RIGHT_BOUNDARY;
}
}
+#if CONFIG_LOOPFILTERING_ACROSS_TILES
int av1_disable_loopfilter_on_tile_boundary(const struct AV1Common *cm) {
return (!cm->loop_filter_across_tiles_enabled &&
(cm->tile_cols * cm->tile_rows > 1));
}
-#endif // CONFIG_DEBLOCKING_ACROSS_TILES
+#endif // CONFIG_LOOPFILTERING_ACROSS_TILES