diff options
| author | Yaowu Xu <yaowu@google.com> | 2012-12-06 12:40:57 -0800 |
|---|---|---|
| committer | Yaowu Xu <yaowu@google.com> | 2012-12-11 13:32:16 -0800 |
| commit | 899f0fc1268dd5665770031f308a3ed52a0de956 (patch) | |
| tree | e8e514a81d812668f32f79a326bbfd1d6389fb60 /vp9/common/vp9_blockd.c | |
| parent | ab480cede582e1ef102a0e04b61cb755df4781b7 (diff) | |
| download | libvpx-899f0fc1268dd5665770031f308a3ed52a0de956.tar libvpx-899f0fc1268dd5665770031f308a3ed52a0de956.tar.gz libvpx-899f0fc1268dd5665770031f308a3ed52a0de956.tar.bz2 libvpx-899f0fc1268dd5665770031f308a3ed52a0de956.zip | |
clean up tokenize_b() and stuff_b()
Change-Id: I0c1be01aae933243311ad321b6c456adaec1a0f5
Diffstat (limited to 'vp9/common/vp9_blockd.c')
| -rw-r--r-- | vp9/common/vp9_blockd.c | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/vp9/common/vp9_blockd.c b/vp9/common/vp9_blockd.c index 60aedf8cb..4c88a4fa2 100644 --- a/vp9/common/vp9_blockd.c +++ b/vp9/common/vp9_blockd.c @@ -12,18 +12,19 @@ #include "vp9/common/vp9_blockd.h" #include "vpx_mem/vpx_mem.h" - -const unsigned char vp9_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 -}; -const unsigned char vp9_block2above[25] = { - 0, 1, 2, 3, 0, 1, 2, 3, 0, 1, 2, 3, 0, 1, 2, 3, 4, 5, 4, 5, 6, 7, 6, 7, 8 +const unsigned char vp9_block2left[TX_SIZE_MAX_SB][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}, + {0, 0, 0, 0, 0, 0, 0, 0, 2, 2, 2, 2, 2, 2, 2, 2, 4, 4, 4, 4, 6, 6, 6, 6, 8}, + {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 4, 4, 4, 6, 6, 6, 6, 8}, +#if CONFIG_TX32X32 && CONFIG_SUPERBLOCKS + {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 4, 4, 4, 6, 6, 6, 6, 8} +#endif }; - -const unsigned char vp9_block2left_8x8[25] = { - 0, 0, 0, 0, 0, 0, 0, 0, 2, 2, 2, 2, 2, 2, 2, 2, 4, 4, 4, 4, 6, 6, 6, 6, 8 +const unsigned char vp9_block2above[TX_SIZE_MAX_SB][25] = { + {0, 1, 2, 3, 0, 1, 2, 3, 0, 1, 2, 3, 0, 1, 2, 3, 4, 5, 4, 5, 6, 7, 6, 7, 8}, + {0, 0, 0, 0, 2, 2, 2, 2, 0, 0, 0, 0, 2, 2, 2, 2, 4, 4, 4, 4, 6, 6, 6, 6, 8}, + {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 4, 4, 4, 6, 6, 6, 6, 8}, +#if CONFIG_TX32X32 && CONFIG_SUPERBLOCKS + {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 4, 4, 4, 6, 6, 6, 6, 8} +#endif }; -const unsigned char vp9_block2above_8x8[25] = { - 0, 0, 0, 0, 2, 2, 2, 2, 0, 0, 0, 0, 2, 2, 2, 2, 4, 4, 4, 4, 6, 6, 6, 6, 8 -}; - |