commit 0a2299b192fc50abced4b2ee7b38174a6618fefe
author Rupert Swarbrick <rupert.swarbrick@argondesign.com> Tue Oct 03 17:57:42 2017 +0100
committer Rupert Swarbrick <rupert.swarbrick@argondesign.com> Thu Oct 05 11:31:55 2017 +0000
tree a1e49f1efb1263aa3e4d2e5a153f066e2949b06f
parent 12d127e3253736ed1d05e414c19c2efe35eeb8b9

Fix delimiter matching in rd_pick_partition

This patch doesn't change the resulting code, but avoids having
duplicate opening parentheses in #if/#else/#endif branches that
confuse text editors.

Change-Id: I0833286173551c16fe9e54e515705307b3468704

av1/encoder/encodeframe.c

diff --git a/av1/encoder/encodeframe.c b/av1/encoder/encodeframe.c
index e9dcb4f..ee3f3d9 100644
--- a/av1/encoder/encodeframe.c
+++ b/av1/encoder/encodeframe.c
@@ -4219,11 +4219,12 @@
     abort_flag =
         (sum_rdc.rdcost >= best_rd && (bsize > BLOCK_8X8 || unify_bsize)) ||
         (sum_rdc.rate == INT_MAX && bsize == BLOCK_8X8);
-    if (sum_rdc.rdcost < INT64_MAX &&
+    const int64_t vert_max_rdcost = INT64_MAX;
 #else
-    if (sum_rdc.rdcost < best_rdc.rdcost &&
+    const int64_t vert_max_rdcost = best_rdc.rdcost;
 #endif  // CONFIG_SUPERTX
-        !force_vert_split && (bsize > BLOCK_8X8 || unify_bsize)) {
+    if (sum_rdc.rdcost < vert_max_rdcost && !force_vert_split &&
+        (bsize > BLOCK_8X8 || unify_bsize)) {
       update_state(cpi, td, &pc_tree->vertical[0], mi_row, mi_col, subsize, 1);
       encode_superblock(cpi, td, tp, DRY_RUN_NORMAL, mi_row, mi_col, subsize,
                         NULL);