commit b6e94d9f4b47c10d5f33420953f869024c1550f1
author Luc Trudeau <ltrudeau@mozilla.com> Mon Mar 13 15:46:15 2017 -0400
committer Luc Trudeau <ltrudeau@mozilla.com> Tue Mar 14 17:34:12 2017 +0000
tree 4ae6b1cab635f431a7a8aec2d9d92831592c17e8
parent 1f40e2212cfd7f6bfb75fb85f018c79628ede356

Uniform way of accessing mbmi in av1_xform_quant

Cosmetic change that moves the declaration of mbmi at the beginning of
the function.

Change-Id: I028c9ca3db57e769270fbad4f20261d5562be2f2

av1/encoder/encodemb.c

diff --git a/av1/encoder/encodemb.c b/av1/encoder/encodemb.c
index cdc752b..814ad74 100644
--- a/av1/encoder/encodemb.c
+++ b/av1/encoder/encodemb.c
@@ -496,6 +496,7 @@
                      TX_SIZE tx_size, int ctx,
                      AV1_XFORM_QUANT xform_quant_idx) {
   MACROBLOCKD *const xd = &x->e_mbd;
+  MB_MODE_INFO *const mbmi = &xd->mi[0]->mbmi;
 #if !(CONFIG_PVQ || CONFIG_DAALA_DIST)
   const struct macroblock_plane *const p = &x->plane[plane];
   const struct macroblockd_plane *const pd = &xd->plane[plane];
@@ -506,7 +507,7 @@
   PLANE_TYPE plane_type = get_plane_type(plane);
   const int block_raster_idx = av1_block_index_to_raster_order(tx_size, block);
   TX_TYPE tx_type = get_tx_type(plane_type, xd, block_raster_idx, tx_size);
-  const int is_inter = is_inter_block(&xd->mi[0]->mbmi);
+  const int is_inter = is_inter_block(mbmi);
   const SCAN_ORDER *const scan_order = get_scan(cm, tx_size, tx_type, is_inter);
   tran_low_t *const coeff = BLOCK_OFFSET(p->coeff, block);
   tran_low_t *const qcoeff = BLOCK_OFFSET(p->qcoeff, block);
@@ -514,7 +515,7 @@
   uint16_t *const eob = &p->eobs[block];
   const int diff_stride = block_size_wide[plane_bsize];
 #if CONFIG_AOM_QM
-  int seg_id = xd->mi[0]->mbmi.segment_id;
+  int seg_id = mbmi->segment_id;
   const qm_val_t *qmatrix = pd->seg_qmatrix[seg_id][!is_inter][tx_size];
   const qm_val_t *iqmatrix = pd->seg_iqmatrix[seg_id][!is_inter][tx_size];
 #endif
@@ -546,7 +547,6 @@
   qparam.iqmatrix = iqmatrix;
 #endif  // CONFIG_AOM_QM
 #else
-  MB_MODE_INFO *mbmi = &xd->mi[0]->mbmi;
   tran_low_t *ref_coeff = BLOCK_OFFSET(pd->pvq_ref_coeff, block);
   int skip = 1;
   PVQ_INFO *pvq_info = NULL;
@@ -592,7 +592,7 @@
 
   fwd_txfm_param.tx_type = tx_type;
   fwd_txfm_param.tx_size = tx_size;
-  fwd_txfm_param.lossless = xd->lossless[xd->mi[0]->mbmi.segment_id];
+  fwd_txfm_param.lossless = xd->lossless[mbmi->segment_id];
 
 #if CONFIG_AOM_HIGHBITDEPTH
   fwd_txfm_param.bd = xd->bd;