generic-library/vpx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove vp9_reset_mb_tokens_context

Browse Source 
Use sb-common version instead.

Change-Id: If2552b5a39fd2e5272f66a41c5667dda85fd3939
This commit is contained in:
John Koleszar 2013-04-11 11:38:14 -07:00
parent 38d7945345
commit c18b2617a4
4 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
vp9/common/vp9_entropy.h
View File

@ -116,12 +116,6 @@ extern DECLARE_ALIGNED(16, const int, vp9_default_zig_zag1d_32x32[1024]);
void vp9_coef_tree_initialize(void);
void vp9_adapt_coef_probs(struct VP9Common *);
static INLINE 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));
}
static INLINE void vp9_reset_sb_tokens_context(MACROBLOCKD* const xd,
BLOCK_SIZE_TYPE bsize) {
/* Clear entropy contexts */

2
vp9/decoder/vp9_decodframe.c
View File

@ -771,7 +771,7 @@ static void decode_mb(VP9D_COMP *pbi, MACROBLOCKD *xd,
mb_init_dequantizer(pbi, xd);
if (xd->mode_info_context->mbmi.mb_skip_coeff) {
vp9_reset_mb_tokens_context(xd);
vp9_reset_sb_tokens_context(xd, BLOCK_SIZE_MB16X16);
} else if (!bool_error(bc)) {
#if CONFIG_NEWBINTRAMODES
if (mode != B_PRED)

2
vp9/encoder/vp9_encodeframe.c
View File

@ -2124,7 +2124,7 @@ static void encode_macroblock(VP9_COMP *cpi, TOKENEXTRA **t,
mbmi->mb_skip_coeff = 1;
if (output_enabled)
cpi->skip_true_count[mb_skip_context]++;
vp9_reset_mb_tokens_context(xd);
vp9_reset_sb_tokens_context(xd, BLOCK_SIZE_MB16X16);
} else {
vp9_stuff_mb(cpi, xd, t, !output_enabled);
mbmi->mb_skip_coeff = 0;

2
vp9/encoder/vp9_tokenize.c
View File

@ -568,7 +568,7 @@ void vp9_tokenize_mb(VP9_COMP *cpi,
if (!cpi->common.mb_no_coeff_skip) {
vp9_stuff_mb(cpi, xd, t, dry_run);
} else {
vp9_reset_mb_tokens_context(xd);
vp9_reset_sb_tokens_context(xd, BLOCK_SIZE_MB16X16);
}
if (dry_run)