commit c81f7b4de93eef6eed0de1c7f992ab8084a867bc
author chiyotsai <chiyotsai@google.com> Fri Aug 03 14:19:04 2018 -0700
committer Urvang Joshi <urvang@google.com> Mon Aug 06 17:55:25 2018 +0000
tree 4de2552a565eddb608e5580ea26ac0ac8bd585b8
parent 54c71f02c4ebbc6dfba9bec926a632c8906446ca

Remove repeated code in encode_rd_sb_row

BUG=aomedia:2044

Change-Id: Ief4e779c27724711c544d28e879bce37ef056c19

av1/encoder/encodeframe.c

diff --git a/av1/encoder/encodeframe.c b/av1/encoder/encodeframe.c
index 095eb92..67a36f7 100644
--- a/av1/encoder/encodeframe.c
+++ b/av1/encoder/encodeframe.c
@@ -4240,6 +4240,7 @@
       reset_partition(pc_root, cm->seq_params.sb_size);
       x->use_cb_search_range = 0;
       init_first_partition_pass_stats_tables(x->first_partition_pass_stats);
+      // Do the first pass if we need two pass partition search
       if (cpi->sf.two_pass_partition_search &&
           cpi->sf.use_square_partition_only_threshold > BLOCK_4X4 &&
           mi_row + mi_size_high[cm->seq_params.sb_size] < cm->mi_rows &&
@@ -4300,15 +4301,11 @@
             }
           }
         }
-
-        rd_pick_partition(cpi, td, tile_data, tp, mi_row, mi_col,
-                          cm->seq_params.sb_size, &dummy_rdc, INT64_MAX,
-                          pc_root, NULL);
-      } else {
-        rd_pick_partition(cpi, td, tile_data, tp, mi_row, mi_col,
-                          cm->seq_params.sb_size, &dummy_rdc, INT64_MAX,
-                          pc_root, NULL);
       }
+
+      rd_pick_partition(cpi, td, tile_data, tp, mi_row, mi_col,
+                        cm->seq_params.sb_size, &dummy_rdc, INT64_MAX, pc_root,
+                        NULL);
     }
 #if CONFIG_COLLECT_INTER_MODE_RD_STATS
     // TODO(angiebird): Let inter_mode_rd_model_estimation support multi-tile.