summaryrefslogtreecommitdiff
path: root/vp9/encoder
diff options
context:
space:
mode:
authorHui Su <huisu@google.com>2018-04-26 23:58:33 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2018-04-26 23:58:33 +0000
commita47376c52d5a6e6e10157b178f49f2ea553df899 (patch)
treef8241bb1376d187da193b8e87d1a1c4f620bb4de /vp9/encoder
parent0145b5ee67cefc3f9e53829528ad0724dc0eae11 (diff)
parente4dfacbf6c362aec84d2fdeb3de04d676b5ec176 (diff)
downloadlibvpx-a47376c52d5a6e6e10157b178f49f2ea553df899.tar
libvpx-a47376c52d5a6e6e10157b178f49f2ea553df899.tar.gz
libvpx-a47376c52d5a6e6e10157b178f49f2ea553df899.tar.bz2
libvpx-a47376c52d5a6e6e10157b178f49f2ea553df899.zip
Merge "Do one level less of transform search for large blocks"
Diffstat (limited to 'vp9/encoder')
-rw-r--r--vp9/encoder/vp9_rdopt.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/vp9/encoder/vp9_rdopt.c b/vp9/encoder/vp9_rdopt.c
index 1a9daec59..6ffe6ff2b 100644
--- a/vp9/encoder/vp9_rdopt.c
+++ b/vp9/encoder/vp9_rdopt.c
@@ -858,6 +858,7 @@ static void choose_tx_size_from_rd(VP9_COMP *cpi, MACROBLOCK *x, int *rate,
if (cm->tx_mode == TX_MODE_SELECT) {
start_tx = max_tx_size;
end_tx = VPXMAX(start_tx - cpi->sf.tx_size_search_depth, 0);
+ if (bs > BLOCK_32X32) end_tx = VPXMIN(end_tx + 1, start_tx);
} else {
TX_SIZE chosen_tx_size =
VPXMIN(max_tx_size, tx_mode_to_biggest_tx_size[cm->tx_mode]);