shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "Replacing raster_block with block in the encoder."

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

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

@@ -136,7 +136,6 @@

   const int16_t *scan, *nb;

   const int mul = 1 + (tx_size == TX_32X32);

   uint8_t token_cache[1024];

-  const int ib = txfrm_block_to_raster_block(plane_bsize, tx_size, block);

   const int16_t *dequant_ptr = pd->dequant;

   const uint8_t *const band_translate = (tx_size == TX_4X4 ?

                                          vp9_coefband_trans_4x4 :

@@ -145,7 +144,7 @@

   assert((!type && !plane) || (type && plane));

   dqcoeff_ptr = BLOCK_OFFSET(pd->dqcoeff, block);

   qcoeff_ptr = BLOCK_OFFSET(pd->qcoeff, block);

-  get_scan(xd, tx_size, type, ib, &scan, &nb);

+  get_scan(xd, tx_size, type, block, &scan, &nb);

   assert(eob <= default_eob);

   /* Now set up a Viterbi trellis to evaluate alternative roundings. */