From 61c33d0ad5cf633fe14f5ad23dbc9151f74504a8 Mon Sep 17 00:00:00 2001 From: Dmitry Kovalev Date: Wed, 7 Aug 2013 17:06:33 -0700 Subject: [PATCH] Removing plane_block_{width, height}_log2by4 functions. Change-Id: I040b82b8e32aee272d10cbb021c7ba1c76343d7a --- vp9/common/vp9_blockd.h | 10 ---------- vp9/encoder/vp9_encodemb.c | 4 ++-- 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/vp9/common/vp9_blockd.h b/vp9/common/vp9_blockd.h index 60ef9c207..7fc066136 100644 --- a/vp9/common/vp9_blockd.h +++ b/vp9/common/vp9_blockd.h @@ -450,16 +450,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, diff --git a/vp9/encoder/vp9_encodemb.c b/vp9/encoder/vp9_encodemb.c index 40b0a4e5a..ecd2cf81b 100644 --- a/vp9/encoder/vp9_encodemb.c +++ b/vp9/encoder/vp9_encodemb.c @@ -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; -- 2.40.0