Merge "Intrabc high bit depth functionality" into nextgen

This commit is contained in:
Debargha Mukherjee 2015-05-28 22:40:37 +00:00 committed by Gerrit Code Review
commit fe79548bc8

View File

@ -1336,8 +1336,13 @@ static void dec_build_inter_predictors(MACROBLOCKD *xd, int plane, int block,
#if CONFIG_INTRABC #if CONFIG_INTRABC
const int is_intrabc = is_intrabc_mode(mi->mbmi.mode); const int is_intrabc = is_intrabc_mode(mi->mbmi.mode);
struct scale_factors sf1; struct scale_factors sf1;
int use_highbitdepth = (xd->cur_buf->flags & YV12_FLAG_HIGHBITDEPTH);
#if CONFIG_VP9_HIGHBITDEPTH
vp9_setup_scale_factors_for_frame(&sf1, 64, 64, 64, 64, use_highbitdepth);
#else
vp9_setup_scale_factors_for_frame(&sf1, 64, 64, 64, 64); vp9_setup_scale_factors_for_frame(&sf1, 64, 64, 64, 64);
#endif // CONFIG_VP9_HIGHBITDEPTH
assert(!is_intrabc || !is_compound); assert(!is_intrabc || !is_compound);
#endif // CONFIG_INTRABC #endif // CONFIG_INTRABC