diff options
| author | Dmitry Kovalev <dkovalev@google.com> | 2013-11-20 12:39:29 -0800 |
|---|---|---|
| committer | Dmitry Kovalev <dkovalev@google.com> | 2013-11-20 12:39:29 -0800 |
| commit | 79b5a2b1429c32275f6bf9be12f8df9bb087daf9 (patch) | |
| tree | bd7411a1d258a6d3282b1a24e7cff7309256bf31 /vp9/encoder/vp9_encodemb.c | |
| parent | 82f8ae4c5bfeac652f9a6c3aeefd66cbcada0cc2 (diff) | |
| download | libvpx-79b5a2b1429c32275f6bf9be12f8df9bb087daf9.tar libvpx-79b5a2b1429c32275f6bf9be12f8df9bb087daf9.tar.gz libvpx-79b5a2b1429c32275f6bf9be12f8df9bb087daf9.tar.bz2 libvpx-79b5a2b1429c32275f6bf9be12f8df9bb087daf9.zip | |
Removing plane_block_{width, height} functions.
Change-Id: I29c0dfcf41a1253d5e2a0d2ff740c0c38ebaa5a2
Diffstat (limited to 'vp9/encoder/vp9_encodemb.c')
| -rw-r--r-- | vp9/encoder/vp9_encodemb.c | 11 |
1 files changed, 5 insertions, 6 deletions
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); } |