Commit b3c75a2d authored by Dmitry Kovalev's avatar Dmitry Kovalev Committed by Gerrit Code Review
Browse files

Merge "Replacing raster_block with block in the encoder."

parents e4d10f38 94d4add1
...@@ -136,7 +136,6 @@ static void optimize_b(MACROBLOCK *mb, ...@@ -136,7 +136,6 @@ static void optimize_b(MACROBLOCK *mb,
const int16_t *scan, *nb; const int16_t *scan, *nb;
const int mul = 1 + (tx_size == TX_32X32); const int mul = 1 + (tx_size == TX_32X32);
uint8_t token_cache[1024]; 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 int16_t *dequant_ptr = pd->dequant;
const uint8_t *const band_translate = (tx_size == TX_4X4 ? const uint8_t *const band_translate = (tx_size == TX_4X4 ?
vp9_coefband_trans_4x4 : vp9_coefband_trans_4x4 :
...@@ -145,7 +144,7 @@ static void optimize_b(MACROBLOCK *mb, ...@@ -145,7 +144,7 @@ static void optimize_b(MACROBLOCK *mb,
assert((!type && !plane) || (type && plane)); assert((!type && !plane) || (type && plane));
dqcoeff_ptr = BLOCK_OFFSET(pd->dqcoeff, block); dqcoeff_ptr = BLOCK_OFFSET(pd->dqcoeff, block);
qcoeff_ptr = BLOCK_OFFSET(pd->qcoeff, 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); assert(eob <= default_eob);
/* Now set up a Viterbi trellis to evaluate alternative roundings. */ /* Now set up a Viterbi trellis to evaluate alternative roundings. */
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment