Move debug code into bitstream_queue_push()

Change-Id: I7eec5b88eaa212df0135f8234164ba481814f797

aom_dsp/bitwriter.h

diff --git a/aom_dsp/bitwriter.h b/aom_dsp/bitwriter.h
index 5b77577..4a750c0 100644
--- a/aom_dsp/bitwriter.h
+++ b/aom_dsp/bitwriter.h
@@ -68,14 +68,6 @@
   int p = (0x7FFFFF - (probability << 15) + probability) >> 8;
 #if CONFIG_BITSTREAM_DEBUG
   aom_cdf_prob cdf[2] = { (aom_cdf_prob)p, 32767 };
-  /*int queue_r = 0;
-  int frame_idx_r = 0;
-  int queue_w = bitstream_queue_get_write();
-  int frame_idx_w = aom_bitstream_queue_get_frame_write();
-  if (frame_idx_w == frame_idx_r && queue_w == queue_r) {
-    fprintf(stderr, "\n *** bitstream queue at frame_idx_w %d queue_w %d\n",
-    frame_idx_w, queue_w);
-  }*/
   bitstream_queue_push(bit, cdf, 2);
 #endif
 
@@ -95,14 +87,6 @@
 static INLINE void aom_write_cdf(aom_writer *w, int symb,
                                  const aom_cdf_prob *cdf, int nsymbs) {
 #if CONFIG_BITSTREAM_DEBUG
-  /*int queue_r = 0;
-  int frame_idx_r = 0;
-  int queue_w = bitstream_queue_get_write();
-  int frame_idx_w = aom_bitstream_queue_get_frame_write();
-  if (frame_idx_w == frame_idx_r && queue_w == queue_r) {
-    fprintf(stderr, "\n *** bitstream queue at frame_idx_w %d queue_w %d\n",
-    frame_idx_w, queue_w);
-  }*/
   bitstream_queue_push(symb, cdf, nsymbs);
 #endif
 

aom_util/debug_util.c

diff --git a/aom_util/debug_util.c b/aom_util/debug_util.c
index 86e058e..e57935e 100644
--- a/aom_util/debug_util.c
+++ b/aom_util/debug_util.c
@@ -68,6 +68,16 @@
 }
 
 void bitstream_queue_push(int result, const aom_cdf_prob *cdf, int nsymbs) {
+  // If you observe a cdf error, turn the following debug code on and
+  // set target_frame_idx_r and target_queue_r accordingly.
+  /*
+  int target_frame_idx_r = 1;
+  int target_queue_r = 18005;
+  if (frame_idx_w == target_frame_idx_r && queue_w == target_queue_r) {
+    fprintf(stderr, "\n *** bitstream queue at frame_idx_w %d queue_w %d\n",
+    frame_idx_w, queue_w);
+  }
+  */
   if (!skip_w) {
     result_queue[queue_w] = result;
     nsymbs_queue[queue_w] = nsymbs;