From c43da352ab3ca5581e87615b686a269c644ff754 Mon Sep 17 00:00:00 2001 From: Dmitry Kovalev Date: Wed, 21 Aug 2013 16:31:51 -0700 Subject: Cleaning up reset_skip_context function. Change-Id: Ib3e72671eb8da6f2e9767a6de292ec7c7cde6bc7 --- vp9/common/vp9_entropy.h | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'vp9') diff --git a/vp9/common/vp9_entropy.h b/vp9/common/vp9_entropy.h index 1106af588..82cbfd32c 100644 --- a/vp9/common/vp9_entropy.h +++ b/vp9/common/vp9_entropy.h @@ -157,15 +157,14 @@ void vp9_coef_tree_initialize(void); void vp9_adapt_coef_probs(struct VP9Common *); static INLINE void reset_skip_context(MACROBLOCKD *xd, BLOCK_SIZE_TYPE bsize) { - const int bw = 1 << b_width_log2(bsize); - const int bh = 1 << b_height_log2(bsize); int i; for (i = 0; i < MAX_MB_PLANE; i++) { struct macroblockd_plane *const pd = &xd->plane[i]; - vpx_memset(pd->above_context, 0, - sizeof(ENTROPY_CONTEXT) * (bw >> pd->subsampling_x)); - vpx_memset(pd->left_context, 0, - sizeof(ENTROPY_CONTEXT) * (bh >> pd->subsampling_y)); + const BLOCK_SIZE_TYPE plane_bsize = get_plane_block_size(bsize, pd); + vpx_memset(pd->above_context, 0, sizeof(ENTROPY_CONTEXT) * + num_4x4_blocks_wide_lookup[plane_bsize]); + vpx_memset(pd->left_context, 0, sizeof(ENTROPY_CONTEXT) * + num_4x4_blocks_high_lookup[plane_bsize]); } } -- cgit v1.2.3