From 79b5a2b1429c32275f6bf9be12f8df9bb087daf9 Mon Sep 17 00:00:00 2001 From: Dmitry Kovalev Date: Wed, 20 Nov 2013 12:39:29 -0800 Subject: [PATCH] Removing plane_block_{width, height} functions. Change-Id: I29c0dfcf41a1253d5e2a0d2ff740c0c38ebaa5a2 --- vp9/common/vp9_blockd.h | 10 ---------- vp9/common/vp9_reconinter.c | 5 +++-- vp9/encoder/vp9_encodemb.c | 11 +++++------ vp9/encoder/vp9_rdopt.c | 6 +++--- 4 files changed, 11 insertions(+), 21 deletions(-) diff --git a/vp9/common/vp9_blockd.h b/vp9/common/vp9_blockd.h index 121947b7e..7b147b424 100644 --- a/vp9/common/vp9_blockd.h +++ b/vp9/common/vp9_blockd.h @@ -286,16 +286,6 @@ static BLOCK_SIZE get_plane_block_size(BLOCK_SIZE bsize, return bs; } -static INLINE int plane_block_width(BLOCK_SIZE bsize, - const struct macroblockd_plane* plane) { - return 4 << (b_width_log2(bsize) - plane->subsampling_x); -} - -static INLINE int plane_block_height(BLOCK_SIZE bsize, - const struct macroblockd_plane* plane) { - return 4 << (b_height_log2(bsize) - plane->subsampling_y); -} - typedef void (*foreach_transformed_block_visitor)(int plane, int block, BLOCK_SIZE plane_bsize, TX_SIZE tx_size, diff --git a/vp9/common/vp9_reconinter.c b/vp9/common/vp9_reconinter.c index 3add81b99..aa17b85c8 100644 --- a/vp9/common/vp9_reconinter.c +++ b/vp9/common/vp9_reconinter.c @@ -106,9 +106,10 @@ static void build_inter_predictors(MACROBLOCKD *xd, int plane, int block, BLOCK_SIZE bsize, int pred_w, int pred_h, int mi_x, int mi_y) { struct macroblockd_plane *const pd = &xd->plane[plane]; - const int bwl = b_width_log2(bsize) - pd->subsampling_x; + const BLOCK_SIZE plane_bsize = get_plane_block_size(bsize, pd); + const int bwl = b_width_log2(plane_bsize); const int bw = 4 << bwl; - const int bh = plane_block_height(bsize, pd); + const int bh = 4 * num_4x4_blocks_high_lookup[plane_bsize]; const int x = 4 * (block & ((1 << bwl) - 1)); const int y = 4 * (block >> bwl); const MODE_INFO *mi = xd->mi_8x8[0]; diff --git a/vp9/encoder/vp9_encodemb.c b/vp9/encoder/vp9_encodemb.c index 0e1523b84..beaac247e 100644 --- a/vp9/encoder/vp9_encodemb.c +++ b/vp9/encoder/vp9_encodemb.c @@ -63,13 +63,12 @@ void vp9_subtract_block_c(int rows, int cols, static void subtract_plane(MACROBLOCK *x, BLOCK_SIZE bsize, int plane) { struct macroblock_plane *const p = &x->plane[plane]; - const MACROBLOCKD *const xd = &x->e_mbd; - const struct macroblockd_plane *const pd = &xd->plane[plane]; - const int bw = plane_block_width(bsize, pd); - const int bh = plane_block_height(bsize, pd); + const struct macroblockd_plane *const pd = &x->e_mbd.plane[plane]; + const BLOCK_SIZE plane_bsize = get_plane_block_size(bsize, pd); + const int bw = 4 * num_4x4_blocks_wide_lookup[plane_bsize]; + const int bh = 4 * num_4x4_blocks_high_lookup[plane_bsize]; - vp9_subtract_block(bh, bw, p->src_diff, bw, - p->src.buf, p->src.stride, + vp9_subtract_block(bh, bw, p->src_diff, bw, p->src.buf, p->src.stride, pd->dst.buf, pd->dst.stride); } diff --git a/vp9/encoder/vp9_rdopt.c b/vp9/encoder/vp9_rdopt.c index 5d37f8393..3dd99157b 100644 --- a/vp9/encoder/vp9_rdopt.c +++ b/vp9/encoder/vp9_rdopt.c @@ -1549,9 +1549,9 @@ static int64_t encode_inter_mb_segment(VP9_COMP *cpi, struct macroblockd_plane *const pd = &xd->plane[0]; struct macroblock_plane *const p = &x->plane[0]; MODE_INFO *const mi = xd->mi_8x8[0]; - const BLOCK_SIZE bsize = mi->mbmi.sb_type; - const int width = plane_block_width(bsize, pd); - const int height = plane_block_height(bsize, pd); + const BLOCK_SIZE plane_bsize = get_plane_block_size(mi->mbmi.sb_type, pd); + const int width = 4 * num_4x4_blocks_wide_lookup[plane_bsize]; + const int height = 4 * num_4x4_blocks_high_lookup[plane_bsize]; int idx, idy; const uint8_t *const src = &p->src.buf[raster_block_offset(BLOCK_8X8, i, -- 2.40.0