Merge "Some refactoring to support warped motion mode" into nextgenv2

diff --cc vp10/common/blockd.h
Simple merge

diff --cc vp10/common/enums.h
Simple merge

diff --cc vp10/common/reconinter.c
Simple merge

diff --cc vp10/decoder/decodeframe.c
Simple merge

diff --cc vp10/encoder/encoder.h
Simple merge

diff --cc vp10/encoder/rdopt.c
index 640a409c94f84baa434db4083827337bba44d632,5df08b82f1bfbc99dd2bd8e975edc2574ff7a8de..3cbcb6160e5da8f648223b2261c43d76f1b2ba16
--- 1/vp10/encoder/rdopt.c
--- 2/vp10/encoder/rdopt.c
+++ b/vp10/encoder/rdopt.c
@@@ -6774,14 -6941,14 +6774,14 @@@ static int64_t handle_inter_mode(VP10_C
  #endif
  #endif  // CONFIG_EXT_INTER
  #if CONFIG_VP9_HIGHBITDEPTH
 -  DECLARE_ALIGNED(16, uint8_t, tmp_buf_[2 * MAX_MB_PLANE * MAX_SB_SQUARE]);
 +  DECLARE_ALIGNED(16, uint16_t, tmp_buf16[MAX_MB_PLANE * MAX_SB_SQUARE]);
 +  uint8_t *tmp_buf;
  #else
 -  DECLARE_ALIGNED(16, uint8_t, tmp_buf_[MAX_MB_PLANE * MAX_SB_SQUARE]);
 +  DECLARE_ALIGNED(16, uint8_t, tmp_buf[MAX_MB_PLANE * MAX_SB_SQUARE]);
  #endif  // CONFIG_VP9_HIGHBITDEPTH
 -  uint8_t *tmp_buf;
  
- #if CONFIG_OBMC
-   int allow_obmc =
+ #if CONFIG_OBMC || CONFIG_WARPED_MOTION
+   int allow_motvar =
  #if CONFIG_EXT_INTER
        !is_comp_interintra_pred &&
  #endif  // CONFIG_EXT_INTER