commit 599dfd01f097588aa3faf3dec321de5f4441432a
author David Barker <david.barker@argondesign.com> Thu Nov 10 13:20:12 2016 +0000
committer Debargha Mukherjee <debargha@google.com> Thu Nov 10 15:25:25 2016 +0000
tree eefeab3bf26f950c414b9b6222ec251559095a92
parent f541932b00aa1ba810db3c2e1f4ea1a643c4d420

Fix compile error with ref-mv

Change-Id: If7a117b78473d5b1f02b0219ddc314c7be7fbbbf

av1/decoder/decodeframe.c

diff --git a/av1/decoder/decodeframe.c b/av1/decoder/decodeframe.c
index 9452cb1..a2c583a 100644
--- a/av1/decoder/decodeframe.c
+++ b/av1/decoder/decodeframe.c
@@ -4234,7 +4234,11 @@
   }
 #if CONFIG_EC_MULTISYMBOL
   av1_coef_pareto_cdfs(fc);
+#if CONFIG_REF_MV
+  for (i = 0; i < NMV_CONTEXTS; ++i) av1_set_mv_cdfs(&fc->nmvc[i]);
+#else
   av1_set_mv_cdfs(&fc->nmvc);
+#endif
 #if CONFIG_DAALA_EC
   av1_set_mode_cdfs(cm);
 #endif

av1/encoder/bitstream.c

diff --git a/av1/encoder/bitstream.c b/av1/encoder/bitstream.c
index 26de7c7..f9faa1c 100644
--- a/av1/encoder/bitstream.c
+++ b/av1/encoder/bitstream.c
@@ -4164,9 +4164,15 @@
                         &counts->mv);
 #endif
 #if CONFIG_DAALA_EC
+#if CONFIG_REF_MV
+    for (i = 0; i < NMV_CONTEXTS; ++i)
+      av1_tree_to_cdf(av1_mv_joint_tree, cm->fc->nmvc[i].joints,
+                      cm->fc->nmvc[i].joint_cdf);
+#else
     av1_tree_to_cdf(av1_mv_joint_tree, cm->fc->nmvc.joints,
                     cm->fc->nmvc.joint_cdf);
 #endif
+#endif
 #if !CONFIG_EC_ADAPT
     update_ext_tx_probs(cm, header_bc);
 #endif
@@ -4179,7 +4185,11 @@
   }
 #if CONFIG_EC_MULTISYMBOL
   av1_coef_pareto_cdfs(fc);
+#if CONFIG_REF_MV
+  for (i = 0; i < NMV_CONTEXTS; ++i) av1_set_mv_cdfs(&fc->nmvc[i]);
+#else
   av1_set_mv_cdfs(&fc->nmvc);
+#endif
 #if CONFIG_DAALA_EC
   av1_set_mode_cdfs(cm);
 #endif