diff options
| author | Yaowu Xu <yaowu@google.com> | 2014-08-26 17:30:42 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2014-08-26 17:30:42 -0700 |
| commit | bcfb1ffb9defda3ea02a115226540b2dd3f8647d (patch) | |
| tree | 46b8878abb6fc6b38e586abcfefca92ebd9091eb /vp9/encoder/vp9_rdopt.c | |
| parent | 5b61172c27e4684e565f2580d608b16cae1423a5 (diff) | |
| parent | 1144fee3d509aa4cb6dffba04ea0abcc0f9cf909 (diff) | |
| download | libvpx-bcfb1ffb9defda3ea02a115226540b2dd3f8647d.tar libvpx-bcfb1ffb9defda3ea02a115226540b2dd3f8647d.tar.gz libvpx-bcfb1ffb9defda3ea02a115226540b2dd3f8647d.tar.bz2 libvpx-bcfb1ffb9defda3ea02a115226540b2dd3f8647d.zip | |
Merge "add a new interp filter search strategy."
Diffstat (limited to 'vp9/encoder/vp9_rdopt.c')
| -rw-r--r-- | vp9/encoder/vp9_rdopt.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/vp9/encoder/vp9_rdopt.c b/vp9/encoder/vp9_rdopt.c index e52620f81..5f1b0a515 100644 --- a/vp9/encoder/vp9_rdopt.c +++ b/vp9/encoder/vp9_rdopt.c @@ -2258,6 +2258,13 @@ static int64_t handle_inter_mode(VP9_COMP *cpi, MACROBLOCK *x, } else { int rate_sum = 0; int64_t dist_sum = 0; + if (i > 0 && cpi->sf.adaptive_interp_filter_search && + (cpi->sf.interp_filter_search_mask & (1 << i))) { + rate_sum = INT_MAX; + dist_sum = INT64_MAX; + continue; + } + if ((cm->interp_filter == SWITCHABLE && (!i || best_needs_copy)) || (cm->interp_filter != SWITCHABLE && |