1 files changed, 13 insertions, 22 deletions

diff --git a/vp9/common/vp9_blockd.h b/vp9/common/vp9_blockd.h
index d30cd4960..0baadfc14 100644
--- a/vp9/common/vp9_blockd.h
+++ b/vp9/common/vp9_blockd.h
@@ -282,9 +282,6 @@ typedef struct {
   INTERPOLATIONFILTERTYPE interp_filter;
 
   BLOCK_SIZE_TYPE sb_type;
-#if CONFIG_CODE_NONZEROCOUNT
-  uint16_t nzcs[256+64*2];
-#endif
 } MB_MODE_INFO;
 
 typedef struct {
@@ -329,15 +326,16 @@ struct scale_factors {
                                               int den,
                                               int offset_q4);
 
-#if CONFIG_IMPLICIT_COMPOUNDINTER_WEIGHT
-  convolve_fn_t predict[2][2][8];  // horiz, vert, weight (0 - 7)
-#else
   convolve_fn_t predict[2][2][2];  // horiz, vert, avg
-#endif
 };
 
 enum { MAX_MB_PLANE = 3 };
 
+struct buf_2d {
+  uint8_t *buf;
+  int stride;
+};
+
 struct mb_plane {
   DECLARE_ALIGNED(16, int16_t,  qcoeff[64 * 64]);
   DECLARE_ALIGNED(16, int16_t,  dqcoeff[64 * 64]);
@@ -346,6 +344,8 @@ struct mb_plane {
   PLANE_TYPE plane_type;
   int subsampling_x;
   int subsampling_y;
+  struct buf_2d dst;
+  struct buf_2d pre[2];
 };
 
 #define BLOCK_OFFSET(x, i, n) ((x) + (i) * (n))
@@ -356,17 +356,11 @@ struct mb_plane {
   BLOCK_OFFSET((x)->plane[2].field, ((i) - 20), 16))
 
 typedef struct macroblockd {
-#if CONFIG_CODE_NONZEROCOUNT
-  DECLARE_ALIGNED(16, uint16_t, nzcs[256+64*2]);
-#endif
   struct mb_plane plane[MAX_MB_PLANE];
 
   /* 16 Y blocks, 4 U, 4 V, each with 16 entries. */
   BLOCKD block[24];
 
-  YV12_BUFFER_CONFIG pre; /* Filtered copy of previous frame reconstruction */
-  YV12_BUFFER_CONFIG second_pre;
-  YV12_BUFFER_CONFIG dst;
   struct scale_factors scale_factor[2];
   struct scale_factors scale_factor_uv[2];
 
@@ -747,12 +741,6 @@ static TX_SIZE get_uv_tx_size(const MACROBLOCKD *xd) {
   return size;
 }
 
-#if CONFIG_CODE_NONZEROCOUNT
-static int get_nzc_used(TX_SIZE tx_size) {
-  return (tx_size >= TX_16X16);
-}
-#endif
-
 struct plane_block_idx {
   int plane;
   int block;
@@ -761,7 +749,7 @@ struct plane_block_idx {
 // TODO(jkoleszar): returning a struct so it can be used in a const context,
 // expect to refactor this further later.
 static INLINE struct plane_block_idx plane_block_idx(int y_blocks,
-                                                      int b_idx) {
+                                                     int b_idx) {
   const int v_offset = y_blocks * 5 / 4;
   struct plane_block_idx res;
 
@@ -933,6 +921,9 @@ static INLINE void foreach_predicted_block_uv(
   }
 }
 
-
-
+#if CONFIG_CODE_ZEROGROUP
+static int get_zpc_used(TX_SIZE tx_size) {
+  return (tx_size >= TX_16X16);
+}
+#endif
 #endif  // VP9_COMMON_VP9_BLOCKD_H_