1 files changed, 0 insertions, 101 deletions
diff --git a/vp9/encoder/vp9_onyx_int.h b/vp9/encoder/vp9_onyx_int.h
index dbe6e2bd6..d917c0e7f 100644
--- a/vp9/encoder/vp9_onyx_int.h
+++ b/vp9/encoder/vp9_onyx_int.h
@@ -41,19 +41,11 @@
 #define AF_THRESH2  100
 #define ARF_DECAY_THRESH 12
 
-#if CONFIG_PRED_FILTER
-#if CONFIG_COMP_INTERINTRA_PRED
-#define MAX_MODES 66
-#else
-#define MAX_MODES 54
-#endif
-#else  // CONFIG_PRED_FILTER
 #if CONFIG_COMP_INTERINTRA_PRED
 #define MAX_MODES 54
 #else
 #define MAX_MODES 42
 #endif
-#endif  // CONFIG_PRED_FILTER
 
 #define MIN_THRESHMULT  32
 #define MAX_THRESHMULT  512
@@ -173,31 +165,21 @@ typedef struct {
   MBGRAPH_MB_STATS *mb_stats;
 } MBGRAPH_FRAME_STATS;
 
-#if CONFIG_PRED_FILTER
 typedef enum {
   THR_ZEROMV,
-  THR_ZEROMV_FILT,
   THR_DC,
 
   THR_NEARESTMV,
-  THR_NEARESTMV_FILT,
   THR_NEARMV,
-  THR_NEARMV_FILT,
 
   THR_ZEROG,
-  THR_ZEROG_FILT,
   THR_NEARESTG,
-  THR_NEARESTG_FILT,
 
   THR_ZEROA,
-  THR_ZEROA_FILT,
   THR_NEARESTA,
-  THR_NEARESTA_FILT,
 
   THR_NEARG,
-  THR_NEARG_FILT,
   THR_NEARA,
-  THR_NEARA_FILT,
 
   THR_V_PRED,
   THR_H_PRED,
@@ -210,11 +192,8 @@ typedef enum {
   THR_TM,
 
   THR_NEWMV,
-  THR_NEWMV_FILT,
   THR_NEWG,
-  THR_NEWG_FILT,
   THR_NEWA,
-  THR_NEWA_FILT,
 
   THR_SPLITMV,
   THR_SPLITG,
@@ -260,82 +239,6 @@ typedef enum {
 #endif
 }
 THR_MODES;
-#else
-typedef enum {
-  THR_ZEROMV,
-  THR_DC,
-
-  THR_NEARESTMV,
-  THR_NEARMV,
-
-  THR_ZEROG,
-  THR_NEARESTG,
-
-  THR_ZEROA,
-  THR_NEARESTA,
-
-  THR_NEARG,
-  THR_NEARA,
-
-  THR_V_PRED,
-  THR_H_PRED,
-  THR_D45_PRED,
-  THR_D135_PRED,
-  THR_D117_PRED,
-  THR_D153_PRED,
-  THR_D27_PRED,
-  THR_D63_PRED,
-  THR_TM,
-
-  THR_NEWMV,
-  THR_NEWG,
-  THR_NEWA,
-
-  THR_SPLITMV,
-  THR_SPLITG,
-  THR_SPLITA,
-
-  THR_B_PRED,
-  THR_I8X8_PRED,
-
-  THR_COMP_ZEROLG,
-  THR_COMP_NEARESTLG,
-  THR_COMP_NEARLG,
-
-  THR_COMP_ZEROLA,
-  THR_COMP_NEARESTLA,
-  THR_COMP_NEARLA,
-
-  THR_COMP_ZEROGA,
-  THR_COMP_NEARESTGA,
-  THR_COMP_NEARGA,
-
-  THR_COMP_NEWLG,
-  THR_COMP_NEWLA,
-  THR_COMP_NEWGA,
-
-  THR_COMP_SPLITLG,
-  THR_COMP_SPLITLA,
-  THR_COMP_SPLITGA,
-#if CONFIG_COMP_INTERINTRA_PRED
-  THR_COMP_INTERINTRA_ZEROL,
-  THR_COMP_INTERINTRA_NEARESTL,
-  THR_COMP_INTERINTRA_NEARL,
-  THR_COMP_INTERINTRA_NEWL,
-
-  THR_COMP_INTERINTRA_ZEROG,
-  THR_COMP_INTERINTRA_NEARESTG,
-  THR_COMP_INTERINTRA_NEARG,
-  THR_COMP_INTERINTRA_NEWG,
-
-  THR_COMP_INTERINTRA_ZEROA,
-  THR_COMP_INTERINTRA_NEARESTA,
-  THR_COMP_INTERINTRA_NEARA,
-  THR_COMP_INTERINTRA_NEWA,
-#endif
-}
-THR_MODES;
-#endif
 
 typedef enum {
   DIAMOND = 0,
@@ -795,10 +698,6 @@ typedef struct VP9_COMP {
 
   int dummy_packing;    /* flag to indicate if packing is dummy */
 
-#if CONFIG_PRED_FILTER
-  int pred_filter_on_count;
-  int pred_filter_off_count;
-#endif
   unsigned int switchable_interp_count[VP9_SWITCHABLE_FILTERS + 1]
                                       [VP9_SWITCHABLE_FILTERS];
   unsigned int best_switchable_interp_count[VP9_SWITCHABLE_FILTERS];