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

Merge "Removing plane_block_{width, height}_log2by4 functions."

parents ff7df102 61c33d0a
......@@ -410,16 +410,6 @@ static INLINE int plane_block_height(BLOCK_SIZE_TYPE bsize,
return 4 << (b_height_log2(bsize) - plane->subsampling_y);
}
static INLINE int plane_block_width_log2by4(
BLOCK_SIZE_TYPE bsize, const struct macroblockd_plane* plane) {
return (b_width_log2(bsize) - plane->subsampling_x);
}
static INLINE int plane_block_height_log2by4(
BLOCK_SIZE_TYPE bsize, const struct macroblockd_plane* plane) {
return (b_height_log2(bsize) - plane->subsampling_y);
}
typedef void (*foreach_transformed_block_visitor)(int plane, int block,
BLOCK_SIZE_TYPE bsize,
int ss_txfrm_size,
......
......@@ -459,10 +459,10 @@ void xform_quant(int plane, int block, BLOCK_SIZE_TYPE bsize,
int16_t *coeff = BLOCK_OFFSET(p->coeff, block, 16);
int16_t *qcoeff = BLOCK_OFFSET(pd->qcoeff, block, 16);
int16_t *dqcoeff = BLOCK_OFFSET(pd->dqcoeff, block, 16);
const TX_SIZE tx_size = (TX_SIZE)(ss_txfrm_size / 2);
const int16_t *scan, *iscan;
uint16_t *eob = &pd->eobs[block];
const int bwl = plane_block_width_log2by4(bsize, pd), bw = 1 << bwl;
const TX_SIZE tx_size = (TX_SIZE)(ss_txfrm_size / 2);
const int bwl = b_width_log2(bsize) - pd->subsampling_x, bw = 1 << bwl;
const int twl = bwl - tx_size, twmask = (1 << twl) - 1;
int xoff, yoff;
int16_t *src_diff;
......
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