shithub: libvpx

Info  •  Files  •  Log  •  Branches

Removing plane_block_{width, height} functions.

Change-Id: I29c0dfcf41a1253d5e2a0d2ff740c0c38ebaa5a2

--- a/vp9/common/vp9_blockd.h

+++ b/vp9/common/vp9_blockd.h

@@ -286,16 +286,6 @@

   return bs;

 }

-static INLINE int plane_block_width(BLOCK_SIZE bsize,

-                                    const struct macroblockd_plane* plane) {

-  return 4 << (b_width_log2(bsize) - plane->subsampling_x);

-}

-

-static INLINE int plane_block_height(BLOCK_SIZE bsize,

-                                     const struct macroblockd_plane* plane) {

-  return 4 << (b_height_log2(bsize) - plane->subsampling_y);

-}

-

 typedef void (*foreach_transformed_block_visitor)(int plane, int block,

                                                   BLOCK_SIZE plane_bsize,

                                                   TX_SIZE tx_size,

--- a/vp9/common/vp9_reconinter.c

+++ b/vp9/common/vp9_reconinter.c

@@ -106,9 +106,10 @@

                                    BLOCK_SIZE bsize, int pred_w, int pred_h,

                                    int mi_x, int mi_y) {

   struct macroblockd_plane *const pd = &xd->plane[plane];

-  const int bwl = b_width_log2(bsize) - pd->subsampling_x;

+  const BLOCK_SIZE plane_bsize = get_plane_block_size(bsize, pd);

+  const int bwl = b_width_log2(plane_bsize);

   const int bw = 4 << bwl;

-  const int bh = plane_block_height(bsize, pd);

+  const int bh = 4 * num_4x4_blocks_high_lookup[plane_bsize];

   const int x = 4 * (block & ((1 << bwl) - 1));

   const int y = 4 * (block >> bwl);

   const MODE_INFO *mi = xd->mi_8x8[0];

--- a/vp9/encoder/vp9_encodemb.c

+++ b/vp9/encoder/vp9_encodemb.c

@@ -63,13 +63,12 @@

 static void subtract_plane(MACROBLOCK *x, BLOCK_SIZE bsize, int plane) {

   struct macroblock_plane *const p = &x->plane[plane];

-  const MACROBLOCKD *const xd = &x->e_mbd;

-  const struct macroblockd_plane *const pd = &xd->plane[plane];

-  const int bw = plane_block_width(bsize, pd);

-  const int bh = plane_block_height(bsize, pd);

+  const struct macroblockd_plane *const pd = &x->e_mbd.plane[plane];

+  const BLOCK_SIZE plane_bsize = get_plane_block_size(bsize, pd);

+  const int bw = 4 * num_4x4_blocks_wide_lookup[plane_bsize];

+  const int bh = 4 * num_4x4_blocks_high_lookup[plane_bsize];

-  vp9_subtract_block(bh, bw, p->src_diff, bw,

-                     p->src.buf, p->src.stride,

+  vp9_subtract_block(bh, bw, p->src_diff, bw, p->src.buf, p->src.stride,

                      pd->dst.buf, pd->dst.stride);

 }

--- a/vp9/encoder/vp9_rdopt.c

+++ b/vp9/encoder/vp9_rdopt.c

@@ -1549,9 +1549,9 @@

   struct macroblockd_plane *const pd = &xd->plane[0];

   struct macroblock_plane *const p = &x->plane[0];

   MODE_INFO *const mi = xd->mi_8x8[0];

-  const BLOCK_SIZE bsize = mi->mbmi.sb_type;

-  const int width = plane_block_width(bsize, pd);

-  const int height = plane_block_height(bsize, pd);

+  const BLOCK_SIZE plane_bsize = get_plane_block_size(mi->mbmi.sb_type, pd);

+  const int width = 4 * num_4x4_blocks_wide_lookup[plane_bsize];

+  const int height = 4 * num_4x4_blocks_high_lookup[plane_bsize];

   int idx, idy;

   const uint8_t *const src = &p->src.buf[raster_block_offset(BLOCK_8X8, i,