commit ff70545fed69d2a4ad617a894a09ec9d6bafe012
author Jingning Han <jingning@google.com> Thu Apr 27 11:32:15 2017 -0700
committer Jingning Han <jingning@google.com> Fri Apr 28 15:12:04 2017 +0000
tree 9214b37b5b91b289af088ffaf4953224f5d223f4
parent e2db387a5b624e1bc4cbbeace5d3a5faba819a86

Rename get_tx_scale to av1_get_tx_scale

BUG=aomedia:443

Change-Id: Iebdb609564c2c3040f3902052afeeec7ae83412d

av1/encoder/encodemb.c

diff --git a/av1/encoder/encodemb.c b/av1/encoder/encodemb.c
index dbb7525..c450244 100644
--- a/av1/encoder/encodemb.c
+++ b/av1/encoder/encodemb.c
@@ -168,7 +168,7 @@
   const int16_t *const scan = scan_order->scan;
   const int16_t *const nb = scan_order->neighbors;
   int dqv;
-  const int shift = get_tx_scale(tx_size);
+  const int shift = av1_get_tx_scale(tx_size);
 #if CONFIG_AOM_QM
   int seg_id = xd->mi[0]->mbmi.segment_id;
   const qm_val_t *iqmatrix = pd->seg_iqmatrix[seg_id][!ref][tx_size];
@@ -528,7 +528,7 @@
   const int16_t *const scan = scan_order->scan;
   const int16_t *const nb = scan_order->neighbors;
   int dqv;
-  const int shift = get_tx_scale(tx_size);
+  const int shift = av1_get_tx_scale(tx_size);
 #if CONFIG_AOM_QM
   int seg_id = xd->mi[0]->mbmi.segment_id;
   const qm_val_t *iqmatrix = pd->seg_iqmatrix[seg_id][!ref][tx_size];
@@ -959,7 +959,7 @@
 
   src_diff =
       &p->src_diff[(blk_row * diff_stride + blk_col) << tx_size_wide_log2[0]];
-  qparam.log_scale = get_tx_scale(tx_size);
+  qparam.log_scale = av1_get_tx_scale(tx_size);
 #if CONFIG_NEW_QUANT
   qparam.tx_size = tx_size;
   qparam.dq = get_dq_profile_from_ctx(x->qindex, ctx, is_inter, plane_type);
@@ -1527,7 +1527,7 @@
   const int tx_blk_size = tx_size_wide[tx_size];
   daala_enc_ctx *daala_enc = &x->daala_enc;
   PVQ_SKIP_TYPE ac_dc_coded;
-  int coeff_shift = 3 - get_tx_scale(tx_size);
+  int coeff_shift = 3 - av1_get_tx_scale(tx_size);
   int hbd_downshift = 0;
   int rounding_mask;
   int pvq_dc_quant;