diff options
| author | Dmitry Kovalev <dkovalev@google.com> | 2013-08-12 11:24:24 -0700 |
|---|---|---|
| committer | Dmitry Kovalev <dkovalev@google.com> | 2013-08-12 11:24:24 -0700 |
| commit | 8b0e6035a219d8df8a9ea09fa9c465ab484c8b62 (patch) | |
| tree | b0a25f784276dcd55bd463254150faaf4f23f661 /vp9/encoder/vp9_encodeframe.c | |
| parent | 097046ae28c41d2c6a066d3ad864d738d9dbb794 (diff) | |
| download | libvpx-8b0e6035a219d8df8a9ea09fa9c465ab484c8b62.tar libvpx-8b0e6035a219d8df8a9ea09fa9c465ab484c8b62.tar.gz libvpx-8b0e6035a219d8df8a9ea09fa9c465ab484c8b62.tar.bz2 libvpx-8b0e6035a219d8df8a9ea09fa9c465ab484c8b62.zip | |
Entropy context related cleanups.
Adding set_skip_context() function used from both encoder and decoder.
Change-Id: Ia22cfad3211a00a63eb294f64f857b78f4aa9b85
Diffstat (limited to 'vp9/encoder/vp9_encodeframe.c')
| -rw-r--r-- | vp9/encoder/vp9_encodeframe.c | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/vp9/encoder/vp9_encodeframe.c b/vp9/encoder/vp9_encodeframe.c index 2e855c862..0eae07d04 100644 --- a/vp9/encoder/vp9_encodeframe.c +++ b/vp9/encoder/vp9_encodeframe.c @@ -480,17 +480,8 @@ static void set_offsets(VP9_COMP *cpi, int mi_row, int mi_col, const int mb_col = mi_col >> 1; const int idx_map = mb_row * cm->mb_cols + mb_col; const struct segmentation *const seg = &xd->seg; - int i; - - // entropy context structures - for (i = 0; i < MAX_MB_PLANE; i++) { - xd->plane[i].above_context = cm->above_context[i] - + (mi_col * 2 >> xd->plane[i].subsampling_x); - xd->plane[i].left_context = cm->left_context[i] - + (((mi_row * 2) & 15) >> xd->plane[i].subsampling_y); - } - // partition contexts + set_skip_context(cm, xd, mi_row, mi_col); set_partition_seg_context(cm, xd, mi_row, mi_col); // Activity map pointer @@ -2630,7 +2621,7 @@ static void encode_superblock(VP9_COMP *cpi, TOKENEXTRA **t, int output_enabled, mbmi->mb_skip_coeff = 1; if (output_enabled) cm->counts.mbskip[mb_skip_context][1]++; - vp9_reset_sb_tokens_context(xd, MAX(bsize, BLOCK_8X8)); + reset_skip_context(xd, MAX(bsize, BLOCK_8X8)); } // copy skip flag on all mb_mode_info contexts in this SB |