diff options
Diffstat (limited to 'vp8/encoder/onyx_int.h')
| -rw-r--r-- | vp8/encoder/onyx_int.h | 61 |
1 files changed, 37 insertions, 24 deletions
diff --git a/vp8/encoder/onyx_int.h b/vp8/encoder/onyx_int.h index 93a445cba..7f6545ed2 100644 --- a/vp8/encoder/onyx_int.h +++ b/vp8/encoder/onyx_int.h @@ -41,7 +41,12 @@ #define AF_THRESH 25 #define AF_THRESH2 100 #define ARF_DECAY_THRESH 12 + +#if CONFIG_NEWINTRAMODES +#define MAX_MODES 42 +#else #define MAX_MODES 36 +#endif #define MIN_THRESHMULT 32 #define MAX_THRESHMULT 512 @@ -173,38 +178,46 @@ typedef enum THR_V_PRED = 10, THR_H_PRED = 11, - THR_TM = 12, +#if CONFIG_NEWINTRAMODES + THR_D45_PRED, + THR_D135_PRED, + THR_D117_PRED, + THR_D153_PRED, + THR_D27_PRED, + THR_D63_PRED, +#endif + THR_TM, - THR_NEWMV = 13, - THR_NEWG = 14, - THR_NEWA = 15, + THR_NEWMV, + THR_NEWG, + THR_NEWA, - THR_SPLITMV = 16, - THR_SPLITG = 17, - THR_SPLITA = 18, + THR_SPLITMV, + THR_SPLITG, + THR_SPLITA, - THR_B_PRED = 19, - THR_I8X8_PRED = 20, + THR_B_PRED, + THR_I8X8_PRED, - THR_COMP_ZEROLG = 21, - THR_COMP_NEARESTLG = 22, - THR_COMP_NEARLG = 23, + THR_COMP_ZEROLG, + THR_COMP_NEARESTLG, + THR_COMP_NEARLG, - THR_COMP_ZEROLA = 24, - THR_COMP_NEARESTLA = 25, - THR_COMP_NEARLA = 26, + THR_COMP_ZEROLA, + THR_COMP_NEARESTLA, + THR_COMP_NEARLA, - THR_COMP_ZEROGA = 27, - THR_COMP_NEARESTGA = 28, - THR_COMP_NEARGA = 29, + THR_COMP_ZEROGA, + THR_COMP_NEARESTGA, + THR_COMP_NEARGA, - THR_COMP_NEWLG = 30, - THR_COMP_NEWLA = 31, - THR_COMP_NEWGA = 32, + THR_COMP_NEWLG, + THR_COMP_NEWLA, + THR_COMP_NEWGA, - THR_COMP_SPLITLG = 33, - THR_COMP_SPLITLA = 34, - THR_COMP_SPLITGA = 35, + THR_COMP_SPLITLG, + THR_COMP_SPLITLA, + THR_COMP_SPLITGA, } THR_MODES; |