summaryrefslogtreecommitdiff
path: root/vp9/encoder/vp9_rdopt.c
diff options
context:
space:
mode:
authorHui Su <huisu@google.com>2018-04-25 16:25:40 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2018-04-25 16:25:40 +0000
commit6aca1d2d944bf0ac5810efd00e384847bd42eaee (patch)
tree8517f43a93ab43672925021be120aff57af712ee /vp9/encoder/vp9_rdopt.c
parent57755aad5bdebfd5da9b2b3fc35dde1a2ddfee10 (diff)
parent2eac6df788dbcfb8f9388f785e7b124765b252bc (diff)
downloadlibvpx-6aca1d2d944bf0ac5810efd00e384847bd42eaee.tar
libvpx-6aca1d2d944bf0ac5810efd00e384847bd42eaee.tar.gz
libvpx-6aca1d2d944bf0ac5810efd00e384847bd42eaee.tar.bz2
libvpx-6aca1d2d944bf0ac5810efd00e384847bd42eaee.zip
Merge "Add speed feture to control tx size search depth"
Diffstat (limited to 'vp9/encoder/vp9_rdopt.c')
-rw-r--r--vp9/encoder/vp9_rdopt.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/vp9/encoder/vp9_rdopt.c b/vp9/encoder/vp9_rdopt.c
index 39cd1d41c..39f3db37f 100644
--- a/vp9/encoder/vp9_rdopt.c
+++ b/vp9/encoder/vp9_rdopt.c
@@ -859,7 +859,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 = 0;
+ end_tx = VPXMAX(start_tx - cpi->sf.tx_size_search_depth, 0);
} else {
TX_SIZE chosen_tx_size =
VPXMIN(max_tx_size, tx_mode_to_biggest_tx_size[cm->tx_mode]);