diff options
| author | Paul Wilkins <paulwilkins@google.com> | 2013-09-17 03:39:24 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2013-09-17 03:39:24 -0700 |
| commit | 84758960db7e18cd77e301ab4a1dc6022e1a3335 (patch) | |
| tree | 530ee1a2fbb597d6aaca8f67eac7c7bd3298a554 | |
| parent | 90a52694f3f4073fee5c5794b0e333923dc078fd (diff) | |
| parent | cb50dc7f33faf0dc0ce3781197d547b9a60f65ae (diff) | |
| download | libvpx-84758960db7e18cd77e301ab4a1dc6022e1a3335.tar.gz | |
Merge "Minor clean up."
| -rw-r--r-- | vp9/encoder/vp9_onyx_if.c | 35 | ||||
| -rw-r--r-- | vp9/encoder/vp9_onyx_int.h | 1 |
2 files changed, 6 insertions, 30 deletions
diff --git a/vp9/encoder/vp9_onyx_if.c b/vp9/encoder/vp9_onyx_if.c index 044dcc866..bc1b4a8c6 100644 --- a/vp9/encoder/vp9_onyx_if.c +++ b/vp9/encoder/vp9_onyx_if.c @@ -565,16 +565,16 @@ static void set_rd_speed_thresholds(VP9_COMP *cpi, int mode) { sf->thresh_mult[THR_NEARESTG] = 0; sf->thresh_mult[THR_NEARESTA] = 0; - sf->thresh_mult[THR_NEWMV] += 1000; - sf->thresh_mult[THR_COMP_NEARESTLA] += 1000; - sf->thresh_mult[THR_NEARMV] += 1000; - sf->thresh_mult[THR_COMP_NEARESTGA] += 1000; - sf->thresh_mult[THR_DC] += 1000; - sf->thresh_mult[THR_NEWG] += 1000; + sf->thresh_mult[THR_NEWMV] += 1000; sf->thresh_mult[THR_NEWA] += 1000; + sf->thresh_mult[THR_NEWG] += 1000; + + sf->thresh_mult[THR_NEARMV] += 1000; sf->thresh_mult[THR_NEARA] += 1000; + sf->thresh_mult[THR_COMP_NEARESTLA] += 1000; + sf->thresh_mult[THR_COMP_NEARESTGA] += 1000; sf->thresh_mult[THR_TM] += 1000; @@ -606,28 +606,6 @@ static void set_rd_speed_thresholds(VP9_COMP *cpi, int mode) { sf->thresh_mult[THR_D207_PRED] += 2500; sf->thresh_mult[THR_D63_PRED] += 2500; - if (cpi->sf.skip_lots_of_modes) { - for (i = 0; i < MAX_MODES; ++i) - sf->thresh_mult[i] = INT_MAX; - - sf->thresh_mult[THR_DC] = 2000; - sf->thresh_mult[THR_TM] = 2000; - sf->thresh_mult[THR_NEWMV] = 4000; - sf->thresh_mult[THR_NEWG] = 4000; - sf->thresh_mult[THR_NEWA] = 4000; - sf->thresh_mult[THR_NEARESTMV] = 0; - sf->thresh_mult[THR_NEARESTG] = 0; - sf->thresh_mult[THR_NEARESTA] = 0; - sf->thresh_mult[THR_NEARMV] = 2000; - sf->thresh_mult[THR_NEARG] = 2000; - sf->thresh_mult[THR_NEARA] = 2000; - sf->thresh_mult[THR_COMP_NEARESTLA] = 2000; - sf->thresh_mult[THR_SPLITMV] = 2500; - sf->thresh_mult[THR_SPLITG] = 2500; - sf->thresh_mult[THR_SPLITA] = 2500; - sf->recode_loop = 0; - } - /* disable frame modes if flags not set */ if (!(cpi->ref_frame_flags & VP9_LAST_FLAG)) { sf->thresh_mult[THR_NEWMV ] = INT_MAX; @@ -714,7 +692,6 @@ void vp9_set_speed_features(VP9_COMP *cpi) { sf->adaptive_motion_search = 0; sf->use_avoid_tested_higherror = 0; sf->reference_masking = 0; - sf->skip_lots_of_modes = 0; sf->partition_by_variance = 0; sf->use_one_partition_size_always = 0; sf->less_rectangular_check = 0; diff --git a/vp9/encoder/vp9_onyx_int.h b/vp9/encoder/vp9_onyx_int.h index 3e5796f3c..92edf49ab 100644 --- a/vp9/encoder/vp9_onyx_int.h +++ b/vp9/encoder/vp9_onyx_int.h @@ -267,7 +267,6 @@ typedef struct { TX_SIZE_SEARCH_METHOD tx_size_search_method; int use_lp32x32fdct; int use_avoid_tested_higherror; - int skip_lots_of_modes; int partition_by_variance; int use_one_partition_size_always; int less_rectangular_check; |