shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "vp9: Fix condition for intra search in non-rd pickmode."

--- a/vp9/encoder/vp9_pickmode.c

+++ b/vp9/encoder/vp9_pickmode.c

@@ -1985,11 +1985,10 @@

     perform_intra_pred = 0;

   // Perform intra prediction search, if the best SAD is above a certain

   // threshold.

-  if ((!force_skip_low_temp_var || bsize < BLOCK_32X32) && perform_intra_pred &&

-      (best_rdc.rdcost == INT64_MAX ||

-       (!x->skip && best_rdc.rdcost > inter_mode_thresh &&

-        bsize <= cpi->sf.max_intra_bsize)) &&

-      !x->skip_low_source_sad) {

+  if (best_rdc.rdcost == INT64_MAX ||

+      ((!force_skip_low_temp_var || bsize < BLOCK_32X32) &&

+       perform_intra_pred && !x->skip && best_rdc.rdcost > inter_mode_thresh &&

+       bsize <= cpi->sf.max_intra_bsize && !x->skip_low_source_sad)) {

     struct estimate_block_intra_args args = { cpi, x, DC_PRED, 1, 0 };

     int i;

     TX_SIZE best_intra_tx_size = TX_SIZES;