shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "vp9_pred_common: inline vp9_get_tx_size_context"

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

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

@@ -337,26 +337,3 @@

   assert(pred_context >= 0 && pred_context < REF_CONTEXTS);

   return pred_context;

 }

-// Returns a context number for the given MB prediction signal

-// 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.

-int vp9_get_tx_size_context(const MACROBLOCKD *xd) {

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

-  const MB_MODE_INFO *const above_mbmi = xd->above_mbmi;

-  const MB_MODE_INFO *const left_mbmi = xd->left_mbmi;

-  const int has_above = xd->up_available;

-  const int has_left = xd->left_available;

-  int above_ctx = (has_above && !above_mbmi->skip) ? (int)above_mbmi->tx_size

-                                                   : max_tx_size;

-  int left_ctx = (has_left && !left_mbmi->skip) ? (int)left_mbmi->tx_size

-                                                : max_tx_size;

-  if (!has_left)

-    left_ctx = above_ctx;

-

-  if (!has_above)

-    above_ctx = left_ctx;

-

-  return (above_ctx + left_ctx) > max_tx_size;

-}

-

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

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

@@ -104,8 +104,29 @@

   return cm->fc->single_ref_prob[vp9_get_pred_context_single_ref_p2(xd)][1];

 }

-int vp9_get_tx_size_context(const MACROBLOCKD *xd);

+// Returns a context number for the given MB prediction signal

+// 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.

+static INLINE int get_tx_size_context(const MACROBLOCKD *xd) {

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

+  const MB_MODE_INFO *const above_mbmi = xd->above_mbmi;

+  const MB_MODE_INFO *const left_mbmi = xd->left_mbmi;

+  const int has_above = xd->up_available;

+  const int has_left = xd->left_available;

+  int above_ctx = (has_above && !above_mbmi->skip) ? (int)above_mbmi->tx_size

+                                                   : max_tx_size;

+  int left_ctx = (has_left && !left_mbmi->skip) ? (int)left_mbmi->tx_size

+                                                : max_tx_size;

+  if (!has_left)

+    left_ctx = above_ctx;

+  if (!has_above)

+    above_ctx = left_ctx;

+

+  return (above_ctx + left_ctx) > max_tx_size;

+}

+

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

                                            const struct tx_probs *tx_probs) {

   switch (max_tx_size) {

@@ -124,7 +145,7 @@

 static INLINE const vp9_prob *get_tx_probs2(TX_SIZE max_tx_size,

                                             const MACROBLOCKD *xd,

                                             const struct tx_probs *tx_probs) {

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

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

 }

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

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

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

@@ -66,7 +66,7 @@

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

                                      TX_SIZE max_tx_size, vp9_reader *r) {

   FRAME_COUNTS *counts = xd->counts;

-  const int ctx = vp9_get_tx_size_context(xd);

+  const int ctx = get_tx_size_context(xd);

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

   int 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

@@ -4198,7 +4198,7 @@

     if (cm->tx_mode == TX_MODE_SELECT &&

         mbmi->sb_type >= BLOCK_8X8  &&

         !(is_inter_block(mbmi) && (mbmi->skip || seg_skip))) {

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

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

                       &td->counts->tx)[mbmi->tx_size];

     } else {

       int x, y;

-- 

⑨