commit 6062a8bfee3ee0e2f104b51cb8a36b7bab7c56b4
author Angie Chiang <angiebird@google.com> Wed Sep 21 16:01:04 2016 -0700
committer Angie Chiang <angiebird@google.com> Thu Sep 22 09:37:56 2016 -0700
tree 2c1b8edf86ab2d04ff6573206bd7547672a37933
parent 7a9ad9c83f7a1f562bc464e88b640901631c4aa1

bitstream_debug: build related cleanup

Move experimental config from debug_util.c/h to aom_util.mk to avoid
empty object.

Change-Id: Id7978ed6a342262bddaa4df8b53115e750fa1c2c

aom_util/aom_util.mk

diff --git a/aom_util/aom_util.mk b/aom_util/aom_util.mk
index d79acdb..fcf0d70 100644
--- a/aom_util/aom_util.mk
+++ b/aom_util/aom_util.mk
@@ -12,6 +12,6 @@
 UTIL_SRCS-yes += aom_util.mk
 UTIL_SRCS-yes += aom_thread.c
 UTIL_SRCS-yes += aom_thread.h
-UTIL_SRCS-yes += debug_util.c
-UTIL_SRCS-yes += debug_util.h
+UTIL_SRCS-$(CONFIG_BITSTREAM_DEBUG) += debug_util.c
+UTIL_SRCS-$(CONFIG_BITSTREAM_DEBUG) += debug_util.h
 UTIL_SRCS-yes += endian_inl.h

aom_util/debug_util.c

diff --git a/aom_util/debug_util.c b/aom_util/debug_util.c
index ca666a1..0385df7 100644
--- a/aom_util/debug_util.c
+++ b/aom_util/debug_util.c
@@ -8,10 +8,10 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "aom_util/debug_util.h"
 #include <assert.h>
 #include <stdio.h>
-#if CONFIG_BITSTREAM_DEBUG
+#include "aom_util/debug_util.h"
+
 #define QUEUE_MAX_SIZE 2000000
 static int result_queue[QUEUE_MAX_SIZE];
 static int prob_queue[QUEUE_MAX_SIZE];
@@ -27,11 +27,11 @@
 
 void bitstream_queue_set_frame_write(int frame_idx) { frame_idx_w = frame_idx; }
 
-int bitstream_queue_get_frame_write() { return frame_idx_w; }
+int bitstream_queue_get_frame_write(void) { return frame_idx_w; }
 
 void bitstream_queue_set_frame_read(int frame_idx) { frame_idx_r = frame_idx; }
 
-int bitstream_queue_get_frame_read() { return frame_idx_r; }
+int bitstream_queue_get_frame_read(void) { return frame_idx_r; }
 
 void bitstream_queue_set_skip_write(int skip) { skip_w = skip; }
 
@@ -68,4 +68,3 @@
     }
   }
 }
-#endif  // CONFIG_BITSTREAM_DEBUG

aom_util/debug_util.h

diff --git a/aom_util/debug_util.h b/aom_util/debug_util.h
index 5cad87c..7c2299a 100644
--- a/aom_util/debug_util.h
+++ b/aom_util/debug_util.h
@@ -17,7 +17,6 @@
 extern "C" {
 #endif
 
-#if CONFIG_BITSTREAM_DEBUG
 /* This is a debug tool used to detect bitstream error. On encoder side, it
  * pushes each bit and probability into a queue before the bit is written into
  * the Arithmetic coder. On decoder side, whenever a bit is read out from the
@@ -35,10 +34,9 @@
 void bitstream_queue_set_skip_write(int skip);
 void bitstream_queue_set_skip_read(int skip);
 void bitstream_queue_set_frame_write(int frame_idx);
-int bitstream_queue_get_frame_write();
+int bitstream_queue_get_frame_write(void);
 void bitstream_queue_set_frame_read(int frame_idx);
-int bitstream_queue_get_frame_read();
-#endif  // CONFIG_BITSTREAM_DEBUG
+int bitstream_queue_get_frame_read(void);
 
 #ifdef __cplusplus
 }  // extern "C"