shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "Finally removing txfrm_block_to_raster_block() function."

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

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

@@ -387,17 +387,6 @@

   return base + raster_block_offset(plane_bsize, raster_block, stride);

 }

-static int txfrm_block_to_raster_block(BLOCK_SIZE plane_bsize,

-                                       TX_SIZE tx_size, int block) {

-  const int bwl = b_width_log2(plane_bsize);

-  const int tx_cols_log2 = bwl - tx_size;

-  const int tx_cols = 1 << tx_cols_log2;

-  const int raster_mb = block >> (tx_size << 1);

-  const int x = (raster_mb & (tx_cols - 1)) << tx_size;

-  const int y = (raster_mb >> tx_cols_log2) << tx_size;

-  return x + (y << bwl);

-}

-

 static void txfrm_block_to_raster_xy(BLOCK_SIZE plane_bsize,

                                      TX_SIZE tx_size, int block,

                                      int *x, int *y) {

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

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

@@ -474,12 +474,11 @@

   MACROBLOCK *const x = args->x;

   MACROBLOCKD *const xd = &x->e_mbd;

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

-  const int raster_block = txfrm_block_to_raster_block(plane_bsize, tx_size,

-                                                       block);

-

   int16_t *const dqcoeff = BLOCK_OFFSET(pd->dqcoeff, block);

-  uint8_t *const dst = raster_block_offset_uint8(plane_bsize, raster_block,

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

+  int i, j;

+  uint8_t *dst;

+  txfrm_block_to_raster_xy(plane_bsize, tx_size, block, &i, &j);

+  dst = &pd->dst.buf[4 * j * pd->dst.stride + 4 * i];

   vp9_xform_quant(plane, block, plane_bsize, tx_size, arg);