Rename get_tx_scale to av1_get_tx_scale
BUG=aomedia:443
Change-Id: Iebdb609564c2c3040f3902052afeeec7ae83412d
diff --git a/av1/common/idct.c b/av1/common/idct.c
index 0e0834c..9912d03 100644
--- a/av1/common/idct.c
+++ b/av1/common/idct.c
@@ -20,7 +20,7 @@
#include "av1/common/enums.h"
#include "av1/common/idct.h"
-int get_tx_scale(const TX_SIZE tx_size) {
+int av1_get_tx_scale(const TX_SIZE tx_size) {
if (txsize_sqr_up_map[tx_size] == TX_32X32) return 1;
#if CONFIG_TX64X64
else if (txsize_sqr_up_map[tx_size] == TX_64X64)
diff --git a/av1/common/idct.h b/av1/common/idct.h
index a0c421f..62cb035 100644
--- a/av1/common/idct.h
+++ b/av1/common/idct.h
@@ -54,7 +54,7 @@
#endif // CONFIG_HIGHBITDEPTH
#define MAX_TX_SCALE 1
-int get_tx_scale(const TX_SIZE tx_size);
+int av1_get_tx_scale(const TX_SIZE tx_size);
void av1_iwht4x4_add(const tran_low_t *input, uint8_t *dest, int stride,
int eob);
diff --git a/av1/decoder/decodeframe.c b/av1/decoder/decodeframe.c
index 45159ef..dad6ae6 100644
--- a/av1/decoder/decodeframe.c
+++ b/av1/decoder/decodeframe.c
@@ -350,7 +350,7 @@
int off;
const int is_keyframe = 0;
const int has_dc_skip = 1;
- int coeff_shift = 3 - get_tx_scale(bs);
+ int coeff_shift = 3 - av1_get_tx_scale(bs);
int hbd_downshift = 0;
int rounding_mask;
// DC quantizer for PVQ
diff --git a/av1/decoder/decodetxb.c b/av1/decoder/decodetxb.c
index 9d8af23..e1db097 100644
--- a/av1/decoder/decodetxb.c
+++ b/av1/decoder/decodetxb.c
@@ -55,7 +55,7 @@
int c = 0;
int update_eob = -1;
const int16_t *const dequant = xd->plane[plane].seg_dequant[mbmi->segment_id];
- const int shift = get_tx_scale(tx_size);
+ const int shift = av1_get_tx_scale(tx_size);
const int bwl = b_width_log2_lookup[txsize_to_bsize[tx_size]] + 2;
int cul_level = 0;
unsigned int(*nz_map_count)[SIG_COEF_CONTEXTS][2];
diff --git a/av1/decoder/detokenize.c b/av1/decoder/detokenize.c
index eefbe4b..d86ed62 100644
--- a/av1/decoder/detokenize.c
+++ b/av1/decoder/detokenize.c
@@ -137,7 +137,7 @@
#endif
}
- dq_shift = get_tx_scale(tx_size);
+ dq_shift = av1_get_tx_scale(tx_size);
#if CONFIG_NEW_TOKENSET
band = *band_translate++;
diff --git a/av1/encoder/av1_quantize.c b/av1/encoder/av1_quantize.c
index f4bdde9..6cffac2 100644
--- a/av1/encoder/av1_quantize.c
+++ b/av1/encoder/av1_quantize.c
@@ -206,7 +206,7 @@
const int rc = 0;
if (quantize_coeff_bigtx_nuq(coeff_ptr[rc], quant, quant_shift, dequant,
cuml_bins_ptr, dequant_val, qcoeff_ptr,
- dqcoeff_ptr, get_tx_scale(TX_32X32)))
+ dqcoeff_ptr, av1_get_tx_scale(TX_32X32)))
eob = 0;
}
*eob_ptr = eob + 1;
@@ -226,7 +226,7 @@
const int rc = 0;
if (quantize_coeff_bigtx_fp_nuq(coeff_ptr[rc], quant, dequant,
cuml_bins_ptr, dequant_val, qcoeff_ptr,
- dqcoeff_ptr, get_tx_scale(TX_32X32)))
+ dqcoeff_ptr, av1_get_tx_scale(TX_32X32)))
eob = 0;
}
*eob_ptr = eob + 1;
@@ -247,7 +247,7 @@
const int rc = 0;
if (quantize_coeff_bigtx_nuq(coeff_ptr[rc], quant, quant_shift, dequant,
cuml_bins_ptr, dequant_val, qcoeff_ptr,
- dqcoeff_ptr, get_tx_scale(TX_64X64)))
+ dqcoeff_ptr, av1_get_tx_scale(TX_64X64)))
eob = 0;
}
*eob_ptr = eob + 1;
@@ -267,7 +267,7 @@
const int rc = 0;
if (quantize_coeff_bigtx_fp_nuq(coeff_ptr[rc], quant, dequant,
cuml_bins_ptr, dequant_val, qcoeff_ptr,
- dqcoeff_ptr, get_tx_scale(TX_64X64)))
+ dqcoeff_ptr, av1_get_tx_scale(TX_64X64)))
eob = 0;
}
*eob_ptr = eob + 1;
@@ -340,11 +340,11 @@
int i;
for (i = 0; i < n_coeffs; i++) {
const int rc = scan[i];
- if (quantize_coeff_bigtx_nuq(coeff_ptr[rc], quant_ptr[rc != 0],
- quant_shift_ptr[rc != 0],
- dequant_ptr[rc != 0], cuml_bins_ptr[band[i]],
- dequant_val[band[i]], &qcoeff_ptr[rc],
- &dqcoeff_ptr[rc], get_tx_scale(TX_32X32)))
+ if (quantize_coeff_bigtx_nuq(
+ coeff_ptr[rc], quant_ptr[rc != 0], quant_shift_ptr[rc != 0],
+ dequant_ptr[rc != 0], cuml_bins_ptr[band[i]],
+ dequant_val[band[i]], &qcoeff_ptr[rc], &dqcoeff_ptr[rc],
+ av1_get_tx_scale(TX_32X32)))
eob = i;
}
}
@@ -369,7 +369,7 @@
if (quantize_coeff_bigtx_fp_nuq(
coeff_ptr[rc], quant_ptr[rc != 0], dequant_ptr[rc != 0],
cuml_bins_ptr[band[i]], dequant_val[band[i]], &qcoeff_ptr[rc],
- &dqcoeff_ptr[rc], get_tx_scale(TX_32X32)))
+ &dqcoeff_ptr[rc], av1_get_tx_scale(TX_32X32)))
eob = i;
}
}
@@ -393,11 +393,11 @@
int i;
for (i = 0; i < n_coeffs; i++) {
const int rc = scan[i];
- if (quantize_coeff_bigtx_nuq(coeff_ptr[rc], quant_ptr[rc != 0],
- quant_shift_ptr[rc != 0],
- dequant_ptr[rc != 0], cuml_bins_ptr[band[i]],
- dequant_val[band[i]], &qcoeff_ptr[rc],
- &dqcoeff_ptr[rc], get_tx_scale(TX_64X64)))
+ if (quantize_coeff_bigtx_nuq(
+ coeff_ptr[rc], quant_ptr[rc != 0], quant_shift_ptr[rc != 0],
+ dequant_ptr[rc != 0], cuml_bins_ptr[band[i]],
+ dequant_val[band[i]], &qcoeff_ptr[rc], &dqcoeff_ptr[rc],
+ av1_get_tx_scale(TX_64X64)))
eob = i;
}
}
@@ -422,7 +422,7 @@
if (quantize_coeff_bigtx_fp_nuq(
coeff_ptr[rc], quant_ptr[rc != 0], dequant_ptr[rc != 0],
cuml_bins_ptr[band[i]], dequant_val[band[i]], &qcoeff_ptr[rc],
- &dqcoeff_ptr[rc], get_tx_scale(TX_64X64)))
+ &dqcoeff_ptr[rc], av1_get_tx_scale(TX_64X64)))
eob = i;
}
}
@@ -1206,7 +1206,7 @@
coeff_ptr[rc], quant_ptr[rc != 0], quant_shift_ptr[rc != 0],
dequant_ptr[rc != 0], cuml_bins_ptr[band[i]],
dequant_val[band[i]], &qcoeff_ptr[rc], &dqcoeff_ptr[rc],
- get_tx_scale(TX_32X32)))
+ av1_get_tx_scale(TX_32X32)))
eob = i;
}
}
@@ -1232,7 +1232,7 @@
if (highbd_quantize_coeff_bigtx_fp_nuq(
coeff_ptr[rc], quant_ptr[rc != 0], dequant_ptr[rc != 0],
cuml_bins_ptr[band[i]], dequant_val[band[i]], &qcoeff_ptr[rc],
- &dqcoeff_ptr[rc], get_tx_scale(TX_32X32)))
+ &dqcoeff_ptr[rc], av1_get_tx_scale(TX_32X32)))
eob = i;
}
}
@@ -1260,7 +1260,7 @@
coeff_ptr[rc], quant_ptr[rc != 0], quant_shift_ptr[rc != 0],
dequant_ptr[rc != 0], cuml_bins_ptr[band[i]],
dequant_val[band[i]], &qcoeff_ptr[rc], &dqcoeff_ptr[rc],
- get_tx_scale(TX_64X64)))
+ av1_get_tx_scale(TX_64X64)))
eob = i;
}
}
@@ -1286,7 +1286,7 @@
if (highbd_quantize_coeff_bigtx_fp_nuq(
coeff_ptr[rc], quant_ptr[rc != 0], dequant_ptr[rc != 0],
cuml_bins_ptr[band[i]], dequant_val[band[i]], &qcoeff_ptr[rc],
- &dqcoeff_ptr[rc], get_tx_scale(TX_64X64)))
+ &dqcoeff_ptr[rc], av1_get_tx_scale(TX_64X64)))
eob = i;
}
}
@@ -1331,7 +1331,7 @@
const int rc = 0;
if (highbd_quantize_coeff_bigtx_nuq(
coeff_ptr[rc], quant, quant_shift, dequant, cuml_bins_ptr,
- dequant_val, qcoeff_ptr, dqcoeff_ptr, get_tx_scale(TX_32X32)))
+ dequant_val, qcoeff_ptr, dqcoeff_ptr, av1_get_tx_scale(TX_32X32)))
eob = 0;
}
*eob_ptr = eob + 1;
@@ -1349,7 +1349,7 @@
const int rc = 0;
if (highbd_quantize_coeff_bigtx_fp_nuq(
coeff_ptr[rc], quant, dequant, cuml_bins_ptr, dequant_val,
- qcoeff_ptr, dqcoeff_ptr, get_tx_scale(TX_32X32)))
+ qcoeff_ptr, dqcoeff_ptr, av1_get_tx_scale(TX_32X32)))
eob = 0;
}
*eob_ptr = eob + 1;
@@ -1368,7 +1368,7 @@
const int rc = 0;
if (highbd_quantize_coeff_bigtx_nuq(
coeff_ptr[rc], quant, quant_shift, dequant, cuml_bins_ptr,
- dequant_val, qcoeff_ptr, dqcoeff_ptr, get_tx_scale(TX_64X64)))
+ dequant_val, qcoeff_ptr, dqcoeff_ptr, av1_get_tx_scale(TX_64X64)))
eob = 0;
}
*eob_ptr = eob + 1;
@@ -1386,7 +1386,7 @@
const int rc = 0;
if (highbd_quantize_coeff_bigtx_fp_nuq(
coeff_ptr[rc], quant, dequant, cuml_bins_ptr, dequant_val,
- qcoeff_ptr, dqcoeff_ptr, get_tx_scale(TX_64X64)))
+ qcoeff_ptr, dqcoeff_ptr, av1_get_tx_scale(TX_64X64)))
eob = 0;
}
*eob_ptr = eob + 1;
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;
diff --git a/av1/encoder/rdopt.c b/av1/encoder/rdopt.c
index 58dacde..f02cf50 100644
--- a/av1/encoder/rdopt.c
+++ b/av1/encoder/rdopt.c
@@ -1348,7 +1348,7 @@
// not involve an inverse transform, but it is less accurate.
const int buffer_length = tx_size_2d[tx_size];
int64_t this_sse;
- int shift = (MAX_TX_SCALE - get_tx_scale(tx_size)) * 2;
+ int shift = (MAX_TX_SCALE - av1_get_tx_scale(tx_size)) * 2;
tran_low_t *const coeff = BLOCK_OFFSET(p->coeff, block);
tran_low_t *const dqcoeff = BLOCK_OFFSET(pd->dqcoeff, block);
#if CONFIG_PVQ
