diff options
| author | Yaowu Xu <yaowu@google.com> | 2012-11-28 15:15:51 -0800 |
|---|---|---|
| committer | Yaowu Xu <yaowu@google.com> | 2012-12-07 17:25:45 -0800 |
| commit | ab480cede582e1ef102a0e04b61cb755df4781b7 (patch) | |
| tree | 5175ef5369b7ff0d7a8214815ec8c0e9dd4ecd57 /vp9/common/vp9_entropy.h | |
| parent | fbf052df4246bb4886d055f0fcda7c97de90d360 (diff) | |
| download | libvpx-ab480cede582e1ef102a0e04b61cb755df4781b7.tar libvpx-ab480cede582e1ef102a0e04b61cb755df4781b7.tar.gz libvpx-ab480cede582e1ef102a0e04b61cb755df4781b7.tar.bz2 libvpx-ab480cede582e1ef102a0e04b61cb755df4781b7.zip | |
experiment with CONTEXT conversion
This commit changed the ENTROPY_CONTEXT conversion between MBs that
have different transform sizes.
In additioin, this commit also did a number of cleanup/bug fix:
1. removed duplicate function vp9_fix_contexts() and changed to use
vp8_reset_mb_token_contexts() for both encoder and decoder
2. fixed a bug in stuff_mb_16x16 where wrong context was used for
the UV.
3. changed reset all context to 0 if a MB is skipped to simplify the
logic.
Change-Id: I7bc57a5fb6dbf1f85eac1543daaeb3a61633275c
Diffstat (limited to 'vp9/common/vp9_entropy.h')
| -rw-r--r-- | vp9/common/vp9_entropy.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/vp9/common/vp9_entropy.h b/vp9/common/vp9_entropy.h index 6ec044606..4262b3030 100644 --- a/vp9/common/vp9_entropy.h +++ b/vp9/common/vp9_entropy.h @@ -129,4 +129,10 @@ void vp9_coef_tree_initialize(void); void vp9_adapt_coef_probs(struct VP9Common *); +static void vp9_reset_mb_tokens_context(MACROBLOCKD* const xd) { + /* Clear entropy contexts */ + vpx_memset(xd->above_context, 0, sizeof(ENTROPY_CONTEXT_PLANES)); + vpx_memset(xd->left_context, 0, sizeof(ENTROPY_CONTEXT_PLANES)); +} + #endif |