commit c87b340ebcace9716d37b7c2ba5dada126103b8e
author Cheng Chen <chengchen@google.com> Fri Nov 03 16:02:41 2017 -0700
committer Cheng Chen <chengchen@google.com> Tue Nov 14 04:09:02 2017 +0000
tree 49427e8fd63bea79902bc8c76416a3ab327abb73
parent cce312fb0d0fbcde56505129d5189538cb31454f

JNT_COMP: reduce context model number

Reduce context model number from 9 to 6.
Let context be two kinds: two reference frames are equal distance
or not.
Also, give equal distance compound weight {9, 7} instead of {8, 8}/16

Reducing context model gives neutral performance.
New compound weight provides -0.14% gain.

Change-Id: I8a3f3021eac9e446ac826e5992f42931af4c8962

av1/common/entropymode.c

diff --git a/av1/common/entropymode.c b/av1/common/entropymode.c
index a50a20f..6eac13b 100644
--- a/av1/common/entropymode.c
+++ b/av1/common/entropymode.c
@@ -1629,13 +1629,10 @@
       { AOM_ICDF(24576), AOM_ICDF(32768), 0 },
       { AOM_ICDF(16384), AOM_ICDF(32768), 0 },
       { AOM_ICDF(8192), AOM_ICDF(32768), 0 },
-      { AOM_ICDF(24576), AOM_ICDF(32768), 0 },
-      { AOM_ICDF(16384), AOM_ICDF(32768), 0 },
-      { AOM_ICDF(8192), AOM_ICDF(32768), 0 }
     };
 #endif  // CONFIG_NEW_MULTISYMBOL
 static const aom_prob default_compound_idx_probs[COMP_INDEX_CONTEXTS] = {
-  192, 128, 64, 192, 128, 64, 192, 128, 64,
+  192, 128, 64, 192, 128, 64
 };
 #endif  // CONFIG_JNT_COMP