commit cb60b185c73e0f15eeac71d83175345de9b03fa6
author Yue Chen <yuec@google.com> Thu Oct 13 15:18:22 2016 -0700
committer Yue Chen <yuec@google.com> Thu Oct 13 15:51:22 2016 -0700
tree 9ced84ad0af18b4a602fa515e4c112f934538851
parent 732c188523fe3341d621ebdd38481d3f92bf3452

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

av1/encoder/rd.c

diff --git a/av1/encoder/rd.c b/av1/encoder/rd.c
index 007f992..ee65107 100644
--- a/av1/encoder/rd.c
+++ b/av1/encoder/rd.c
@@ -450,12 +450,12 @@
                         cm->fc->interintra_mode_prob[i],
                         av1_interintra_mode_tree);
 #endif  // CONFIG_EXT_INTER
-#if CONFIG_OBMC || CONFIG_WARPED_MOTION
+#if CONFIG_MOTION_VAR || CONFIG_WARPED_MOTION
       for (i = BLOCK_8X8; i < BLOCK_SIZES; i++) {
-        av1_cost_tokens((int *)cpi->motvar_cost[i], cm->fc->motvar_prob[i],
-                        av1_motvar_tree);
+        av1_cost_tokens((int *)cpi->motion_mode_cost[i],
+                        cm->fc->motion_mode_prob[i], av1_motion_mode_tree);
       }
-#endif  // CONFIG_OBMC || CONFIG_WARPED_MOTION
+#endif  // CONFIG_MOTION_VAR || CONFIG_WARPED_MOTION
     }
   }
 }