shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "Renaming "mbskip" to "skip"."

--- a/vp9/common/vp9_blockd.h

+++ b/vp9/common/vp9_blockd.h

@@ -30,7 +30,7 @@

 #endif

 #define BLOCK_SIZE_GROUPS 4

-#define MBSKIP_CONTEXTS 3

+#define SKIP_CONTEXTS 3

 #define INTER_MODE_CONTEXTS 7

 /* Segment Feature Masks */

--- a/vp9/common/vp9_entropymode.c

+++ b/vp9/common/vp9_entropymode.c

@@ -303,7 +303,7 @@

   ct_8x8p[0][1] = tx_count_8x8p[TX_8X8];

 }

-static const vp9_prob default_mbskip_probs[MBSKIP_CONTEXTS] = {

+static const vp9_prob default_skip_probs[SKIP_CONTEXTS] = {

   192, 128, 64

 };

@@ -325,7 +325,7 @@

   vp9_copy(cm->fc.comp_ref_prob, default_comp_ref_p);

   vp9_copy(cm->fc.single_ref_prob, default_single_ref_p);

   cm->fc.tx_probs = default_tx_probs;

-  vp9_copy(cm->fc.mbskip_probs, default_mbskip_probs);

+  vp9_copy(cm->fc.skip_probs, default_skip_probs);

   vp9_copy(cm->fc.inter_mode_probs, default_inter_mode_probs);

 }

@@ -415,9 +415,8 @@

     }

   }

-  for (i = 0; i < MBSKIP_CONTEXTS; ++i)

-    fc->mbskip_probs[i] = adapt_prob(pre_fc->mbskip_probs[i],

-                                     counts->mbskip[i]);

+  for (i = 0; i < SKIP_CONTEXTS; ++i)

+    fc->skip_probs[i] = adapt_prob(pre_fc->skip_probs[i], counts->skip[i]);

 }

 static void set_default_lf_deltas(struct loopfilter *lf) {

--- a/vp9/common/vp9_onyxc_int.h

+++ b/vp9/common/vp9_onyxc_int.h

@@ -60,7 +60,7 @@

   vp9_prob single_ref_prob[REF_CONTEXTS][2];

   vp9_prob comp_ref_prob[REF_CONTEXTS];

   struct tx_probs tx_probs;

-  vp9_prob mbskip_probs[MBSKIP_CONTEXTS];

+  vp9_prob skip_probs[SKIP_CONTEXTS];

   nmv_context nmvc;

 } FRAME_CONTEXT;

@@ -79,7 +79,7 @@

   unsigned int single_ref[REF_CONTEXTS][2][2];

   unsigned int comp_ref[REF_CONTEXTS][2];

   struct tx_counts tx;

-  unsigned int mbskip[MBSKIP_CONTEXTS][2];

+  unsigned int skip[SKIP_CONTEXTS][2];

   nmv_context_counts mv;

 } FRAME_COUNTS;

--- a/vp9/common/vp9_pred_common.h

+++ b/vp9/common/vp9_pred_common.h

@@ -54,7 +54,7 @@

 static INLINE vp9_prob vp9_get_skip_prob(const VP9_COMMON *cm,

                                          const MACROBLOCKD *xd) {

-  return cm->fc.mbskip_probs[vp9_get_skip_context(xd)];

+  return cm->fc.skip_probs[vp9_get_skip_context(xd)];

 }

 int vp9_get_pred_context_switchable_interp(const MACROBLOCKD *xd);

--- a/vp9/decoder/vp9_decodeframe.c

+++ b/vp9/decoder/vp9_decodeframe.c

@@ -1243,8 +1243,8 @@

     read_tx_mode_probs(&fc->tx_probs, &r);

   read_coef_probs(fc, cm->tx_mode, &r);

-  for (k = 0; k < MBSKIP_CONTEXTS; ++k)

-    vp9_diff_update_prob(&r, &fc->mbskip_probs[k]);

+  for (k = 0; k < SKIP_CONTEXTS; ++k)

+    vp9_diff_update_prob(&r, &fc->skip_probs[k]);

   if (!frame_is_intra_only(cm)) {

     nmv_context *const nmvc = &fc->nmvc;

@@ -1319,8 +1319,7 @@

   assert(!memcmp(cm->counts.comp_ref, zero_counts.comp_ref,

                  sizeof(cm->counts.comp_ref)));

   assert(!memcmp(&cm->counts.tx, &zero_counts.tx, sizeof(cm->counts.tx)));

-  assert(!memcmp(cm->counts.mbskip, zero_counts.mbskip,

-                 sizeof(cm->counts.mbskip)));

+  assert(!memcmp(cm->counts.skip, zero_counts.skip, sizeof(cm->counts.skip)));

   assert(!memcmp(&cm->counts.mv, &zero_counts.mv, sizeof(cm->counts.mv)));

 }

 #endif  // NDEBUG

--- a/vp9/decoder/vp9_decodemv.c

+++ b/vp9/decoder/vp9_decodemv.c

@@ -152,9 +152,9 @@

     return 1;

   } else {

     const int ctx = vp9_get_skip_context(xd);

-    const int skip = vp9_read(r, cm->fc.mbskip_probs[ctx]);

+    const int skip = vp9_read(r, cm->fc.skip_probs[ctx]);

     if (!cm->frame_parallel_decoding_mode)

-      ++cm->counts.mbskip[ctx][skip];

+      ++cm->counts.skip[ctx][skip];

     return skip;

   }

 }

--- a/vp9/encoder/vp9_bitstream.c

+++ b/vp9/encoder/vp9_bitstream.c

@@ -124,8 +124,8 @@

 void vp9_update_skip_probs(VP9_COMMON *cm, vp9_writer *w) {

   int k;

-  for (k = 0; k < MBSKIP_CONTEXTS; ++k)

-    vp9_cond_prob_diff_update(w, &cm->fc.mbskip_probs[k], cm->counts.mbskip[k]);

+  for (k = 0; k < SKIP_CONTEXTS; ++k)

+    vp9_cond_prob_diff_update(w, &cm->fc.skip_probs[k], cm->counts.skip[k]);

 }

 static void update_switchable_interp_probs(VP9_COMP *cpi, vp9_writer *w) {

--- a/vp9/encoder/vp9_encodeframe.c

+++ b/vp9/encoder/vp9_encodeframe.c

@@ -2156,7 +2156,7 @@

   vp9_zero(cm->counts.single_ref);

   vp9_zero(cm->counts.comp_ref);

   vp9_zero(cm->counts.tx);

-  vp9_zero(cm->counts.mbskip);

+  vp9_zero(cm->counts.skip);

   // Note: this memset assumes above_context[0], [1] and [2]

   // are allocated as part of the same buffer.

@@ -3000,7 +3000,7 @@

   } else {

     mbmi->skip_coeff = 1;

     if (output_enabled)

-      cm->counts.mbskip[vp9_get_skip_context(xd)][1]++;

+      cm->counts.skip[vp9_get_skip_context(xd)][1]++;

     reset_skip_context(xd, MAX(bsize, BLOCK_8X8));

   }

--- a/vp9/encoder/vp9_onyx_int.h

+++ b/vp9/encoder/vp9_onyx_int.h

@@ -557,7 +557,7 @@

   int cpu_used;

   int pass;

-  vp9_prob last_skip_false_probs[3][MBSKIP_CONTEXTS];

+  vp9_prob last_skip_false_probs[3][SKIP_CONTEXTS];

   int last_skip_probs_q[3];

   int ref_frame_flags;

--- a/vp9/encoder/vp9_tokenize.c

+++ b/vp9/encoder/vp9_tokenize.c

@@ -301,7 +301,7 @@

   struct tokenize_b_args arg = {cpi, xd, t, mbmi->tx_size, cpi->mb.token_cache};

   if (mbmi->skip_coeff) {

     if (!dry_run)

-      cm->counts.mbskip[ctx][1] += skip_inc;

+      cm->counts.skip[ctx][1] += skip_inc;

     reset_skip_context(xd, bsize);

     if (dry_run)

       *t = t_backup;

@@ -309,7 +309,7 @@

   }

   if (!dry_run) {

-    cm->counts.mbskip[ctx][0] += skip_inc;

+    cm->counts.skip[ctx][0] += skip_inc;

     foreach_transformed_block(xd, bsize, tokenize_b, &arg);

   } else {

     foreach_transformed_block(xd, bsize, set_entropy_context_b, &arg);