diff options
| author | John Koleszar <jkoleszar@google.com> | 2011-03-03 08:58:57 -0500 |
|---|---|---|
| committer | John Koleszar <jkoleszar@google.com> | 2011-03-03 08:58:57 -0500 |
| commit | 738a79191725f5af4a08451312f5a48fb386bc4b (patch) | |
| tree | 4a31c403dd23c79326136ccdcf0c226216490a9f /vp8/common | |
| parent | c23096e4a5eed85ba110eee8ac28bab86e05c863 (diff) | |
| parent | 1a7ce50a6c91af97291aa727483030a14a58859f (diff) | |
| download | libvpx-738a79191725f5af4a08451312f5a48fb386bc4b.tar libvpx-738a79191725f5af4a08451312f5a48fb386bc4b.tar.gz libvpx-738a79191725f5af4a08451312f5a48fb386bc4b.tar.bz2 libvpx-738a79191725f5af4a08451312f5a48fb386bc4b.zip | |
Merge remote branch 'internal/upstream-experimental' into HEAD
Conflicts:
vp8/common/blockd.h
Change-Id: Ica2bd1c3da614eab5ce23acfb597e777d16b3983
Diffstat (limited to 'vp8/common')
| -rw-r--r-- | vp8/common/blockd.c | 2 | ||||
| -rw-r--r-- | vp8/common/blockd.h | 11 |
2 files changed, 5 insertions, 8 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 3b4986f49..906e05520 100644 --- a/vp8/common/blockd.h +++ b/vp8/common/blockd.h @@ -28,10 +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 +44,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 +59,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]; |