diff options
| author | Ronald S. Bultje <rbultje@google.com> | 2013-01-08 10:29:22 -0800 |
|---|---|---|
| committer | Ronald S. Bultje <rbultje@google.com> | 2013-01-08 12:54:45 -0800 |
| commit | 4455036cfc3c6b7fb9d7b85af1982e7df3711a05 (patch) | |
| tree | 4294eb7d43141c3406d3f3f184b522a1b052fadd /vp9/common/vp9_blockd.c | |
| parent | 879cb7d96259a71eea0038452a00241650589084 (diff) | |
| download | libvpx-4455036cfc3c6b7fb9d7b85af1982e7df3711a05.tar libvpx-4455036cfc3c6b7fb9d7b85af1982e7df3711a05.tar.gz libvpx-4455036cfc3c6b7fb9d7b85af1982e7df3711a05.tar.bz2 libvpx-4455036cfc3c6b7fb9d7b85af1982e7df3711a05.zip | |
Merge superblocks (32x32) experiment.
Change-Id: I0df99742029834a85c4933652b0587cf5b6b2587
Diffstat (limited to 'vp9/common/vp9_blockd.c')
| -rw-r--r-- | vp9/common/vp9_blockd.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/vp9/common/vp9_blockd.c b/vp9/common/vp9_blockd.c index b8ad433dc..c3fa07284 100644 --- a/vp9/common/vp9_blockd.c +++ b/vp9/common/vp9_blockd.c @@ -16,7 +16,7 @@ const uint8_t 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 +#if CONFIG_TX32X32 {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 }; @@ -24,7 +24,7 @@ const uint8_t 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 +#if CONFIG_TX32X32 {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 }; |