Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Xiph.Org
aom-rav1e
Commits
7f929d29
Commit
7f929d29
authored
Jun 21, 2016
by
Debargha Mukherjee
Committed by
Gerrit Code Review
Jun 21, 2016
Browse files
Merge "Always respect tile bounds in calc_target_weighted_pred." into nextgenv2
parents
db328a6b
78bd14b3
Changes
1
Hide whitespace changes
Inline
Side-by-side
vp10/encoder/rdopt.c
View file @
7f929d29
...
...
@@ -11069,7 +11069,6 @@ void calc_target_weighted_pred(VP10_COMMON *cm,
uint8_t *left_buf, int left_stride,
int *mask_buf, int mask_stride,
int *weighted_src_buf, int weighted_src_stride) {
const TileInfo *const tile = &xd->tile;
BLOCK_SIZE bsize = xd->mi[0]->mbmi.sb_type;
int row, col, i, mi_step;
int bw = 8 * xd->n8_w;
...
...
@@ -11090,11 +11089,7 @@ void calc_target_weighted_pred(VP10_COMMON *cm,
}
// handle above row
#if CONFIG_EXT_TILE
if (mi_row > 0 && (mi_row - 1 >= tile->mi_row_start)) {
#else
if (mi_row > 0) {
#endif // CONFIG_EXT_TILE
if (xd->up_available) {
for (i = 0; i < VPXMIN(xd->n8_w, cm->mi_cols - mi_col); i += mi_step) {
int mi_row_offset = -1;
int mi_col_offset = i;
...
...
@@ -11163,7 +11158,7 @@ void calc_target_weighted_pred(VP10_COMMON *cm,
mask2d += mask_stride;
}
if (
mi_col > 0 && (mi_col - 1 >= tile->mi_col_start)
) {
if (
xd->left_available
) {
for (i = 0; i < VPXMIN(xd->n8_h, cm->mi_rows - mi_row); i += mi_step) {
int mi_row_offset = i;
int mi_col_offset = -1;
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment