commit dead17d27b2367f1bcdbf868c59e27d8b5c6c2c9
author Yue Chen <yuec@google.com> Thu Apr 20 16:19:39 2017 -0700
committer Yue Chen <yuec@google.com> Thu Apr 27 23:12:52 2017 +0000
tree 5d19fc69b998e0a9a661570e8861dbe12ad58a16
parent f7751bec80470f7de8c0852a95770348fa420f3a

Clear test failures and compiler warnings of MOTION_VAR

(1) Properly set params to default values to clear a unit test
failure when seg feature and motion_var are both on.
(2) Silenced compiling warnings in obmc variance functions.

Change-Id: Iaf4ee47c9941a228638d6046bcd1206f4a4f566a

aom_dsp/variance.c

diff --git a/aom_dsp/variance.c b/aom_dsp/variance.c
index 418332c..c5fb495 100644
--- a/aom_dsp/variance.c
+++ b/aom_dsp/variance.c
@@ -986,13 +986,13 @@
   }
 }
 
-#define OBMC_VAR(W, H)                                           \
-  unsigned int aom_obmc_variance##W##x##H##_c(                   \
-      const uint8_t *pre, int pre_stride, const int32_t *wsrc,   \
-      const int32_t *mask, unsigned int *sse) {                  \
-    int sum;                                                     \
-    obmc_variance(pre, pre_stride, wsrc, mask, W, H, sse, &sum); \
-    return *sse - (((int64_t)sum * sum) / (W * H));              \
+#define OBMC_VAR(W, H)                                            \
+  unsigned int aom_obmc_variance##W##x##H##_c(                    \
+      const uint8_t *pre, int pre_stride, const int32_t *wsrc,    \
+      const int32_t *mask, unsigned int *sse) {                   \
+    int sum;                                                      \
+    obmc_variance(pre, pre_stride, wsrc, mask, W, H, sse, &sum);  \
+    return *sse - (unsigned int)(((int64_t)sum * sum) / (W * H)); \
   }
 
 #define OBMC_SUBPIX_VAR(W, H)                                               \

aom_dsp/x86/obmc_variance_sse4.c

diff --git a/aom_dsp/x86/obmc_variance_sse4.c b/aom_dsp/x86/obmc_variance_sse4.c
index 92bd9b9..f7cb46d 100644
--- a/aom_dsp/x86/obmc_variance_sse4.c
+++ b/aom_dsp/x86/obmc_variance_sse4.c
@@ -124,7 +124,7 @@
     } else {                                                           \
       obmc_variance_w8n(pre, pre_stride, wsrc, mask, sse, &sum, W, H); \
     }                                                                  \
-    return *sse - (((int64_t)sum * sum) / (W * H));                    \
+    return *sse - (unsigned int)(((int64_t)sum * sum) / (W * H));      \
   }
 
 #if CONFIG_EXT_PARTITION

av1/encoder/rdopt.c

diff --git a/av1/encoder/rdopt.c b/av1/encoder/rdopt.c
index f65df2f..a1448b5 100644
--- a/av1/encoder/rdopt.c
+++ b/av1/encoder/rdopt.c
@@ -11410,6 +11410,11 @@
   mbmi->pred_mv[0].as_int = 0;
 #endif  // CONFIG_REF_MV
 
+  mbmi->motion_mode = SIMPLE_TRANSLATION;
+#if CONFIG_MOTION_VAR
+  av1_count_overlappable_neighbors(cm, xd, mi_row, mi_col);
+#endif
+
   if (cm->interp_filter != BILINEAR) {
     best_filter = EIGHTTAP_REGULAR;
     if (cm->interp_filter == SWITCHABLE &&