diff options
| author | Dmitry Kovalev <dkovalev@google.com> | 2013-08-22 01:36:25 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2013-08-22 01:36:25 -0700 |
| commit | 359b571448c98a7fe7466f2bc9e840e87737bc56 (patch) | |
| tree | 32938ad99a53a4b8868b031faba01e42a5ca3b24 /vp9 | |
| parent | 596c51087b22b37d0a676b53dd1dc217cd7150b7 (diff) | |
| parent | c43da352ab3ca5581e87615b686a269c644ff754 (diff) | |
| download | libvpx-359b571448c98a7fe7466f2bc9e840e87737bc56.tar libvpx-359b571448c98a7fe7466f2bc9e840e87737bc56.tar.gz libvpx-359b571448c98a7fe7466f2bc9e840e87737bc56.tar.bz2 libvpx-359b571448c98a7fe7466f2bc9e840e87737bc56.zip | |
Merge "Cleaning up reset_skip_context function."
Diffstat (limited to 'vp9')
| -rw-r--r-- | vp9/common/vp9_entropy.h | 11 |
1 files changed, 5 insertions, 6 deletions
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]); } } |