commit 8ef24aece40f536e8260784c8b7fa41f09033115
author Cheng Chen <chengchen@google.com> Tue Apr 03 18:07:33 2018 -0700
committer Yaowu Xu <yaowu@google.com> Wed Apr 04 15:32:31 2018 +0000
tree bb9c1d5eb9b278e8553dce086473e1696493af8d
parent 2f94a456f75cb720a36185c3bc52d389c0b0d892

Static a local function

Change-Id: I4066fad4c4b9e1031ef3d6dd8f7ac4126420d5df

av1/encoder/rdopt.c

diff --git a/av1/encoder/rdopt.c b/av1/encoder/rdopt.c
index f837f45..01a202e 100644
--- a/av1/encoder/rdopt.c
+++ b/av1/encoder/rdopt.c
@@ -3472,12 +3472,12 @@
   return is_cost_valid;
 }
 
-void av1_tx_block_rd_b(const AV1_COMP *cpi, MACROBLOCK *x, TX_SIZE tx_size,
-                       int blk_row, int blk_col, int plane, int block,
-                       int plane_bsize, const ENTROPY_CONTEXT *a,
-                       const ENTROPY_CONTEXT *l, RD_STATS *rd_stats,
-                       int fast_tx_search, int64_t ref_rdcost,
-                       TXB_RD_INFO *rd_info_array) {
+static void tx_block_rd_b(const AV1_COMP *cpi, MACROBLOCK *x, TX_SIZE tx_size,
+                          int blk_row, int blk_col, int plane, int block,
+                          int plane_bsize, const ENTROPY_CONTEXT *a,
+                          const ENTROPY_CONTEXT *l, RD_STATS *rd_stats,
+                          int fast_tx_search, int64_t ref_rdcost,
+                          TXB_RD_INFO *rd_info_array) {
   const struct macroblock_plane *const p = &x->plane[plane];
   TXB_CTX txb_ctx;
   get_txb_ctx(plane_bsize, tx_size, plane, a, l, &txb_ctx);
@@ -3578,10 +3578,9 @@
     rd_stats->zero_rate = zero_blk_rate;
     const int index = av1_get_txb_size_index(plane_bsize, blk_row, blk_col);
     mbmi->inter_tx_size[index] = tx_size;
-    av1_tx_block_rd_b(
-        cpi, x, tx_size, blk_row, blk_col, 0, block, plane_bsize, pta, ptl,
-        rd_stats, fast_tx_search, ref_best_rd,
-        rd_info_node != NULL ? rd_info_node->rd_info_array : NULL);
+    tx_block_rd_b(cpi, x, tx_size, blk_row, blk_col, 0, block, plane_bsize, pta,
+                  ptl, rd_stats, fast_tx_search, ref_best_rd,
+                  rd_info_node != NULL ? rd_info_node->rd_info_array : NULL);
     if (rd_stats->rate == INT_MAX) return;
 
     if ((RDCOST(x->rdmult, rd_stats->rate, rd_stats->dist) >=
@@ -3952,8 +3951,8 @@
                                   .txb_skip_cost[txb_ctx.txb_skip_ctx][1];
     rd_stats->zero_rate = zero_blk_rate;
     rd_stats->ref_rdcost = ref_best_rd;
-    av1_tx_block_rd_b(cpi, x, tx_size, blk_row, blk_col, 0, block, plane_bsize,
-                      ta, tl, rd_stats, fast, ref_best_rd, NULL);
+    tx_block_rd_b(cpi, x, tx_size, blk_row, blk_col, 0, block, plane_bsize, ta,
+                  tl, rd_stats, fast, ref_best_rd, NULL);
     const int mi_width = block_size_wide[plane_bsize] >> tx_size_wide_log2[0];
     if (RDCOST(x->rdmult, rd_stats->rate, rd_stats->dist) >=
             RDCOST(x->rdmult, zero_blk_rate, rd_stats->sse) ||
@@ -4490,8 +4489,8 @@
 
   ENTROPY_CONTEXT *ta = above_ctx + blk_col;
   ENTROPY_CONTEXT *tl = left_ctx + blk_row;
-  av1_tx_block_rd_b(cpi, x, tx_size, blk_row, blk_col, plane, block,
-                    plane_bsize, ta, tl, rd_stats, fast, INT64_MAX, NULL);
+  tx_block_rd_b(cpi, x, tx_size, blk_row, blk_col, plane, block, plane_bsize,
+                ta, tl, rd_stats, fast, INT64_MAX, NULL);
   av1_set_txb_context(x, plane, block, tx_size, ta, tl);
 }