diff options
| author | Paul Wilkins <paulwilkins@google.com> | 2013-07-12 02:14:01 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2013-07-12 02:14:01 -0700 |
| commit | b8ddc9f0d3079ff061de1effa6fe1e054614cd19 (patch) | |
| tree | 39fa43bc3335e8fa933e06110596690f257205fa /vp9/encoder | |
| parent | 119decdee7f3052b5f0a6bc3f3a6e84d157054c9 (diff) | |
| parent | 5290eeab8806c8f1382adfad6bd42d8ffc8fb261 (diff) | |
| download | libvpx-b8ddc9f0d3079ff061de1effa6fe1e054614cd19.tar libvpx-b8ddc9f0d3079ff061de1effa6fe1e054614cd19.tar.gz libvpx-b8ddc9f0d3079ff061de1effa6fe1e054614cd19.tar.bz2 libvpx-b8ddc9f0d3079ff061de1effa6fe1e054614cd19.zip | |
Merge "Speed 2 feature adjustment."
Diffstat (limited to 'vp9/encoder')
| -rw-r--r-- | vp9/encoder/vp9_onyx_if.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/vp9/encoder/vp9_onyx_if.c b/vp9/encoder/vp9_onyx_if.c index 486686ad7..1edd1ebec 100644 --- a/vp9/encoder/vp9_onyx_if.c +++ b/vp9/encoder/vp9_onyx_if.c @@ -779,9 +779,6 @@ void vp9_set_speed_features(VP9_COMP *cpi) { sf->adjust_partitioning_from_last_frame = 1; sf->last_partitioning_redo_frequency = 3; sf->unused_mode_skip_lvl = BLOCK_SIZE_SB32X32; - sf->reduce_first_step_size = 1; - sf->optimize_coefficients = 0; - // sf->reference_masking = 1; sf->tx_size_search_method = ((cpi->common.frame_type == KEY_FRAME || cpi->common.intra_only || cpi->common.show_frame == 0) ? @@ -802,7 +799,6 @@ void vp9_set_speed_features(VP9_COMP *cpi) { cpi->common.show_frame == 0) ? USE_FULL_RD : USE_LARGESTALL); - sf->reduce_first_step_size = 1; sf->mode_search_skip_flags = FLAG_SKIP_INTRA_DIRMISMATCH | FLAG_SKIP_INTRA_BESTINTER | FLAG_SKIP_COMP_BESTINTRA | @@ -823,6 +819,9 @@ void vp9_set_speed_features(VP9_COMP *cpi) { FLAG_SKIP_COMP_BESTINTRA | FLAG_SKIP_COMP_REFMISMATCH; sf->use_rd_breakout = 1; + sf->optimize_coefficients = 0; + // sf->reduce_first_step_size = 1; + // sf->reference_masking = 1; } /* if (speed == 2) { |