Merge "Short circuit rate_block in block_rd_txfm."

8abd0c2a · Aℓex Converse · Gerrit Code Review · 4ac5058a · 73422d3b · 8abd0c2a
Commit 8abd0c2a authored Jul 31, 2015 by Aℓex Converse Committed by Gerrit Code Review Jul 31, 2015
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 0 deletions

vp9/encoder/vp9_rdopt.c vp9/encoder/vp9_rdopt.c +6 -0

No files found.
--- a/vp9/encoder/vp9_rdopt.c
+++ b/vp9/encoder/vp9_rdopt.c
@@ -554,6 +554,12 @@ static void block_rd_txfm(int plane, int block, BLOCK_SIZE plane_bsize,
 #endif  // CONFIG_VP9_HIGHBITDEPTH
  }

+  rd = RDCOST(x->rdmult, x->rddiv, 0, dist);
+  if (args->this_rd + rd > args->best_rd) {
+    args->exit_early = 1;
+    return;
+  }
+
  rate = rate_block(plane, block, plane_bsize, tx_size, args);
  rd1 = RDCOST(x->rdmult, x->rddiv, rate, dist);
  rd2 = RDCOST(x->rdmult, x->rddiv, 0, sse);