diff options
| author | Yunqing Wang <yunqingwang@google.com> | 2012-07-03 15:22:00 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2012-07-03 15:22:00 -0700 |
| commit | cdc35037a538066bc3c14ba784d258d7d2aef4e6 (patch) | |
| tree | d3664894348e9d6784fdab41d0dde14a6ec97833 | |
| parent | acd147c50c02e43b1426450033b71d8ad28e6b98 (diff) | |
| parent | b29369856198c911a0e6a658d361936c178047d0 (diff) | |
| download | libvpx-cdc35037a538066bc3c14ba784d258d7d2aef4e6.tar libvpx-cdc35037a538066bc3c14ba784d258d7d2aef4e6.tar.gz libvpx-cdc35037a538066bc3c14ba784d258d7d2aef4e6.tar.bz2 libvpx-cdc35037a538066bc3c14ba784d258d7d2aef4e6.zip | |
Merge "Fix subpixel_predict initialization"
| -rw-r--r-- | vp8/encoder/firstpass.c | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/vp8/encoder/firstpass.c b/vp8/encoder/firstpass.c index a6db5af28..f0d2d3807 100644 --- a/vp8/encoder/firstpass.c +++ b/vp8/encoder/firstpass.c @@ -545,6 +545,21 @@ void vp8_first_pass(VP8_COMP *cpi) xd->mode_info_context = cm->mi; + if(!cm->use_bilinear_mc_filter) + { + xd->subpixel_predict = vp8_sixtap_predict4x4; + xd->subpixel_predict8x4 = vp8_sixtap_predict8x4; + xd->subpixel_predict8x8 = vp8_sixtap_predict8x8; + xd->subpixel_predict16x16 = vp8_sixtap_predict16x16; + } + else + { + xd->subpixel_predict = vp8_bilinear_predict4x4; + xd->subpixel_predict8x4 = vp8_bilinear_predict8x4; + xd->subpixel_predict8x8 = vp8_bilinear_predict8x8; + xd->subpixel_predict16x16 = vp8_bilinear_predict16x16; + } + vp8_build_block_offsets(x); vp8_setup_block_dptrs(&x->e_mbd); |