Commit 4c69a1ac authored by Peter de Rivaz's avatar Peter de Rivaz

Don't warp sub 8x8 chroma blocks

BUG=aomedia:896

Change-Id: I414a1d7c924609ceb1cbf3edabae74d7521b8e55
parent 13f0d9cd
...@@ -162,23 +162,25 @@ static INLINE void av1_make_inter_predictor( ...@@ -162,23 +162,25 @@ static INLINE void av1_make_inter_predictor(
#if CONFIG_WARPED_MOTION || CONFIG_GLOBAL_MOTION #if CONFIG_WARPED_MOTION || CONFIG_GLOBAL_MOTION
WarpedMotionParams final_warp_params; WarpedMotionParams final_warp_params;
const int do_warp = allow_warp( const int do_warp =
mi, warp_types, (w >= 8 && h >= 8 &&
allow_warp(mi, warp_types,
#if CONFIG_GLOBAL_MOTION #if CONFIG_GLOBAL_MOTION
#if CONFIG_COMPOUND_SINGLEREF #if CONFIG_COMPOUND_SINGLEREF
// TODO(zoeliu): To further check the single // TODO(zoeliu): To further check the single
// ref comp mode to work together with // ref comp mode to work together with
// global motion. // global motion.
has_second_ref(&mi->mbmi) ? &xd->global_motion[mi->mbmi.ref_frame[ref]] has_second_ref(&mi->mbmi)
: &xd->global_motion[mi->mbmi.ref_frame[0]], ? &xd->global_motion[mi->mbmi.ref_frame[ref]]
: &xd->global_motion[mi->mbmi.ref_frame[0]],
#else // !(CONFIG_COMPOUND_SINGLEREF) #else // !(CONFIG_COMPOUND_SINGLEREF)
&xd->global_motion[mi->mbmi.ref_frame[ref]], &xd->global_motion[mi->mbmi.ref_frame[ref]],
#endif // CONFIG_COMPOUND_SINGLEREF #endif // CONFIG_COMPOUND_SINGLEREF
#endif // CONFIG_GLOBAL_MOTION #endif // CONFIG_GLOBAL_MOTION
#if CONFIG_MOTION_VAR #if CONFIG_MOTION_VAR
build_for_obmc, build_for_obmc,
#endif // CONFIG_MOTION_VAR #endif // CONFIG_MOTION_VAR
&final_warp_params); &final_warp_params));
if (do_warp if (do_warp
#if CONFIG_AMVR #if CONFIG_AMVR
&& xd->cur_frame_mv_precision_level == 0 && xd->cur_frame_mv_precision_level == 0
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment