Rename aom_read_tree_cdf() to aom_read_symbol().
Change-Id: Ifc065eb3eee0960be2e085e7e18478bf91bf56dd
diff --git a/aom_dsp/bitreader.h b/aom_dsp/bitreader.h
index 70341f8..a021fe6 100644
--- a/aom_dsp/bitreader.h
+++ b/aom_dsp/bitreader.h
@@ -131,8 +131,8 @@
#endif
}
-static INLINE int aom_read_tree_cdf(aom_reader *r, const uint16_t *cdf,
- int nsymbs) {
+static INLINE int aom_read_symbol(aom_reader *r, const uint16_t *cdf,
+ int nsymbs) {
#if CONFIG_RANS
(void)nsymbs;
return rans_read(r, cdf);
diff --git a/av1/decoder/decodeframe.c b/av1/decoder/decodeframe.c
index b3a7ea4..ebe8fc4 100644
--- a/av1/decoder/decodeframe.c
+++ b/av1/decoder/decodeframe.c
@@ -599,8 +599,8 @@
if (has_rows && has_cols)
#if CONFIG_DAALA_EC
- p = (PARTITION_TYPE)aom_read_tree_cdf(r, cm->fc->partition_cdf[ctx],
- PARTITION_TYPES);
+ p = (PARTITION_TYPE)aom_read_symbol(r, cm->fc->partition_cdf[ctx],
+ PARTITION_TYPES);
#else
p = (PARTITION_TYPE)aom_read_tree(r, av1_partition_tree, probs);
#endif
diff --git a/av1/decoder/decodemv.c b/av1/decoder/decodemv.c
index b4c5a62..8bd19c2 100644
--- a/av1/decoder/decodemv.c
+++ b/av1/decoder/decodemv.c
@@ -596,7 +596,7 @@
const int ctx = av1_get_pred_context_switchable_interp(xd);
#if CONFIG_DAALA_EC
const InterpFilter type =
- (InterpFilter)av1_switchable_interp_inv[aom_read_tree_cdf(
+ (InterpFilter)av1_switchable_interp_inv[aom_read_symbol(
r, cm->fc->switchable_interp_cdf[ctx], SWITCHABLE_FILTERS)];
#else
const InterpFilter type = (InterpFilter)aom_read_tree(
@@ -972,7 +972,7 @@
FRAME_COUNTS *counts = xd->counts;
if (inter_block) {
#if CONFIG_DAALA_EC
- mbmi->tx_type = av1_ext_tx_inv[aom_read_tree_cdf(
+ mbmi->tx_type = av1_ext_tx_inv[aom_read_symbol(
r, cm->fc->inter_ext_tx_cdf[mbmi->tx_size], TX_TYPES)];
#else
mbmi->tx_type = aom_read_tree(r, av1_ext_tx_tree,
@@ -982,7 +982,7 @@
} else {
const TX_TYPE tx_type_nom = intra_mode_to_tx_type_context[mbmi->mode];
#if CONFIG_DAALA_EC
- mbmi->tx_type = av1_ext_tx_inv[aom_read_tree_cdf(
+ mbmi->tx_type = av1_ext_tx_inv[aom_read_symbol(
r, cm->fc->intra_ext_tx_cdf[mbmi->tx_size][tx_type_nom], TX_TYPES)];
#else
mbmi->tx_type =
diff --git a/av1/decoder/detokenize.c b/av1/decoder/detokenize.c
index 72752d9..c81c1e5 100644
--- a/av1/decoder/detokenize.c
+++ b/av1/decoder/detokenize.c
@@ -149,7 +149,7 @@
#if CONFIG_RANS
cdf = &coef_cdfs[band][ctx];
token =
- ONE_TOKEN + aom_read_tree_cdf(r, *cdf, CATEGORY6_TOKEN - ONE_TOKEN + 1);
+ ONE_TOKEN + aom_read_symbol(r, *cdf, CATEGORY6_TOKEN - ONE_TOKEN + 1);
INCREMENT_COUNT(ONE_TOKEN + (token > ONE_TOKEN));
switch (token) {
case ONE_TOKEN:
