commit 1f7174f14e0318068286a5a275127a2c878241a9
author angiebird <angiebird@google.com> Sat Jun 27 16:23:16 2020 -0700
committer Angie Chiang <angiebird@google.com> Mon Jun 29 16:35:38 2020 +0000
tree 7941eecae9531167c5ddb2dccc20ce27c474b30c
parent 9399b7ee1a9f088360b5778f71b2682606a17c73

Use order_hint to set index of BITSTREAM_DEBUG

Change-Id: Ie6171b6bf28a7614fa6e6207f49968841d18dda3

av1/decoder/decodeframe.c

diff --git a/av1/decoder/decodeframe.c b/av1/decoder/decodeframe.c
index 98a4dc6..d4b2f14 100644
--- a/av1/decoder/decodeframe.c
+++ b/av1/decoder/decodeframe.c
@@ -5111,7 +5111,7 @@
   MACROBLOCKD *const xd = &pbi->dcb.xd;
 
 #if CONFIG_BITSTREAM_DEBUG
-  aom_bitstream_queue_set_frame_read(cm->current_frame.frame_number * 2 +
+  aom_bitstream_queue_set_frame_read(cm->current_frame.order_hint * 2 +
                                      cm->show_frame);
 #endif
 #if CONFIG_MISMATCH_DEBUG

av1/encoder/encoder.c

diff --git a/av1/encoder/encoder.c b/av1/encoder/encoder.c
index 17bfcfa..c0fd988 100644
--- a/av1/encoder/encoder.c
+++ b/av1/encoder/encoder.c
@@ -3279,7 +3279,7 @@
   assert(cpi->oxcf.max_threads <= 1 &&
          "bitstream debug tool does not support multithreading");
   bitstream_queue_record_write();
-  aom_bitstream_queue_set_frame_write(cm->current_frame.frame_number * 2 +
+  aom_bitstream_queue_set_frame_write(cm->current_frame.order_hint * 2 +
                                       cm->show_frame);
 #endif
   if (cpi->use_svc && cm->number_spatial_layers > 1) {