commit c24351c018fe00c2494e486641032262e7929de1
author Yushin Cho <ycho@mozilla.com> Tue Oct 24 14:59:08 2017 -0700
committer Yushin Cho <ycho@mozilla.com> Wed Oct 25 23:28:15 2017 +0000
tree 9ecd8ea04a104d99cc6704b7099f44478095a8d8
parent efc55fd9a48361d71966274ac89cefb9aab4674f

Add delta_q support to inspector

Change-Id: Idfc8ebee2325ab51d962efa5846d54db3e139c23

av1/decoder/decodemv.c

diff --git a/av1/decoder/decodemv.c b/av1/decoder/decodemv.c
index e9164ef..361297d 100644
--- a/av1/decoder/decodemv.c
+++ b/av1/decoder/decodemv.c
@@ -1206,6 +1206,8 @@
 #endif
   }
 
+  mbmi->current_q_index = xd->current_qindex;
+
   mbmi->ref_frame[0] = INTRA_FRAME;
   mbmi->ref_frame[1] = NONE_FRAME;
 
@@ -2710,6 +2712,8 @@
 #endif
   }
 
+  mbmi->current_q_index = xd->current_qindex;
+
   inter_block = read_is_inter_block(cm, xd, mbmi->segment_id, r);
 
   xd->above_txfm_context =

av1/decoder/inspection.c

diff --git a/av1/decoder/inspection.c b/av1/decoder/inspection.c
index 96a9321..56e0c28 100644
--- a/av1/decoder/inspection.c
+++ b/av1/decoder/inspection.c
@@ -50,6 +50,8 @@
   fd->base_qindex = cm->base_qindex;
   fd->tile_mi_cols = cm->tile_width;
   fd->tile_mi_rows = cm->tile_height;
+  fd->delta_q_present_flag = cm->delta_q_present_flag;
+  fd->delta_q_res = cm->delta_q_res;
 #if CONFIG_ACCOUNTING
   fd->accounting = &pbi->accounting;
 #endif
@@ -117,6 +119,8 @@
         mi->cfl_alpha_sign = 0;
       }
 #endif
+      // delta_q
+      mi->current_qindex = mbmi->current_q_index;
     }
   }
   return 1;

av1/decoder/inspection.h

diff --git a/av1/decoder/inspection.h b/av1/decoder/inspection.h
index 67ddad7..bd9d87a 100644
--- a/av1/decoder/inspection.h
+++ b/av1/decoder/inspection.h
@@ -35,28 +35,29 @@
 
 struct insp_mi_data {
   insp_mv mv[2];
-  int8_t ref_frame[2];
-  int8_t mode;
-  int8_t uv_mode;
-  int8_t sb_type;
-  int8_t skip;
-  int8_t segment_id;
+  int16_t ref_frame[2];
+  int16_t mode;
+  int16_t uv_mode;
+  int16_t sb_type;
+  int16_t skip;
+  int16_t segment_id;
 #if CONFIG_DUAL_FILTER
-  int8_t dual_filter_type;
-  int8_t filter[2];
+  int16_t dual_filter_type;
+  int16_t filter[2];
 #else
-  int8_t filter;
+  int16_t filter;
 #endif
-  int8_t tx_type;
-  int8_t tx_size;
+  int16_t tx_type;
+  int16_t tx_size;
 #if CONFIG_CDEF
-  int8_t cdef_level;
-  int8_t cdef_strength;
+  int16_t cdef_level;
+  int16_t cdef_strength;
 #endif
 #if CONFIG_CFL
-  int8_t cfl_alpha_idx;
-  int8_t cfl_alpha_sign;
+  int16_t cfl_alpha_idx;
+  int16_t cfl_alpha_sign;
 #endif
+  int16_t current_qindex;
 };
 
 typedef struct insp_frame_data insp_frame_data;
@@ -78,6 +79,8 @@
 #if CONFIG_CDEF
 // TODO(negge): add per frame CDEF data
 #endif
+  int delta_q_present_flag;
+  int delta_q_res;
 };
 
 void ifd_init(insp_frame_data *fd, int frame_width, int frame_height);