From 776c1482a302f5ea42dfe4517f51c0f1e48f2670 Mon Sep 17 00:00:00 2001
From: Jingning Han <jingning@google.com>
Date: Sat, 4 May 2013 22:09:43 -0700
Subject: Merge SB8X8 into the codebase

Pull sb8x8 out of experimental list. verified via borg run tests.
Fixed unit test failures.

Change-Id: I12a4bbd17395930580c048ab68becad1ffe46e76
---
 vp9/encoder/vp9_onyx_int.h | 29 ++---------------------------
 1 file changed, 2 insertions(+), 27 deletions(-)

(limited to 'vp9/encoder/vp9_onyx_int.h')

diff --git a/vp9/encoder/vp9_onyx_int.h b/vp9/encoder/vp9_onyx_int.h
index c6abfe13e..cc91ba5d2 100644
--- a/vp9/encoder/vp9_onyx_int.h
+++ b/vp9/encoder/vp9_onyx_int.h
@@ -48,9 +48,9 @@
 #define KEY_FRAME_CONTEXT 5
 
 #if CONFIG_COMP_INTERINTRA_PRED
-#define MAX_MODES 54 - CONFIG_SB8X8
+#define MAX_MODES 53
 #else
-#define MAX_MODES 42 - CONFIG_SB8X8
+#define MAX_MODES 41
 #endif
 
 #define MIN_THRESHMULT  32
@@ -72,9 +72,6 @@ typedef struct {
   // Stats
   int y_modes[VP9_YMODES];
   int uv_modes[VP9_UV_MODES];
-#if !CONFIG_SB8X8
-  int i8x8_modes[VP9_I8X8_MODES];
-#endif
   int b_modes[B_MODE_COUNT];
   int inter_y_modes[MB_MODE_COUNT];
   int inter_uv_modes[VP9_UV_MODES];
@@ -102,13 +99,7 @@ typedef struct {
   vp9_prob ymode_prob[VP9_YMODES - 1]; /* interframe intra mode probs */
   vp9_prob uv_mode_prob[VP9_YMODES][VP9_UV_MODES - 1];
   vp9_prob bmode_prob[VP9_NKF_BINTRAMODES - 1];
-#if !CONFIG_SB8X8
-  vp9_prob i8x8_mode_prob[VP9_I8X8_MODES - 1];
-#endif
   vp9_prob sub_mv_ref_prob[SUBMVREF_COUNT][VP9_SUBMVREFS - 1];
-#if !CONFIG_SB8X8
-  vp9_prob mbsplit_prob[VP9_NUMMBSPLITS - 1];
-#endif
   vp9_prob partition_prob[NUM_PARTITION_CONTEXTS][PARTITION_TYPES - 1];
 
   vp9_prob switchable_interp_prob[VP9_SWITCHABLE_FILTERS + 1]
@@ -213,9 +204,6 @@ typedef enum {
   THR_SPLITA,
 
   THR_B_PRED,
-#if !CONFIG_SB8X8
-  THR_I8X8_PRED,
-#endif
 
   THR_COMP_ZEROLG,
   THR_COMP_NEARESTLG,
@@ -281,19 +269,12 @@ typedef struct {
 } SPEED_FEATURES;
 
 enum BlockSize {
-#if CONFIG_SB8X8
   BLOCK_4X4,
   BLOCK_4X8,
   BLOCK_8X4,
   BLOCK_8X8,
   BLOCK_8X16,
   BLOCK_16X8,
-#else
-  BLOCK_16X8 = PARTITIONING_16X8,
-  BLOCK_8X16 = PARTITIONING_8X16,
-  BLOCK_8X8 = PARTITIONING_8X8,
-  BLOCK_4X4 = PARTITIONING_4X4,
-#endif
   BLOCK_16X16,
   BLOCK_MAX_SEGMENTS,
   BLOCK_32X32 = BLOCK_MAX_SEGMENTS,
@@ -468,13 +449,7 @@ typedef struct VP9_COMP {
   int sb_ymode_count [VP9_I32X32_MODES];
   int ymode_count[VP9_YMODES];        /* intra MB type cts this frame */
   int bmode_count[VP9_NKF_BINTRAMODES];
-#if !CONFIG_SB8X8
-  int i8x8_mode_count[VP9_I8X8_MODES];
-#endif
   int sub_mv_ref_count[SUBMVREF_COUNT][VP9_SUBMVREFS];
-#if !CONFIG_SB8X8
-  int mbsplit_count[VP9_NUMMBSPLITS];
-#endif
   int y_uv_mode_count[VP9_YMODES][VP9_UV_MODES];
   unsigned int partition_count[NUM_PARTITION_CONTEXTS][PARTITION_TYPES];
 #if CONFIG_COMP_INTERINTRA_PRED
-- 
cgit v1.2.3