Commit 79b5a2b1 authored by Dmitry Kovalev's avatar Dmitry Kovalev
Browse files

Removing plane_block_{width, height} functions.

Change-Id: I29c0dfcf41a1253d5e2a0d2ff740c0c38ebaa5a2
parent 82f8ae4c
...@@ -286,16 +286,6 @@ static BLOCK_SIZE get_plane_block_size(BLOCK_SIZE bsize, ...@@ -286,16 +286,6 @@ static BLOCK_SIZE get_plane_block_size(BLOCK_SIZE bsize,
return bs; 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, typedef void (*foreach_transformed_block_visitor)(int plane, int block,
BLOCK_SIZE plane_bsize, BLOCK_SIZE plane_bsize,
TX_SIZE tx_size, TX_SIZE tx_size,
......
...@@ -106,9 +106,10 @@ static void build_inter_predictors(MACROBLOCKD *xd, int plane, int block, ...@@ -106,9 +106,10 @@ static void build_inter_predictors(MACROBLOCKD *xd, int plane, int block,
BLOCK_SIZE bsize, int pred_w, int pred_h, BLOCK_SIZE bsize, int pred_w, int pred_h,
int mi_x, int mi_y) { int mi_x, int mi_y) {
struct macroblockd_plane *const pd = &xd->plane[plane]; 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 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 x = 4 * (block & ((1 << bwl) - 1));
const int y = 4 * (block >> bwl); const int y = 4 * (block >> bwl);
const MODE_INFO *mi = xd->mi_8x8[0]; const MODE_INFO *mi = xd->mi_8x8[0];
......
...@@ -63,13 +63,12 @@ void vp9_subtract_block_c(int rows, int cols, ...@@ -63,13 +63,12 @@ void vp9_subtract_block_c(int rows, int cols,
static void subtract_plane(MACROBLOCK *x, BLOCK_SIZE bsize, int plane) { static void subtract_plane(MACROBLOCK *x, BLOCK_SIZE bsize, int plane) {
struct macroblock_plane *const p = &x->plane[plane]; struct macroblock_plane *const p = &x->plane[plane];
const MACROBLOCKD *const xd = &x->e_mbd; const struct macroblockd_plane *const pd = &x->e_mbd.plane[plane];
const struct macroblockd_plane *const pd = &xd->plane[plane]; const BLOCK_SIZE plane_bsize = get_plane_block_size(bsize, pd);
const int bw = plane_block_width(bsize, pd); const int bw = 4 * num_4x4_blocks_wide_lookup[plane_bsize];
const int bh = plane_block_height(bsize, pd); const int bh = 4 * num_4x4_blocks_high_lookup[plane_bsize];
vp9_subtract_block(bh, bw, p->src_diff, bw, vp9_subtract_block(bh, bw, p->src_diff, bw, p->src.buf, p->src.stride,
p->src.buf, p->src.stride,
pd->dst.buf, pd->dst.stride); pd->dst.buf, pd->dst.stride);
} }
......
...@@ -1549,9 +1549,9 @@ static int64_t encode_inter_mb_segment(VP9_COMP *cpi, ...@@ -1549,9 +1549,9 @@ static int64_t encode_inter_mb_segment(VP9_COMP *cpi,
struct macroblockd_plane *const pd = &xd->plane[0]; struct macroblockd_plane *const pd = &xd->plane[0];
struct macroblock_plane *const p = &x->plane[0]; struct macroblock_plane *const p = &x->plane[0];
MODE_INFO *const mi = xd->mi_8x8[0]; MODE_INFO *const mi = xd->mi_8x8[0];
const BLOCK_SIZE bsize = mi->mbmi.sb_type; const BLOCK_SIZE plane_bsize = get_plane_block_size(mi->mbmi.sb_type, pd);
const int width = plane_block_width(bsize, pd); const int width = 4 * num_4x4_blocks_wide_lookup[plane_bsize];
const int height = plane_block_height(bsize, pd); const int height = 4 * num_4x4_blocks_high_lookup[plane_bsize];
int idx, idy; int idx, idy;
const uint8_t *const src = &p->src.buf[raster_block_offset(BLOCK_8X8, i, const uint8_t *const src = &p->src.buf[raster_block_offset(BLOCK_8X8, i,
......
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