shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "Renaming vp9_get_pred_context_tx_size() function."

--- a/vp9/common/vp9_pred_common.c

+++ b/vp9/common/vp9_pred_common.c

@@ -364,7 +364,7 @@

 // The mode info data structure has a one element border above and to the

 // left of the entries corresponding to real blocks.

 // The prediction flags in these dummy entries are initialized to 0.

-unsigned char vp9_get_pred_context_tx_size(const MACROBLOCKD *xd) {

+int vp9_get_tx_size_context(const MACROBLOCKD *xd) {

   const int max_tx_size = max_txsize_lookup[xd->mi_8x8[0]->mbmi.sb_type];

   const MB_MODE_INFO *const above_mbmi = get_above_mbmi(get_above_mi(xd));

   const MB_MODE_INFO *const left_mbmi = get_left_mbmi(get_left_mi(xd));

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

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

@@ -100,7 +100,7 @@

   return cm->fc.single_ref_prob[pred_context][1];

 }

-unsigned char vp9_get_pred_context_tx_size(const MACROBLOCKD *xd);

+int vp9_get_tx_size_context(const MACROBLOCKD *xd);

 static const vp9_prob *get_tx_probs(TX_SIZE max_tx_size, int ctx,

                                     const struct tx_probs *tx_probs) {

@@ -119,8 +119,7 @@

 static const vp9_prob *get_tx_probs2(TX_SIZE max_tx_size, const MACROBLOCKD *xd,

                                      const struct tx_probs *tx_probs) {

-  const int ctx = vp9_get_pred_context_tx_size(xd);

-  return get_tx_probs(max_tx_size, ctx, tx_probs);

+  return get_tx_probs(max_tx_size, vp9_get_tx_size_context(xd), tx_probs);

 }

 static unsigned int *get_tx_counts(TX_SIZE max_tx_size, int ctx,

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

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

@@ -63,7 +63,7 @@

 static TX_SIZE read_selected_tx_size(VP9_COMMON *cm, MACROBLOCKD *xd,

                                      TX_SIZE max_tx_size, vp9_reader *r) {

-  const int ctx = vp9_get_pred_context_tx_size(xd);

+  const int ctx = vp9_get_tx_size_context(xd);

   const vp9_prob *tx_probs = get_tx_probs(max_tx_size, ctx, &cm->fc.tx_probs);

   TX_SIZE tx_size = vp9_read(r, tx_probs[0]);

   if (tx_size != TX_4X4 && max_tx_size >= TX_16X16) {

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

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

@@ -2589,9 +2589,8 @@

         !(is_inter_block(mbmi) &&

             (mbmi->skip_coeff ||

              vp9_segfeature_active(&cm->seg, segment_id, SEG_LVL_SKIP)))) {

-      const uint8_t context = vp9_get_pred_context_tx_size(xd);

-      ++get_tx_counts(max_txsize_lookup[bsize],

-                      context, &cm->counts.tx)[mbmi->tx_size];

+      ++get_tx_counts(max_txsize_lookup[bsize], vp9_get_tx_size_context(xd),

+                      &cm->counts.tx)[mbmi->tx_size];

     } else {

       int x, y;

       TX_SIZE tx_size;