ref: 7addafb5b15be973e81ec408b34c9ab1d812afab
parent: 9bd59ad3edb77f6b29960da2c4ae77f8e1d5ae63
parent: 501ae3484c245738a12fc64a9ebb4d3c114fbf09
author: John Koleszar <jkoleszar@google.com>
date: Wed May 15 16:58:15 EDT 2013
Merge "Fix vp9_build_intra_predictors_sbuv_s for non-4:2:0" into experimental
--- a/vp9/common/vp9_reconintra.c
+++ b/vp9/common/vp9_reconintra.c
@@ -378,19 +378,21 @@
void vp9_build_intra_predictors_sbuv_s(MACROBLOCKD *xd,
BLOCK_SIZE_TYPE bsize) {- const int bwl = b_width_log2(bsize), bw = 2 << bwl;
- const int bhl = b_height_log2(bsize), bh = 2 << bhl;
+ int p;
- vp9_build_intra_predictors(xd->plane[1].dst.buf, xd->plane[1].dst.stride,
- xd->plane[1].dst.buf, xd->plane[1].dst.stride,
- xd->mode_info_context->mbmi.uv_mode,
- bw, bh, xd->up_available,
- xd->left_available, 0 /*xd->right_available*/);
- vp9_build_intra_predictors(xd->plane[2].dst.buf, xd->plane[1].dst.stride,
- xd->plane[2].dst.buf, xd->plane[1].dst.stride,
- xd->mode_info_context->mbmi.uv_mode,
- bw, bh, xd->up_available,
- xd->left_available, 0 /*xd->right_available*/);
+ for (p = 1; p < MAX_MB_PLANE; p++) {+ const struct macroblockd_plane* const pd = &xd->plane[p];
+ const int bwl = b_width_log2(bsize) - pd->subsampling_x;
+ const int bw = 4 << bwl;
+ const int bhl = b_height_log2(bsize) - pd->subsampling_y;
+ const int bh = 4 << bhl;
+
+ vp9_build_intra_predictors(pd->dst.buf, pd->dst.stride,
+ pd->dst.buf, pd->dst.stride,
+ xd->mode_info_context->mbmi.uv_mode,
+ bw, bh, xd->up_available,
+ xd->left_available, 0 /*xd->right_available*/);
+ }
}
void vp9_intra4x4_predict(MACROBLOCKD *xd,