commit 984b2327ad828e7ce16babdf69acf0088a79aa3c
author Nathan E. Egge <negge@mozilla.com> Fri Jan 06 19:58:51 2017 -0500
committer Nathan Egge <negge@mozilla.com> Tue Jan 10 00:30:32 2017 +0000
tree eaf3145eec6e6c81aaf2ce4215c52e5e4f3995f3
parent 994ccd7f152f7021b5e640d4e668f8c3f2b31f00

Replace OD_ACC_STR with __func__.

Replace the passed in bit accounting string from OD_ACCOUNTING with the
 current function name as ACCT_STR in preparation for the migration to
 CONFIG_ACCOUNTING.

Change-Id: Ib9946232b37cacfd88f6ff914b99e91c3d7b650e

av1/decoder/laplace_decoder.c

diff --git a/av1/decoder/laplace_decoder.c b/av1/decoder/laplace_decoder.c
index e9f4295..139d9bd 100644
--- a/av1/decoder/laplace_decoder.c
+++ b/av1/decoder/laplace_decoder.c
@@ -29,6 +29,8 @@
   aom_decode_pvq_split_(r, adapt, sum, ctx)
 #endif
 
+#define ACCT_STR __func__
+
 static int aom_decode_pvq_split_(aom_reader *r, od_pvq_codeword_ctx *adapt,
  int sum, int ctx OD_ACC_STR) {
   int shift;
@@ -41,8 +43,8 @@
   fctx = 7*ctx + (sum >> shift) - 1;
 #if CONFIG_DAALA_EC
   msbs = od_decode_cdf_adapt(&r->ec, adapt->pvq_split_cdf[fctx],
-   (sum >> shift) + 1, adapt->pvq_split_increment, acc_str);
-  if (shift) count = od_ec_dec_bits(&r->ec, shift, acc_str);
+   (sum >> shift) + 1, adapt->pvq_split_increment, ACCT_STR);
+  if (shift) count = od_ec_dec_bits(&r->ec, shift, ACCT_STR);
 #else
 # error "CONFIG_PVQ currently requires CONFIG_DAALA_EC."
 #endif
@@ -140,7 +142,7 @@
     ms -= 15;
   }
   while (sym >= 15 && ms != 0);
-  if (shift) pos = (xs << shift) + od_ec_dec_bits(dec, shift, acc_str);
+  if (shift) pos = (xs << shift) + od_ec_dec_bits(dec, shift, ACCT_STR);
   else pos = xs;
   OD_ASSERT(pos >> shift <= max >> shift || max == -1);
   if (max != -1 && pos > max) {