commit 76b8963150af8b04551aa5832aeb168e7090b747
author Alex Converse <aconverse@google.com> Mon Mar 20 11:47:12 2017 -0700
committer Alex Converse <aconverse@google.com> Mon Mar 20 13:52:08 2017 -0700
tree c9ed7fc4f553ba88a33ab3bbbb91a215c65a8ebe
parent 1dca126ca717fabb07df537fdfe723344a3562da

Disable OD_ASSERTS asserts when NDEBUG is set

Change-Id: I3d411ef4a6a1be5e7e644f210a5296dbe18807eb

av1/common/odintrin.h

diff --git a/av1/common/odintrin.h b/av1/common/odintrin.h
index 66962ad..439ac2d 100644
--- a/av1/common/odintrin.h
+++ b/av1/common/odintrin.h
@@ -69,7 +69,9 @@
 # define OD_DISABLE_CFL (1)
 # define OD_DISABLE_FILTER (1)
 
+#if !defined(NDEBUG)
 # define OD_ENABLE_ASSERTIONS (1)
+#endif
 
 # define OD_LOG(a)
 # define OD_LOG_PARTIAL(a)

av1/encoder/ratectrl_xiph.c

diff --git a/av1/encoder/ratectrl_xiph.c b/av1/encoder/ratectrl_xiph.c
index 9514a61..7f0bb30 100644
--- a/av1/encoder/ratectrl_xiph.c
+++ b/av1/encoder/ratectrl_xiph.c
@@ -675,6 +675,7 @@
         od_frame_type(rc, rc->cur_frame, &closed_form_golden,
                       &closed_form_altref, &closed_form_cur_frame);
     OD_UNUSED(closed_form_type);
+    OD_UNUSED(is_altref_frame);
     OD_ASSERT(closed_form_type == frame_type);
     OD_ASSERT(closed_form_cur_frame == rc->cur_frame);
     OD_ASSERT(closed_form_altref == is_altref_frame);

av1/encoder/rdopt.c

diff --git a/av1/encoder/rdopt.c b/av1/encoder/rdopt.c
index daee3c4..8eac058 100644
--- a/av1/encoder/rdopt.c
+++ b/av1/encoder/rdopt.c
@@ -493,6 +493,7 @@
 
   vardist = 0;
   OD_ASSERT(qm != OD_FLAT_QM);
+  (void)qm;
 #if 1
   min_var = INT_MAX;
   mean_var = 0;