commit 1904379544c0cbed8d6c639ef9c7211f4f186f36
author Nathan E. Egge <negge@mozilla.com> Mon Jul 25 10:23:33 2016 -0400
committer Nathan E. Egge <negge@mozilla.com> Fri Jul 29 06:56:52 2016 -0400
tree 829ca22c913b1288041550404b8ee25bdcf4d533
parent de89c69dbf9cead032dd353b653600cc8ff4c896

Rename aom_write_tree_cdf() to aom_write_symbol().

Change-Id: I7c088c55f1c461063976d5bd84ff2026c4f3bc69

aom_dsp/bitwriter.h

diff --git a/aom_dsp/bitwriter.h b/aom_dsp/bitwriter.h
index d3b334e..6103ddd 100644
--- a/aom_dsp/bitwriter.h
+++ b/aom_dsp/bitwriter.h
@@ -98,8 +98,8 @@
 #endif
 }
 
-static INLINE void aom_write_tree_cdf(aom_writer *w, int symb,
-                                      const uint16_t *cdf, int nsymbs) {
+static INLINE void aom_write_symbol(aom_writer *w, int symb,
+                                    const uint16_t *cdf, int nsymbs) {
 #if CONFIG_RANS
   (void)nsymbs;
   struct rans_sym s;
@@ -108,7 +108,7 @@
   s.prob = cdf[symb + 1] - s.cum_prob;
   buf_rans_write(w, &s);
 #elif CONFIG_DAALA_EC
-  daala_write_tree_cdf(w, symb, cdf, nsymbs);
+  daala_write_symbol(w, symb, cdf, nsymbs);
 #else
   (void)w;
   (void)symb;

aom_dsp/daalaboolwriter.h

diff --git a/aom_dsp/daalaboolwriter.h b/aom_dsp/daalaboolwriter.h
index c71b12e..c80cd4f 100644
--- a/aom_dsp/daalaboolwriter.h
+++ b/aom_dsp/daalaboolwriter.h
@@ -78,8 +78,8 @@
   } while (len);
 }
 
-static INLINE void daala_write_tree_cdf(daala_writer *w, int symb,
-                                        const uint16_t *cdf, int nsymbs) {
+static INLINE void daala_write_symbol(daala_writer *w, int symb,
+                                      const uint16_t *cdf, int nsymbs) {
   od_ec_encode_cdf_q15(&w->ec, symb, cdf, nsymbs);
 }
 

av1/encoder/bitstream.c

diff --git a/av1/encoder/bitstream.c b/av1/encoder/bitstream.c
index f83a5a2..7aa2544 100644
--- a/av1/encoder/bitstream.c
+++ b/av1/encoder/bitstream.c
@@ -353,8 +353,8 @@
     if (token != EOB_TOKEN) {
       aom_write(w, token != ZERO_TOKEN, p->context_tree[1]);
       if (token != ZERO_TOKEN) {
-        aom_write_tree_cdf(w, token - ONE_TOKEN, *p->token_cdf,
-                           CATEGORY6_TOKEN - ONE_TOKEN + 1);
+        aom_write_symbol(w, token - ONE_TOKEN, *p->token_cdf,
+                         CATEGORY6_TOKEN - ONE_TOKEN + 1);
       }
     }
 #else
@@ -556,8 +556,8 @@
 #endif
     ctx = av1_get_pred_context_switchable_interp(xd);
 #if CONFIG_DAALA_EC
-    aom_write_tree_cdf(w, av1_switchable_interp_ind[mbmi->interp_filter],
-                       cm->fc->switchable_interp_cdf[ctx], SWITCHABLE_FILTERS);
+    aom_write_symbol(w, av1_switchable_interp_ind[mbmi->interp_filter],
+                     cm->fc->switchable_interp_cdf[ctx], SWITCHABLE_FILTERS);
 #else
     av1_write_token(w, av1_switchable_interp_tree,
                     cm->fc->switchable_interp_prob[ctx],
@@ -712,8 +712,8 @@
       !segfeature_active(&cm->seg, mbmi->segment_id, SEG_LVL_SKIP)) {
     if (is_inter) {
 #if CONFIG_DAALA_EC
-      aom_write_tree_cdf(w, av1_ext_tx_ind[mbmi->tx_type],
-                         cm->fc->inter_ext_tx_cdf[mbmi->tx_size], TX_TYPES);
+      aom_write_symbol(w, av1_ext_tx_ind[mbmi->tx_type],
+                       cm->fc->inter_ext_tx_cdf[mbmi->tx_size], TX_TYPES);
 #else
       av1_write_token(w, av1_ext_tx_tree,
                       cm->fc->inter_ext_tx_prob[mbmi->tx_size],
@@ -721,7 +721,7 @@
 #endif
     } else {
 #if CONFIG_DAALA_EC
-      aom_write_tree_cdf(
+      aom_write_symbol(
           w, av1_ext_tx_ind[mbmi->tx_type],
           cm->fc->intra_ext_tx_cdf[mbmi->tx_size]
                                   [intra_mode_to_tx_type_context[mbmi->mode]],
@@ -839,7 +839,7 @@
 
   if (has_rows && has_cols) {
 #if CONFIG_DAALA_EC
-    aom_write_tree_cdf(w, p, cm->fc->partition_cdf[ctx], PARTITION_TYPES);
+    aom_write_symbol(w, p, cm->fc->partition_cdf[ctx], PARTITION_TYPES);
 #else
     av1_write_token(w, av1_partition_tree, probs, &partition_encodings[p]);
 #endif