Merge "Add basic building blocks for 8x8 superblocks experiment." into experimental

cc7ce531 · Ronald S. Bultje · Gerrit Code Review · 6579720e · 94297863 · cc7ce531
Commit cc7ce531 authored Apr 24, 2013 by Ronald S. Bultje Committed by Gerrit Code Review Apr 24, 2013
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 0 deletions

configure configure +1 -0

vp9/common/vp9_enums.h vp9/common/vp9_enums.h +7 -0

No files found.
--- a/configure
+++ b/configure
@@ -250,6 +250,7 @@ EXPERIMENT_LIST="
    sbsegment
    multiple_arf
    code_zerogroup
+    sb8x8
 "
 CONFIG_LIST="
    external_build

--- 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,