commit 860def604b97cb96b4e76cf83f9ddf4f331ba228
author Thomas Davies <thdavies@cisco.com> Wed Jun 14 10:00:03 2017 +0100
committer Thomas Davies <thdavies@cisco.com> Fri Jun 16 19:18:56 2017 +0000
tree 4a96c7bb5271755803c5d4283d5ed8a8ac66f270
parent 149eda5685beb100b1efeda0b8ff5814fda43699

NEW_MULTISYMBOL: adapt comp_inter_mode.

Change-Id: I2e783a16418708c6403de3c2e84450dbc83df3b7

av1/encoder/bitstream.c

diff --git a/av1/encoder/bitstream.c b/av1/encoder/bitstream.c
index bae2c0a..35483a9 100644
--- a/av1/encoder/bitstream.c
+++ b/av1/encoder/bitstream.c
@@ -1238,11 +1238,13 @@
     // does the feature use compound prediction or not
     // (if not specified at the frame/segment level)
     if (cm->reference_mode == REFERENCE_MODE_SELECT) {
-#if SUB8X8_COMP_REF
-      aom_write(w, is_compound, av1_get_reference_mode_prob(cm, xd));
-#else
+#if !SUB8X8_COMP_REF
       if (mbmi->sb_type != BLOCK_4X4)
-        aom_write(w, is_compound, av1_get_reference_mode_prob(cm, xd));
+#endif
+#if CONFIG_NEW_MULTISYMBOL
+        aom_write_symbol(w, is_compound, av1_get_reference_mode_cdf(cm, xd), 2);
+#else
+      aom_write(w, is_compound, av1_get_reference_mode_prob(cm, xd));
 #endif
     } else {
       assert((!is_compound) == (cm->reference_mode == SINGLE_REFERENCE));
@@ -5019,6 +5021,7 @@
                                 counts->intra_inter[i], probwt);
 #endif
 
+#if !CONFIG_NEW_MULTISYMBOL
     if (cpi->allow_comp_inter_inter) {
       const int use_hybrid_pred = cm->reference_mode == REFERENCE_MODE_SELECT;
       if (use_hybrid_pred)
@@ -5026,6 +5029,7 @@
           av1_cond_prob_diff_update(header_bc, &fc->comp_inter_prob[i],
                                     counts->comp_inter[i], probwt);
     }
+#endif
 
     if (cm->reference_mode != COMPOUND_REFERENCE) {
       for (i = 0; i < REF_CONTEXTS; i++) {