ref: cdc35037a538066bc3c14ba784d258d7d2aef4e6
parent: acd147c50c02e43b1426450033b71d8ad28e6b98
parent: b29369856198c911a0e6a658d361936c178047d0
author: Yunqing Wang <yunqingwang@google.com>
date: Tue Jul 3 11:22:00 EDT 2012
Merge "Fix subpixel_predict initialization"
--- a/vp8/encoder/firstpass.c
+++ b/vp8/encoder/firstpass.c
@@ -545,6 +545,21 @@
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);