summaryrefslogtreecommitdiff
path: root/vp9/encoder/vp9_pickmode.c
diff options
context:
space:
mode:
authorMarco Paniconi <marpan@google.com>2019-04-25 16:12:19 -0700
committerMarco Paniconi <marpan@google.com>2019-04-25 18:44:33 -0700
commite50f4e4112a0e031dfc9df7a115fb0f8931bd4e1 (patch)
treed9cc6b9dd4684d722573900b4069a56ff8e966c8 /vp9/encoder/vp9_pickmode.c
parentf836d8ba87dcba437228580fe65afe151ccf7659 (diff)
downloadlibvpx-e50f4e4112a0e031dfc9df7a115fb0f8931bd4e1.tar
libvpx-e50f4e4112a0e031dfc9df7a115fb0f8931bd4e1.tar.gz
libvpx-e50f4e4112a0e031dfc9df7a115fb0f8931bd4e1.tar.bz2
libvpx-e50f4e4112a0e031dfc9df7a115fb0f8931bd4e1.zip
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
Diffstat (limited to 'vp9/encoder/vp9_pickmode.c')
-rw-r--r--vp9/encoder/vp9_pickmode.c2
1 files changed, 1 insertions, 1 deletions
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],