diff options
| author | Ronald S. Bultje <rbultje@google.com> | 2013-04-24 11:45:13 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2013-04-24 11:45:13 -0700 |
| commit | cc7ce531403ee5abd297a578e0ba417fc6a10744 (patch) | |
| tree | a84ee5f3e6a49b08d953b1b578fa087325c33e80 | |
| parent | 6579720e6aa9e568bd876d2592d52831de1bf7b3 (diff) | |
| parent | 94297863bff486c04cea49655a880b334c4ba7d2 (diff) | |
| download | libvpx-cc7ce531403ee5abd297a578e0ba417fc6a10744.tar libvpx-cc7ce531403ee5abd297a578e0ba417fc6a10744.tar.gz libvpx-cc7ce531403ee5abd297a578e0ba417fc6a10744.tar.bz2 libvpx-cc7ce531403ee5abd297a578e0ba417fc6a10744.zip | |
Merge "Add basic building blocks for 8x8 superblocks experiment." into experimental
| -rwxr-xr-x | configure | 1 | ||||
| -rw-r--r-- | vp9/common/vp9_enums.h | 7 |
2 files changed, 8 insertions, 0 deletions
@@ -250,6 +250,7 @@ EXPERIMENT_LIST=" sbsegment multiple_arf code_zerogroup + sb8x8 " CONFIG_LIST=" external_build diff --git a/vp9/common/vp9_enums.h b/vp9/common/vp9_enums.h index 930a5975f..51a2a5fdc 100644 --- a/vp9/common/vp9_enums.h +++ b/vp9/common/vp9_enums.h @@ -14,6 +14,13 @@ #include "./vpx_config.h" typedef enum BLOCK_SIZE_TYPE { +#if CONFIG_SB8X8 + BLOCK_SIZE_SB8X8, +#if CONFIG_SBSEGMENT + BLOCK_SIZE_SB8X16, + BLOCK_SIZE_SB16X8, +#endif +#endif BLOCK_SIZE_MB16X16, #if CONFIG_SBSEGMENT BLOCK_SIZE_SB16X32, |