commit 94ea1aa6aef0067302d78b195942b270064a693c
author Jingning Han <jingning@google.com> Tue Nov 08 12:10:46 2016 -0800
committer Jingning Han <jingning@google.com> Tue Nov 08 23:42:26 2016 +0000
tree d2b55f69e176b2d1bd59d67a4b368bf386562219
parent 7c2b7f2534227795933e9582be0f72e37603bc2c

Clean up encode_superblock()

Replace repeated is_inter_block() check with a constant is_inter
variable.

Change-Id: I1215f72d5fcbf167cf5252333e7d9fbe5c9ff808

av1/encoder/encodeframe.c

diff --git a/av1/encoder/encodeframe.c b/av1/encoder/encodeframe.c
index baf61e9..73283f6 100644
--- a/av1/encoder/encodeframe.c
+++ b/av1/encoder/encodeframe.c
@@ -5254,6 +5254,7 @@
   const int mis = cm->mi_stride;
   const int mi_width = num_8x8_blocks_wide_lookup[bsize];
   const int mi_height = num_8x8_blocks_high_lookup[bsize];
+  const int is_inter = is_inter_block(mbmi);
 
   x->use_lp32x32fdct = cpi->sf.use_lp32x32fdct;
 
@@ -5262,7 +5263,7 @@
   x->pvq_coded = !dry_run ? 1 : 0;
 #endif
 
-  if (!is_inter_block(mbmi)) {
+  if (!is_inter) {
     int plane;
     mbmi->skip = 1;
     for (plane = 0; plane < MAX_MB_PLANE; ++plane)
@@ -5365,7 +5366,6 @@
   }
 
   if (!dry_run) {
-    const int is_inter = is_inter_block(mbmi);
 #if CONFIG_VAR_TX
     TX_SIZE tx_size =
         is_inter && !mbmi->skip ? mbmi->min_tx_size : mbmi->tx_size;
@@ -5373,7 +5373,7 @@
     TX_SIZE tx_size = mbmi->tx_size;
 #endif
     if (cm->tx_mode == TX_MODE_SELECT && mbmi->sb_type >= BLOCK_8X8 &&
-        !(is_inter_block(mbmi) && (mbmi->skip || seg_skip))) {
+        !(is_inter && (mbmi->skip || seg_skip))) {
       const int tx_size_ctx = get_tx_size_context(xd);
       const int tx_size_cat = is_inter ? inter_tx_size_cat_lookup[bsize]
                                        : intra_tx_size_cat_lookup[bsize];
@@ -5406,7 +5406,7 @@
       int i, j;
       TX_SIZE intra_tx_size;
       // The new intra coding scheme requires no change of transform size
-      if (is_inter_block(&mi->mbmi)) {
+      if (is_inter) {
         if (xd->lossless[mbmi->segment_id]) {
           intra_tx_size = TX_4X4;
         } else {
@@ -5435,12 +5435,12 @@
     ++td->counts
           ->tx_size_totals[txsize_sqr_map[get_uv_tx_size(mbmi, &xd->plane[1])]];
 #if CONFIG_EXT_TX
-    if (get_ext_tx_types(tx_size, bsize, is_inter_block(mbmi)) > 1 &&
-        cm->base_qindex > 0 && !mbmi->skip &&
+    if (get_ext_tx_types(tx_size, bsize, is_inter) > 1 && cm->base_qindex > 0 &&
+        !mbmi->skip &&
         !segfeature_active(&cm->seg, mbmi->segment_id, SEG_LVL_SKIP)) {
-      int eset = get_ext_tx_set(tx_size, bsize, is_inter_block(mbmi));
+      int eset = get_ext_tx_set(tx_size, bsize, is_inter);
       if (eset > 0) {
-        if (is_inter_block(mbmi)) {
+        if (is_inter) {
           ++td->counts->inter_ext_tx[eset][txsize_sqr_map[tx_size]]
                                     [mbmi->tx_type];
         } else {
@@ -5451,7 +5451,7 @@
 #else
     if (tx_size < TX_32X32 && cm->base_qindex > 0 && !mbmi->skip &&
         !segfeature_active(&cm->seg, mbmi->segment_id, SEG_LVL_SKIP)) {
-      if (is_inter_block(mbmi)) {
+      if (is_inter) {
         ++td->counts->inter_ext_tx[tx_size][mbmi->tx_type];
       } else {
         ++td->counts->intra_ext_tx[tx_size]
@@ -5463,8 +5463,8 @@
   }
 
 #if CONFIG_VAR_TX
-  if (cm->tx_mode == TX_MODE_SELECT && mbmi->sb_type >= BLOCK_8X8 &&
-      is_inter_block(mbmi) && !(mbmi->skip || seg_skip)) {
+  if (cm->tx_mode == TX_MODE_SELECT && mbmi->sb_type >= BLOCK_8X8 && is_inter &&
+      !(mbmi->skip || seg_skip)) {
 #if CONFIG_EXT_TX && CONFIG_RECT_TX
     if (is_rect_tx(mbmi->tx_size)) {
       set_txfm_ctxs(mbmi->tx_size, xd->n8_w, xd->n8_h, xd);
@@ -5477,7 +5477,7 @@
   } else {
     TX_SIZE tx_size = mbmi->tx_size;
     // The new intra coding scheme requires no change of transform size
-    if (is_inter_block(mbmi))
+    if (is_inter)
 #if CONFIG_EXT_TX && CONFIG_RECT_TX
     {
       tx_size = AOMMIN(tx_mode_to_biggest_tx_size[cm->tx_mode],