diff options
| author | Yaowu Xu <yaowu@google.com> | 2014-02-04 18:20:57 -0800 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2014-02-04 18:20:57 -0800 |
| commit | 0dc535ecbb836a8ebe338a0c67fc0b323d51aca7 (patch) | |
| tree | 060466adb8ebf20a218ca0561e0585041ffad9d1 /vp9/encoder/vp9_onyx_if.c | |
| parent | 0c7e1a950c7066b338c162fc8d302eaefa6da686 (diff) | |
| parent | 084c49ac7968379e63494e94a53345ac991ee6f9 (diff) | |
| download | libvpx-0dc535ecbb836a8ebe338a0c67fc0b323d51aca7.tar libvpx-0dc535ecbb836a8ebe338a0c67fc0b323d51aca7.tar.gz libvpx-0dc535ecbb836a8ebe338a0c67fc0b323d51aca7.tar.bz2 libvpx-0dc535ecbb836a8ebe338a0c67fc0b323d51aca7.zip | |
Merge "Adjust speed feature for --rt"
Diffstat (limited to 'vp9/encoder/vp9_onyx_if.c')
| -rw-r--r-- | vp9/encoder/vp9_onyx_if.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/vp9/encoder/vp9_onyx_if.c b/vp9/encoder/vp9_onyx_if.c index 6e801c033..3cf8ddb8c 100644 --- a/vp9/encoder/vp9_onyx_if.c +++ b/vp9/encoder/vp9_onyx_if.c @@ -834,10 +834,12 @@ static void set_rt_speed_feature(VP9_COMMON *cm, } if (speed >= 4) { sf->optimize_coefficients = 0; + sf->disable_split_mask = DISABLE_ALL_SPLIT; + sf->use_fast_lpf_pick = 2; } if (speed >= 5) { int i; - sf->disable_split_mask = DISABLE_ALL_SPLIT; + sf->adaptive_rd_thresh = 5; sf->auto_min_max_partition_size = frame_is_intra_only(cm) ? RELAXED_NEIGHBORING_MIN_MAX : STRICT_NEIGHBORING_MIN_MAX; sf->subpel_force_stop = 1; @@ -845,7 +847,6 @@ static void set_rt_speed_feature(VP9_COMMON *cm, sf->intra_y_mode_mask[i] = INTRA_DC_H_V; sf->intra_uv_mode_mask[i] = INTRA_DC_ONLY; } - sf->use_fast_lpf_pick = 2; sf->RD = 0; } if (speed >= 6) { |