diff options
| author | Yaowu Xu <yaowu@google.com> | 2014-05-09 09:28:05 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2014-05-09 09:28:05 -0700 |
| commit | ff3baaef94cc8fb4548f95463ac9dc8bd662c436 (patch) | |
| tree | 424867f4d2e68359290314841a96dc97986cfa21 /vp9/encoder | |
| parent | 4aa76912252d272b8d0bfdc98ced68170c5111a0 (diff) | |
| parent | 4bb70ea13644cefda88cf8d8f24c5f33de7e5b54 (diff) | |
| download | libvpx-ff3baaef94cc8fb4548f95463ac9dc8bd662c436.tar libvpx-ff3baaef94cc8fb4548f95463ac9dc8bd662c436.tar.gz libvpx-ff3baaef94cc8fb4548f95463ac9dc8bd662c436.tar.bz2 libvpx-ff3baaef94cc8fb4548f95463ac9dc8bd662c436.zip | |
Merge "Skip testing large tx sizes when encoding lossless."
Diffstat (limited to 'vp9/encoder')
| -rw-r--r-- | vp9/encoder/vp9_rdopt.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/vp9/encoder/vp9_rdopt.c b/vp9/encoder/vp9_rdopt.c index f4def1eef..e15ac9455 100644 --- a/vp9/encoder/vp9_rdopt.c +++ b/vp9/encoder/vp9_rdopt.c @@ -961,7 +961,7 @@ static void inter_super_block_yrd(VP9_COMP *cpi, MACROBLOCK *x, int *rate, vp9_subtract_plane(x, bs, 0); - if (cpi->sf.tx_size_search_method == USE_LARGESTALL) { + if (cpi->sf.tx_size_search_method == USE_LARGESTALL || xd->lossless) { vpx_memset(txfm_cache, 0, TX_MODES * sizeof(int64_t)); choose_largest_txfm_size(cpi, x, rate, distortion, skip, sse, ref_best_rd, bs); @@ -999,7 +999,7 @@ static void intra_super_block_yrd(VP9_COMP *cpi, MACROBLOCK *x, int *rate, MB_MODE_INFO *const mbmi = &xd->mi[0]->mbmi; assert(bs == mbmi->sb_type); - if (cpi->sf.tx_size_search_method != USE_FULL_RD) { + if (cpi->sf.tx_size_search_method != USE_FULL_RD || xd->lossless) { vpx_memset(txfm_cache, 0, TX_MODES * sizeof(int64_t)); choose_largest_txfm_size(cpi, x, rate, distortion, skip, sse, ref_best_rd, bs); |