diff options
| author | Ronald S. Bultje <rbultje@google.com> | 2013-07-09 09:54:43 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2013-07-09 09:54:43 -0700 |
| commit | d8fa5d45cc6ce2ee455ee7308ee7e2eeed83b709 (patch) | |
| tree | dac17758ece742b55bbd3f33712fb8dcb51dc6af /vp9/encoder | |
| parent | 7f960223eaf9ad719995c7c3d250c367340f8704 (diff) | |
| parent | 8350e7fe38ef7fe76ae995b8e1f1c68b26c6a91d (diff) | |
| download | libvpx-d8fa5d45cc6ce2ee455ee7308ee7e2eeed83b709.tar libvpx-d8fa5d45cc6ce2ee455ee7308ee7e2eeed83b709.tar.gz libvpx-d8fa5d45cc6ce2ee455ee7308ee7e2eeed83b709.tar.bz2 libvpx-d8fa5d45cc6ce2ee455ee7308ee7e2eeed83b709.zip | |
Merge "Make intra prediction pointers RTCD-based."
Diffstat (limited to 'vp9/encoder')
| -rw-r--r-- | vp9/encoder/vp9_mbgraph.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/vp9/encoder/vp9_mbgraph.c b/vp9/encoder/vp9_mbgraph.c index 93c260545..9637393f2 100644 --- a/vp9/encoder/vp9_mbgraph.c +++ b/vp9/encoder/vp9_mbgraph.c @@ -15,6 +15,7 @@ #include <vp9/encoder/vp9_rdopt.h> #include <vp9/common/vp9_blockd.h> #include <vp9/common/vp9_reconinter.h> +#include <vp9/common/vp9_reconintra.h> #include <vp9/common/vp9_systemdependent.h> #include <vp9/encoder/vp9_segmentation.h> @@ -146,16 +147,11 @@ static int find_best_16x16_intra(VP9_COMP *cpi, // we're intentionally not doing 4x4, we just want a rough estimate for (mode = DC_PRED; mode <= TM_PRED; mode++) { unsigned int err; - const int bwl = b_width_log2(BLOCK_SIZE_MB16X16), bw = 4 << bwl; - const int bhl = b_height_log2(BLOCK_SIZE_MB16X16), bh = 4 << bhl; xd->mode_info_context->mbmi.mode = mode; - vp9_build_intra_predictors(x->plane[0].src.buf, x->plane[0].src.stride, - xd->plane[0].dst.buf, xd->plane[0].dst.stride, - xd->mode_info_context->mbmi.mode, - bw, bh, - xd->up_available, xd->left_available, - xd->right_available); + vp9_predict_intra_block(xd, 0, 2, TX_16X16, mode, + x->plane[0].src.buf, x->plane[0].src.stride, + xd->plane[0].dst.buf, xd->plane[0].dst.stride); err = vp9_sad16x16(x->plane[0].src.buf, x->plane[0].src.stride, xd->plane[0].dst.buf, xd->plane[0].dst.stride, best_err); |