commit e6ed1bf04e1987262efbb3c01d8eff21201feaa3
author Thomas <thdavies@cisco.com> Mon Sep 26 08:45:02 2016 +0100
committer Thomas <thdavies@cisco.com> Mon Sep 26 09:02:16 2016 +0100
tree eaa34a8b77988b6507f5ecbc52811b0bd69a3eec
parent ce12003d60a1c8d6c65ed07ba165c34062fcbcbd

Fix compilation for MISC_FIXES and DELTA_Q experiments.

Use correct function signature.

Change-Id: Idf6dc05eb0ada42e719765fb607c5b217efe672a

av1/encoder/bitstream.c

diff --git a/av1/encoder/bitstream.c b/av1/encoder/bitstream.c
index c312b30..b87d37f 100644
--- a/av1/encoder/bitstream.c
+++ b/av1/encoder/bitstream.c
@@ -343,9 +343,14 @@
 static void update_delta_q_probs(AV1_COMMON *cm, aom_writer *w,
                                  FRAME_COUNTS *counts) {
   int k;
-
+#if CONFIG_TILE_GROUPS
+  const probwt = cm->num_tg;
+#else
+  const probwt = 1;
+#endif
   for (k = 0; k < DELTA_Q_CONTEXTS; ++k) {
-    av1_cond_prob_diff_update(w, &cm->fc->delta_q_prob[k], counts->delta_q[k]);
+    av1_cond_prob_diff_update(w, &cm->fc->delta_q_prob[k], counts->delta_q[k],
+                              probwt);
   }
 }
 #endif

av1/encoder/encodemv.c

diff --git a/av1/encoder/encodemv.c b/av1/encoder/encodemv.c
index 2e4a7e1..ce946f4 100644
--- a/av1/encoder/encodemv.c
+++ b/av1/encoder/encodemv.c
@@ -147,7 +147,7 @@
   // number
   av1_cond_prob_diff_update(w, cur_p, ct, MAX_NUM_TG);
 #else
-  av1_cond_prob_diff_update(w, cur_p, ct);
+  av1_cond_prob_diff_update(w, cur_p, ct, 1);
 #endif
 #else
   const aom_prob new_p = get_binary_prob(ct[0], ct[1]) | 1;