commit 46970619f48e0a6dbaad2433030ef8c6165e6035
author Cheng Chen <chengchen@google.com> Tue Oct 24 14:53:36 2017 -0700
committer Cheng Chen <chengchen@google.com> Fri Nov 10 05:42:06 2017 +0000
tree eeef1376305fa1a830675f76c153abeb3cd5416b
parent 267e327242fc39bf873cccfd260f04acbb9529be

JNT_COMP: Support new_multisymbol

Support cdf for jnt_comp read/write.

Change-Id: I2c29277a8b06b3e9f571355946b70ce0d492fbb2

av1/decoder/decodemv.c

diff --git a/av1/decoder/decodemv.c b/av1/decoder/decodemv.c
index c724285..8fb19bc 100644
--- a/av1/decoder/decodemv.c
+++ b/av1/decoder/decodemv.c
@@ -2161,8 +2161,13 @@
 #if CONFIG_JNT_COMP
   if (has_two_sided_comp_refs(cm, mbmi)) {
     const int comp_index_ctx = get_comp_index_context(cm, xd);
+#if CONFIG_NEW_MULTISYMBOL
+    mbmi->compound_idx = aom_read_symbol(
+        r, ec_ctx->compound_index_cdf[comp_index_ctx], 2, ACCT_STR);
+#else
     mbmi->compound_idx =
         aom_read(r, ec_ctx->compound_index_probs[comp_index_ctx], ACCT_STR);
+#endif  // CONFIG_NEW_MULTISYMBOL
     if (xd->counts)
       ++xd->counts->compound_index[comp_index_ctx][mbmi->compound_idx];
   } else {