commit 4d26acb4e4d77f97dc14109363d7127c93231895
author Yue Chen <yuec@google.com> Mon May 01 12:28:34 2017 -0700
committer Yue Chen <yuec@google.com> Thu May 11 22:58:13 2017 +0000
tree 2d8f222d1038dd0c112765f03c40df4d1a5efe1a
parent 4c6d4369aa82e1b5f8e8acb87199c99e35a7b461

Add CONFIG_INTERINTRA flags and reduce # of interintra modes to 4

Use CONFIG_INTERINTRA to properly separate interintra from the basic
ext_inter experiment.
When macro REDUCE_INTERINTRA_MODES is 1, only 4 ii modes are enabled
so as to reduce the complexity overhead.
(Right now the flag is off)

Change-Id: Iec6f36a1000f181adbb822ad66c7d5b2625e9cc7

av1/common/blockd.h

diff --git a/av1/common/blockd.h b/av1/common/blockd.h
index f5fa542..e70b06c 100644
--- a/av1/common/blockd.h
+++ b/av1/common/blockd.h
@@ -383,8 +383,10 @@
 #endif  // CONFIG_EXT_INTRA
 
 #if CONFIG_EXT_INTER
+#if CONFIG_INTERINTRA
   // interintra members
   INTERINTRA_MODE interintra_mode;
+#endif
   // TODO(debargha): Consolidate these flags
   int use_wedge_interintra;
   int interintra_wedge_index;