summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJingning Han <jingning@google.com>2014-07-22 09:11:52 -0700
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>2014-07-22 09:11:52 -0700
commit97ccebac8f0052053a3832295f7a5f67c58c3773 (patch)
tree07027b0db935d984a17947397c2ca657073356b8
parent5926e7c0e8b3822e50b0a85ff7d59bc75b7ac4ee (diff)
parentffd948bbd527e7491d0e9f240251eb3f86fd7aa4 (diff)
downloadlibvpx-97ccebac8f0052053a3832295f7a5f67c58c3773.tar
libvpx-97ccebac8f0052053a3832295f7a5f67c58c3773.tar.gz
libvpx-97ccebac8f0052053a3832295f7a5f67c58c3773.tar.bz2
libvpx-97ccebac8f0052053a3832295f7a5f67c58c3773.zip
Merge "Turn on adaptive pred filter scheme for sub8x8 below 720p"
-rw-r--r--vp9/encoder/vp9_speed_features.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/vp9/encoder/vp9_speed_features.c b/vp9/encoder/vp9_speed_features.c
index e3951d532..8fb4aa566 100644
--- a/vp9/encoder/vp9_speed_features.c
+++ b/vp9/encoder/vp9_speed_features.c
@@ -88,13 +88,13 @@ static void set_good_speed_feature(VP9_COMP *cpi, VP9_COMMON *cm,
sf->last_partitioning_redo_frequency = 3;
sf->disable_split_mask = cm->show_frame ? DISABLE_ALL_SPLIT
: DISABLE_ALL_INTER_SPLIT;
+ sf->adaptive_pred_interp_filter = 0;
} else {
sf->disable_split_mask = LAST_AND_INTRA_SPLIT_ONLY;
sf->last_partitioning_redo_frequency = 2;
sf->lf_motion_threshold = NO_MOTION_THRESHOLD;
}
- sf->adaptive_pred_interp_filter = 0;
sf->reference_masking = 1;
sf->mode_search_skip_flags = FLAG_SKIP_INTRA_DIRMISMATCH |
FLAG_SKIP_INTRA_BESTINTER |
@@ -115,6 +115,8 @@ static void set_good_speed_feature(VP9_COMP *cpi, VP9_COMMON *cm,
else
sf->disable_split_mask = DISABLE_ALL_INTER_SPLIT;
+ sf->adaptive_pred_interp_filter = 0;
+
sf->lf_motion_threshold = LOW_MOTION_THRESHOLD;
sf->last_partitioning_redo_frequency = 3;
sf->recode_loop = ALLOW_RECODE_KFMAXBW;