From: Marco Paniconi <marpan@google.com>
Date: Thu, 25 Apr 2019 23:12:19 +0000 (-0700)
Subject: vp9-rtc: Adjust thresh for 4x4 tx selection
X-Git-Tag: v1.8.1~91
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e50f4e4112a0e031dfc9df7a115fb0f8931bd4e1;p=libvpx

vp9-rtc: Adjust thresh for 4x4 tx selection

For screen content nonrd_pickmode: reduce
threshold to select 4x4 tx_size, under certain
conditions.

Change-Id: If68c30172272868033f0e3011e53c76b4e7c48b6
---

diff --git a/vp9/encoder/vp9_pickmode.c b/vp9/encoder/vp9_pickmode.c
index d4ffe54ba..b483489d3 100644
--- a/vp9/encoder/vp9_pickmode.c
+++ b/vp9/encoder/vp9_pickmode.c
@@ -370,7 +370,7 @@ static TX_SIZE calculate_tx_size(VP9_COMP *const cpi, BLOCK_SIZE bsize,
       tx_size = TX_16X16;
     // For screen-content force 4X4 tx_size over 8X8, for large variance.
     if (cpi->oxcf.content == VP9E_CONTENT_SCREEN && tx_size == TX_8X8 &&
-        bsize <= BLOCK_16X16 && var > (ac_thr << 6))
+        bsize <= BLOCK_16X16 && ((var >> 5) > (unsigned int)ac_thr))
       tx_size = TX_4X4;
   } else {
     tx_size = VPXMIN(max_txsize_lookup[bsize],