Remove vp9_reset_mb_tokens_context

Use sb-common version instead.

Change-Id: If2552b5a39fd2e5272f66a41c5667dda85fd3939

diff --git a/vp9/common/vp9_entropy.h b/vp9/common/vp9_entropy.h
index d23f8c4426da6cce347520256ad062a68f5f4e49..113f946594dfbf21b116d067fdef784ee4afb90e 100644 (file)
--- a/vp9/common/vp9_entropy.h
+++ b/vp9/common/vp9_entropy.h
@@ -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 */

diff --git a/vp9/decoder/vp9_decodframe.c b/vp9/decoder/vp9_decodframe.c
index 28327ff40842e571cc081a57884b13577fbbe129..f017c1fc744bfe49b540f642aea02fc2fbed6435 100644 (file)
--- a/vp9/decoder/vp9_decodframe.c
+++ b/vp9/decoder/vp9_decodframe.c
@@ -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)

diff --git a/vp9/encoder/vp9_encodeframe.c b/vp9/encoder/vp9_encodeframe.c
index c47746e5466bd5b7ee34754aeffcaf42d46d0a26..46feaab5f088582ddd0648e34e82552df982f28d 100644 (file)
--- a/vp9/encoder/vp9_encodeframe.c
+++ b/vp9/encoder/vp9_encodeframe.c
@@ -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;

diff --git a/vp9/encoder/vp9_tokenize.c b/vp9/encoder/vp9_tokenize.c
index e85f85193c4a8f530882cf8caa3cde4cc7373fb4..01c83e818bb415aa7a0588a4f52bbaf01ff55f15 100644 (file)
--- a/vp9/encoder/vp9_tokenize.c
+++ b/vp9/encoder/vp9_tokenize.c
@@ -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)