shithub: libvpx

Info  •  Files  •  Log  •  Branches

Remove get_tx_probs2()

This function is redundant.

Change-Id: I7651fc34787c09e59cb1366495f6b525dec8510d

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

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

@@ -176,12 +176,6 @@

   }

 }

-static INLINE const vpx_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, get_tx_size_context(xd), tx_probs);

-}

-

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

                                           struct tx_counts *tx_counts) {

   switch (max_tx_size) {

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

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

@@ -86,7 +86,7 @@

   BLOCK_SIZE bsize = xd->mi[0]->sb_type;

   const TX_SIZE max_tx_size = max_txsize_lookup[bsize];

   const vpx_prob *const tx_probs =

-      get_tx_probs2(max_tx_size, xd, &cm->fc->tx_probs);

+      get_tx_probs(max_tx_size, get_tx_size_context(xd), &cm->fc->tx_probs);

   vpx_write(w, tx_size != TX_4X4, tx_probs[0]);

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

     vpx_write(w, tx_size != TX_8X8, tx_probs[1]);

--- a/vp9/encoder/vp9_rdopt.c

+++ b/vp9/encoder/vp9_rdopt.c

@@ -851,7 +851,8 @@

   TX_SIZE best_tx = max_tx_size;

   int start_tx, end_tx;

-  const vpx_prob *tx_probs = get_tx_probs2(max_tx_size, xd, &cm->fc->tx_probs);

+  const vpx_prob *tx_probs =

+      get_tx_probs(max_tx_size, get_tx_size_context(xd), &cm->fc->tx_probs);

   assert(skip_prob > 0);

   s0 = vp9_cost_bit(skip_prob, 0);

   s1 = vp9_cost_bit(skip_prob, 1);