Renamings for OBMC experiment
To get ready for pulling AV1 to nextgenv2
Replace the experimental flag by MOTION_VAR. Rename major variables.
Change-Id: If6cf4f37b9319c46d8f90df551cc7295d66ca205
diff --git a/av1/encoder/mcomp.h b/av1/encoder/mcomp.h
index f5ac0e3..f1eccc2 100644
--- a/av1/encoder/mcomp.h
+++ b/av1/encoder/mcomp.h
@@ -140,7 +140,7 @@
const MV *ref_mv, MV *dst_mv, int is_second);
#endif // CONFIG_EXT_INTER
-#if CONFIG_OBMC
+#if CONFIG_MOTION_VAR
int av1_obmc_full_pixel_diamond(const struct AV1_COMP *cpi, MACROBLOCK *x,
const int32_t *wsrc, const int32_t *mask,
MV *mvp_full, int step_param, int sadpb,
@@ -153,7 +153,7 @@
int allow_hp, int error_per_bit, const aom_variance_fn_ptr_t *vfp,
int forced_stop, int iters_per_step, int *mvjcost, int *mvcost[2],
int *distortion, unsigned int *sse1, int is_second, int use_upsampled_ref);
-#endif // CONFIG_OBMC
+#endif // CONFIG_MOTION_VAR
#ifdef __cplusplus
} // extern "C"
#endif
