commit 8a92cd0bc22ccaee59b8e5c5ee391c377026d0ed
author Yue Chen <yuec@google.com> Tue Oct 24 21:01:36 2017 +0000
committer Yue Chen <yuec@google.com> Tue Oct 24 23:34:49 2017 +0000
tree eeac6eca51718e9d359f0efc2935761ee1033acc
parent b90a97a840e2aaeab6a64f25dd4288041038c7af

Revert "Don't reject invalid warped motion model"

This reverts commit 1eac584f4bc066b8b3c0a1c413b2d0e453bb38a1.

Reason for revert: As Peter pointed out, reverting motion_mode to SIMPLE_TRANSLATION only at the decoder side could mess up coding of compound_type. We'll fix this issue from encoder side.

Change-Id: Ic9b3b8e0f0d06b22630d5f870a8d9737a596fa22

av1/decoder/decodemv.c

diff --git a/av1/decoder/decodemv.c b/av1/decoder/decodemv.c
index 0377f7b..2c5389a 100644
--- a/av1/decoder/decodemv.c
+++ b/av1/decoder/decodemv.c
@@ -2609,9 +2609,7 @@
     if (find_projection(mbmi->num_proj_ref[0], pts, pts_inref, bsize,
                         mbmi->mv[0].as_mv.row, mbmi->mv[0].as_mv.col,
                         &mbmi->wm_params[0], mi_row, mi_col)) {
-      // Invalid warped model, fallback to default
-      mbmi->wm_params[0] = default_warp_params;
-      mbmi->motion_mode = SIMPLE_TRANSLATION;
+      aom_internal_error(&cm->error, AOM_CODEC_ERROR, "Invalid Warped Model");
     }
   }
 #endif  // CONFIG_WARPED_MOTION