Intrabc high bit depth functionality

Fixing compile errors when intrabc and vp9_highbitdepth are both enabled.
Error arose because intrabc uses vp9_setup_scale_factors_for_frame()
which takes an additional argument (use_highbitdepth) when
vp9_highbitdepth is enabled.

Change-Id: I6a15b09dcea0d35525f4c25efb6848804ae5cfab
This commit is contained in:
Julia Robson 2015-05-21 17:53:14 +01:00
parent c238d6cd72
commit 153d824207

View File

@ -1336,8 +1336,13 @@ static void dec_build_inter_predictors(MACROBLOCKD *xd, int plane, int block,
#if CONFIG_INTRABC
const int is_intrabc = is_intrabc_mode(mi->mbmi.mode);
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);
#endif // CONFIG_VP9_HIGHBITDEPTH
assert(!is_intrabc || !is_compound);
#endif // CONFIG_INTRABC