commit b2a414acc4ba956fcce92299c384aea18f3985f1
author sdeng <sdeng@google.com> Thu Jun 13 15:46:13 2019 -0700
committer Hui Su <huisu@google.com> Thu Jun 13 23:41:47 2019 +0000
tree 19816259395ae838c39ee86eb5164ecd6a5379dd
parent fdc35f2a8ca134c8a84c8e0e071566168dacd0f2

Fix build after rebasing rdcost refactoring CLs

Change-Id: I359da2b5e15ad4e3f0fc8cb78c87876cad622f46

av1/encoder/encodeframe.c

diff --git a/av1/encoder/encodeframe.c b/av1/encoder/encodeframe.c
index b5deea8..361ea7a 100644
--- a/av1/encoder/encodeframe.c
+++ b/av1/encoder/encodeframe.c
@@ -2013,14 +2013,15 @@
       break;
     case PARTITION_VERT:
       pick_sb_modes(cpi, tile_data, x, mi_row, mi_col, &dummy_cost,
-                    PARTITION_VERT, subsize, &pc_tree->vertical[0], INT64_MAX,
+                    PARTITION_VERT, subsize, &pc_tree->vertical[0], dummy_cost,
                     sf->use_fast_nonrd_pick_mode ? PICK_MODE_FAST_NONRD
                                                  : PICK_MODE_NONRD);
       encode_b(cpi, tile_data, td, tp, mi_row, mi_col, 0, subsize,
                PARTITION_VERT, &pc_tree->vertical[0], NULL);
       if (mi_col + hbs < cm->mi_cols && bsize > BLOCK_8X8) {
         pick_sb_modes(cpi, tile_data, x, mi_row, mi_col + hbs, &dummy_cost,
-                      PARTITION_VERT, subsize, &pc_tree->vertical[1], INT64_MAX,
+                      PARTITION_VERT, subsize, &pc_tree->vertical[1],
+                      dummy_cost,
                       sf->use_fast_nonrd_pick_mode ? PICK_MODE_FAST_NONRD
                                                    : PICK_MODE_NONRD);
         encode_b(cpi, tile_data, td, tp, mi_row, mi_col + hbs, 0, subsize,
@@ -2029,7 +2030,8 @@
       break;
     case PARTITION_HORZ:
       pick_sb_modes(cpi, tile_data, x, mi_row, mi_col, &dummy_cost,
-                    PARTITION_HORZ, subsize, &pc_tree->horizontal[0], INT64_MAX,
+                    PARTITION_HORZ, subsize, &pc_tree->horizontal[0],
+                    dummy_cost,
                     sf->use_fast_nonrd_pick_mode ? PICK_MODE_FAST_NONRD
                                                  : PICK_MODE_NONRD);
       encode_b(cpi, tile_data, td, tp, mi_row, mi_col, 0, subsize,
@@ -2038,7 +2040,7 @@
       if (mi_row + hbs < cm->mi_rows && bsize > BLOCK_8X8) {
         pick_sb_modes(cpi, tile_data, x, mi_row + hbs, mi_col, &dummy_cost,
                       PARTITION_HORZ, subsize, &pc_tree->horizontal[1],
-                      INT64_MAX,
+                      dummy_cost,
                       sf->use_fast_nonrd_pick_mode ? PICK_MODE_FAST_NONRD
                                                    : PICK_MODE_NONRD);
         encode_b(cpi, tile_data, td, tp, mi_row + hbs, mi_col, 0, subsize,