commit 94d84461c650701a6e80daff3342049a88a8bbd6
author Yue Chen <yuec@google.com> Thu May 18 12:02:47 2017 -0700
committer Debargha Mukherjee <debargha@google.com> Thu May 18 20:39:31 2017 +0000
tree b353527691d755c3be1bf37f54cf67a98373a39e
parent eec47e65bb36b602585bcb09b294d860760ecd02

Remove full interintra mode set & adjust probs of the simplified set

Improved the performance a little bit compared to using the full set

Change-Id: I28a96459fa77d7e1d5c101d162faa2effd525341

av1/common/reconintra.h

diff --git a/av1/common/reconintra.h b/av1/common/reconintra.h
index 657afa1..3f53b12 100644
--- a/av1/common/reconintra.h
+++ b/av1/common/reconintra.h
@@ -29,7 +29,6 @@
 
 #if CONFIG_EXT_INTER && CONFIG_INTERINTRA
 // Mapping of interintra to intra mode for use in the intra component
-#if REDUCED_INTERINTRA_MODES == 1
 static const PREDICTION_MODE interintra_to_intra_mode[INTERINTRA_MODES] = {
   DC_PRED, V_PRED, H_PRED,
 #if CONFIG_ALT_INTRA
@@ -54,30 +53,7 @@
   II_TM_PRED
 #endif
 };
-#else
-static const PREDICTION_MODE interintra_to_intra_mode[INTERINTRA_MODES] = {
-  DC_PRED,     V_PRED,    H_PRED,    D45_PRED, D135_PRED,
-  D117_PRED,   D153_PRED, D207_PRED, D63_PRED,
-#if CONFIG_ALT_INTRA
-  SMOOTH_PRED,
-#endif
-  TM_PRED
-};
-
-// Mapping of intra mode to the interintra mode
-static const INTERINTRA_MODE intra_to_interintra_mode[INTRA_MODES] = {
-  II_DC_PRED,     II_V_PRED,    II_H_PRED,    II_D45_PRED, II_D135_PRED,
-  II_D117_PRED,   II_D153_PRED, II_D207_PRED, II_D63_PRED,
-#if CONFIG_ALT_INTRA
-  II_SMOOTH_PRED,
-#endif
-  II_TM_PRED
-};
-#endif
 #endif  // CONFIG_EXT_INTER && CONFIG_INTERINTRA
-#ifdef __cplusplus
-}  // extern "C"
-#endif
 
 #if CONFIG_FILTER_INTRA
 #define FILTER_INTRA_PREC_BITS 10
@@ -98,4 +74,7 @@
 }
 #endif  // CONFIG_EXT_INTRA
 
+#ifdef __cplusplus
+}  // extern "C"
+#endif
 #endif  // AV1_COMMON_RECONINTRA_H_