ref: b8ddc9f0d3079ff061de1effa6fe1e054614cd19
parent: 119decdee7f3052b5f0a6bc3f3a6e84d157054c9
parent: 5290eeab8806c8f1382adfad6bd42d8ffc8fb261
author: Paul Wilkins <paulwilkins@google.com>
date: Thu Jul 11 22:14:01 EDT 2013
Merge "Speed 2 feature adjustment."
--- a/vp9/encoder/vp9_onyx_if.c
+++ b/vp9/encoder/vp9_onyx_if.c
@@ -779,9 +779,6 @@
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 @@
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 @@
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) {