commit 5bb3a74a4ba07301df89a36a6c7fa279b190ea78
author Nathan E. Egge <negge@mozilla.com> Fri Jun 30 12:47:43 2017 -0400
committer Nathan Egge <negge@mozilla.com> Wed Jul 05 14:45:35 2017 +0000
tree 08f8251833533e4d644a140f337339923f1a55c7
parent 788ed89fd89bd5078a142b067f7e48ae90593d90

Remove the symbol counts for intra with EC_ADAPT.

This commit has no change to metrics.

Change-Id: I363f18698117dc9c3de10e3ae46cbc5a6ce840d0

av1/decoder/decodeframe.c

diff --git a/av1/decoder/decodeframe.c b/av1/decoder/decodeframe.c
index af02780..349f9fa 100644
--- a/av1/decoder/decodeframe.c
+++ b/av1/decoder/decodeframe.c
@@ -5225,10 +5225,12 @@
   av1_zero(zero_counts);
   assert(cm->refresh_frame_context != REFRESH_FRAME_CONTEXT_BACKWARD ||
          cm->error_resilient_mode);
+#if !CONFIG_EC_ADAPT || CONFIG_ENTROPY_STATS
   assert(!memcmp(cm->counts.y_mode, zero_counts.y_mode,
                  sizeof(cm->counts.y_mode)));
   assert(!memcmp(cm->counts.uv_mode, zero_counts.uv_mode,
                  sizeof(cm->counts.uv_mode)));
+#endif
   assert(!memcmp(cm->counts.partition, zero_counts.partition,
                  sizeof(cm->counts.partition)));
   assert(!memcmp(cm->counts.coef, zero_counts.coef, sizeof(cm->counts.coef)));

av1/decoder/decodemv.c

diff --git a/av1/decoder/decodemv.c b/av1/decoder/decodemv.c
index 7139887..0de16c7 100644
--- a/av1/decoder/decodemv.c
+++ b/av1/decoder/decodemv.c
@@ -145,8 +145,13 @@
                                          aom_reader *r, int size_group) {
   const PREDICTION_MODE y_mode =
       read_intra_mode(r, ec_ctx->y_mode_cdf[size_group]);
+#if !CONFIG_EC_ADAPT || CONFIG_ENTROPY_STATS
   FRAME_COUNTS *counts = xd->counts;
   if (counts) ++counts->y_mode[size_group][y_mode];
+#else
+  /* TODO(negge): Can we remove this parameter? */
+  (void)xd;
+#endif  // !CONFIG_EC_ADAPT || CONFIG_ENTROPY_STATS
   return y_mode;
 }
 
@@ -155,8 +160,13 @@
                                           PREDICTION_MODE y_mode) {
   const PREDICTION_MODE uv_mode =
       read_intra_mode(r, ec_ctx->uv_mode_cdf[y_mode]);
+#if !CONFIG_EC_ADAPT || CONFIG_ENTROPY_STATS
   FRAME_COUNTS *counts = xd->counts;
   if (counts) ++counts->uv_mode[y_mode][uv_mode];
+#else
+  /* TODO(negge): Can we remove this parameter? */
+  (void)xd;
+#endif  // !CONFIG_EC_ADAPT || CONFIG_ENTROPY_STATS
   return uv_mode;
 }