commit 00021354b558bec28ad6302c43840e2517a5587c
author Thomas Davies <thdavies@cisco.com> Tue Jul 11 16:07:55 2017 +0100
committer Thomas Davies <thdavies@cisco.com> Thu Jul 13 18:43:26 2017 +0000
tree da7b62a92c6103969ad27168c38acb573e5ba2a7
parent 7eab9ff19dde07a76d20abcf6d4fb793874ebad1

NEW_MULTISYMBOL: add CDF for segment_id prediction.

With aq-mode=1 (which forces segmentation), AWCY
gives -0.12% (objective-1-fast, cpu-used=4,
NEW_MULTISYMBOL on for reference and tested).

No change to baseline metrics, with or without
NEW_MULTISYMBOL.

Change-Id: I841a9e8978598402dacfbca9265269163f7440c0

av1/decoder/decodemv.c

diff --git a/av1/decoder/decodemv.c b/av1/decoder/decodemv.c
index 53de878..76f4c6d 100644
--- a/av1/decoder/decodemv.c
+++ b/av1/decoder/decodemv.c
@@ -661,8 +661,13 @@
 
   if (seg->temporal_update) {
     const int ctx = av1_get_pred_context_seg_id(xd);
+#if CONFIG_NEW_MULTISYMBOL
+    aom_cdf_prob *pred_cdf = segp->pred_cdf[ctx];
+    mbmi->seg_id_predicted = aom_read_symbol(r, pred_cdf, 2, ACCT_STR);
+#else
     const aom_prob pred_prob = segp->pred_probs[ctx];
     mbmi->seg_id_predicted = aom_read(r, pred_prob, ACCT_STR);
+#endif
     if (counts) ++counts->seg.pred[ctx][mbmi->seg_id_predicted];
     if (mbmi->seg_id_predicted) {
       segment_id = predicted_segment_id;