diff options
| author | Ronald S. Bultje <rbultje@google.com> | 2013-05-30 16:21:48 -0700 |
|---|---|---|
| committer | Ronald S. Bultje <rbultje@google.com> | 2013-05-30 17:21:06 -0700 |
| commit | a433abbcad40ea2498bc3418f2ee8090e1b42ffb (patch) | |
| tree | 06108c1ab0807e4817514237e8bc102186cd7167 /vp9/common/vp9_blockd.h | |
| parent | 4d3d00b195393647fb4cc7844fb0de57b48a35de (diff) | |
| download | libvpx-a433abbcad40ea2498bc3418f2ee8090e1b42ffb.tar libvpx-a433abbcad40ea2498bc3418f2ee8090e1b42ffb.tar.gz libvpx-a433abbcad40ea2498bc3418f2ee8090e1b42ffb.tar.bz2 libvpx-a433abbcad40ea2498bc3418f2ee8090e1b42ffb.zip | |
Merge VP9_YMODES, VP9_UV_MODES, INTRA_MODE_COUNT and cousins.
These are now merged in a new define called VP9_INTRA_MODES.
Change-Id: I0890f895756a7395d84c92f98f43e43f4cf9050d
Diffstat (limited to 'vp9/common/vp9_blockd.h')
| -rw-r--r-- | vp9/common/vp9_blockd.h | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/vp9/common/vp9_blockd.h b/vp9/common/vp9_blockd.h index 4456fd983..07628324d 100644 --- a/vp9/common/vp9_blockd.h +++ b/vp9/common/vp9_blockd.h @@ -89,8 +89,6 @@ static INLINE int is_inter_mode(MB_PREDICTION_MODE mode) { return mode >= NEARESTMV && mode <= NEWMV; } -#define INTRA_MODE_COUNT (TM_PRED + 1) - // Segment level features. typedef enum { SEG_LVL_ALT_Q = 0, // Use alternate Quantizer .... @@ -116,16 +114,12 @@ typedef enum { ADST_ADST = 3 // ADST in both directions } TX_TYPE; -#define VP9_YMODES (TM_PRED + 1) -#define VP9_UV_MODES (TM_PRED + 1) -#define VP9_I32X32_MODES (TM_PRED + 1) +#define VP9_INTRA_MODES (TM_PRED + 1) #define VP9_MVREFS (1 + NEWMV - NEARESTMV) #define WHT_UPSCALE_FACTOR 2 -#define VP9_BINTRAMODES INTRA_MODE_COUNT - /* For keyframes, intra block modes are predicted by the (already decoded) modes for the Y blocks to the left and above us; for interframes, there is a single probability table. */ |