Commit 6ae7e0e5 authored by Frederic Barbier's avatar Frederic Barbier Committed by Frédéric BARBIER

Disable warp motion from scaled ref

BUG=aomedia:817

Change-Id: Iaf5ef62416b05c0b3d07da77705cf471751a126c
parent 9e539cd2
......@@ -33,8 +33,11 @@
static INLINE int allow_warp(const MODE_INFO *const mi,
const WarpTypesAllowed *const warp_types,
const WarpedMotionParams *const gm_params,
int build_for_obmc,
int build_for_obmc, int x_scale, int y_scale,
WarpedMotionParams *final_warp_params) {
if (x_scale != SCALE_SUBPEL_SHIFTS || y_scale != SCALE_SUBPEL_SHIFTS)
return 0;
const MB_MODE_INFO *const mbmi = &mi->mbmi;
*final_warp_params = default_warp_params;
......@@ -86,7 +89,7 @@ static INLINE void av1_make_inter_predictor(
#else // !(CONFIG_COMPOUND_SINGLEREF)
&xd->global_motion[mi->mbmi.ref_frame[ref]],
#endif // CONFIG_COMPOUND_SINGLEREF
build_for_obmc, &final_warp_params));
build_for_obmc, xs, ys, &final_warp_params));
if (do_warp
#if CONFIG_AMVR
&& xd->cur_frame_force_integer_mv == 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