commit d9b5726f001a40c9837779ea92b9ceca45bda047
author Thomas Davies <thdavies@cisco.com> Tue Jun 27 17:43:25 2017 +0100
committer Thomas Davies <thdavies@cisco.com> Mon Jul 10 23:20:16 2017 +0000
tree fd46ad577d67f0dcb897f4d9d88b71575eadaf16
parent d1b8c2a3c6a89193d27fc3a12391c921dd4c6f4d

NEW_MULTISYMBOL: adapt obmc syntax.

Change-Id: Iea00482779cd3fdc7f354d5c39684dd0752d0849

av1/decoder/decodemv.c

diff --git a/av1/decoder/decodemv.c b/av1/decoder/decodemv.c
index 5f3e83d..79dd298 100644
--- a/av1/decoder/decodemv.c
+++ b/av1/decoder/decodemv.c
@@ -342,7 +342,12 @@
   if (last_motion_mode_allowed == SIMPLE_TRANSLATION) return SIMPLE_TRANSLATION;
 #if CONFIG_MOTION_VAR && CONFIG_WARPED_MOTION
   if (last_motion_mode_allowed == OBMC_CAUSAL) {
+#if CONFIG_NEW_MULTISYMBOL
+    motion_mode =
+        aom_read_symbol(r, xd->tile_ctx->obmc_cdf[mbmi->sb_type], 2, ACCT_STR);
+#else
     motion_mode = aom_read(r, cm->fc->obmc_prob[mbmi->sb_type], ACCT_STR);
+#endif
     if (counts) ++counts->obmc[mbmi->sb_type][motion_mode];
     return (MOTION_MODE)(SIMPLE_TRANSLATION + motion_mode);
   } else {