diff options
Diffstat (limited to 'vp9/common')
| -rw-r--r-- | vp9/common/vp9_loopfilter.c | 4 | ||||
| -rw-r--r-- | vp9/common/vp9_onyxc_int.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/vp9/common/vp9_loopfilter.c b/vp9/common/vp9_loopfilter.c index f623c21db..cad08bbf3 100644 --- a/vp9/common/vp9_loopfilter.c +++ b/vp9/common/vp9_loopfilter.c @@ -285,9 +285,9 @@ static void filter_block_plane(VP9_COMMON *cm, MACROBLOCKD *xd, // Determine the vertical edges that need filtering for (c = 0; c < 64 / MI_SIZE && mi_col + c < cm->mi_cols; c += col_step) { - const MODE_INFO const *mi = xd->mode_info_context; + const MODE_INFO * const mi = xd->mode_info_context; const int skip_this = mi[c].mbmi.mb_skip_coeff - && mi[c].mbmi.ref_frame != INTRA_FRAME; + && mi[c].mbmi.ref_frame[0] != INTRA_FRAME; // left edge of current unit is block/partition edge -> no skip const int block_edge_left = b_width_log2(mi[c].mbmi.sb_type) ? !(c & ((1 << (b_width_log2(mi[c].mbmi.sb_type)-1)) - 1)) : 1; diff --git a/vp9/common/vp9_onyxc_int.h b/vp9/common/vp9_onyxc_int.h index f461bf3ba..0d8b0f445 100644 --- a/vp9/common/vp9_onyxc_int.h +++ b/vp9/common/vp9_onyxc_int.h @@ -321,10 +321,10 @@ static int check_bsize_coverage(VP9_COMMON *cm, MACROBLOCKD *xd, assert(bsize > BLOCK_SIZE_SB8X8); // return the node index in the prob tree for binary coding - // skip horizontal/none partition types + // only allow horizontal/split partition types if ((mi_col + ms < cm->mi_cols) && (mi_row + ms >= cm->mi_rows)) return 1; - // skip vertical/none partition types + // only allow vertical/split partition types if ((mi_row + ms < cm->mi_rows) && (mi_col + ms >= cm->mi_cols)) return 2; |