diff options
| -rw-r--r-- | vp9/common/vp9_loopfilter.c | 4 | ||||
| -rw-r--r-- | vp9/common/vp9_onyxc_int.h | 4 | ||||
| -rw-r--r-- | vp9/encoder/vp9_onyx_if.c | 2 | ||||
| -rw-r--r-- | vp9/vp9_dx_iface.c | 1 |
4 files changed, 6 insertions, 5 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; diff --git a/vp9/encoder/vp9_onyx_if.c b/vp9/encoder/vp9_onyx_if.c index 92927370a..6a14df471 100644 --- a/vp9/encoder/vp9_onyx_if.c +++ b/vp9/encoder/vp9_onyx_if.c @@ -1981,7 +1981,7 @@ static void scale_and_extend_frame(YV12_BUFFER_CONFIG *src_fb, const int dst_stride = dst_strides[i]; uint8_t *src = srcs[i] + y / factor * in_h / out_h * src_stride + x / factor * in_w / out_w; - uint8_t *dst = dsts[i] + y * dst_stride + x; + uint8_t *dst = dsts[i] + y / factor * dst_stride + x / factor; vp9_convolve8(src, src_stride, dst, dst_stride, vp9_sub_pel_filters_8[x_q4 & 0xf], 16 * in_w / out_w, diff --git a/vp9/vp9_dx_iface.c b/vp9/vp9_dx_iface.c index c240a9e61..ea6946bd9 100644 --- a/vp9/vp9_dx_iface.c +++ b/vp9/vp9_dx_iface.c @@ -496,6 +496,7 @@ static vpx_image_t *vp8_get_frame(vpx_codec_alg_priv_t *ctx, *iter = img; } } + ctx->img_avail = 0; return img; } |