diff options
Diffstat (limited to 'vp8/common')
-rw-r--r-- | vp8/common/blockd.c | 2 | ||||
-rw-r--r-- | vp8/common/blockd.h | 12 |
2 files changed, 5 insertions, 9 deletions
diff --git a/vp8/common/blockd.c b/vp8/common/blockd.c index 7f75a72c5..1fc3cd0ca 100644 --- a/vp8/common/blockd.c +++ b/vp8/common/blockd.c @@ -12,8 +12,6 @@ #include "blockd.h" #include "vpx_mem/vpx_mem.h" -const int vp8_block2type[25] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 2, 2, 2, 2, 2, 2, 2, 1}; - const unsigned char vp8_block2left[25] = { 0, 0, 0, 0, 1, 1, 1, 1, 2, 2, 2, 2, 3, 3, 3, 3, 4, 4, 5, 5, 6, 6, 7, 7, 8 diff --git a/vp8/common/blockd.h b/vp8/common/blockd.h index 5a8991e65..fc8e0722c 100644 --- a/vp8/common/blockd.h +++ b/vp8/common/blockd.h @@ -28,11 +28,6 @@ void vpx_log(const char *format, ...); #define DCPREDSIMTHRESH 0 #define DCPREDCNTTHRESH 3 -#define Y1CONTEXT 0 -#define UCONTEXT 1 -#define VCONTEXT 2 -#define Y2CONTEXT 3 - #define MB_FEATURE_TREE_PROBS 3 #define MAX_MB_SEGMENTS 4 @@ -48,6 +43,11 @@ typedef struct int r, c; } POS; +#define PLANE_TYPE_Y_NO_DC 0 +#define PLANE_TYPE_Y2 1 +#define PLANE_TYPE_UV 2 +#define PLANE_TYPE_Y_WITH_DC 3 + typedef char ENTROPY_CONTEXT; typedef struct @@ -58,8 +58,6 @@ typedef struct ENTROPY_CONTEXT y2; } ENTROPY_CONTEXT_PLANES; -extern const int vp8_block2type[25]; - extern const unsigned char vp8_block2left[25]; extern const unsigned char vp8_block2above[25]; |