commit 742f646f50f43c1ee43eebe3003ff31f0f6f55f5
author Sebastien Alaiwan <sebastien.alaiwan@allegrodvt.com> Wed Jan 10 15:12:30 2018 +0100
committer Sebastien Alaiwan <sebastien.alaiwan@allegrodvt.com> Wed Jan 10 20:31:06 2018 +0000
tree e0c975110ee002aabc1b54d328f18e0774a32b8d
parent 2830fd9fe6c2078db53302c0285d400691a268b7

Prevent warp if global_motion_params are invalid

BUG=aomedia:1195

Change-Id: Ib643ed9d3a23b83e91d908940f5777f6d13b8b19

av1/common/reconinter.c

diff --git a/av1/common/reconinter.c b/av1/common/reconinter.c
index 75c5baf..9e6275f 100644
--- a/av1/common/reconinter.c
+++ b/av1/common/reconinter.c
@@ -40,6 +40,7 @@
   *final_warp_params = default_warp_params;
 
   if (mbmi->wm_params[0].invalid) return 0;
+  if (gm_params->invalid) return 0;
 
   if (warp_types->local_warp_allowed) {
     if ((build_for_obmc && WARP_WM_NEIGHBORS_WITH_OBMC) || (!build_for_obmc)) {

av1/encoder/global_motion.c

diff --git a/av1/encoder/global_motion.c b/av1/encoder/global_motion.c
index ec583e3..3bfbdd7 100644
--- a/av1/encoder/global_motion.c
+++ b/av1/encoder/global_motion.c
@@ -76,6 +76,7 @@
 void convert_model_to_params(const double *params, WarpedMotionParams *model) {
   convert_to_params(params, model->wmmat);
   model->wmtype = get_gmtype(model);
+  model->invalid = 0;
 }
 
 // Adds some offset to a global motion parameter and handles