diff options
author | Dmitry Kovalev <dkovalev@google.com> | 2014-04-17 18:26:54 -0700 |
---|---|---|
committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2014-04-17 18:26:54 -0700 |
commit | 69b88df206d9b0814e9fced583c7777d1c30028d (patch) | |
tree | 37d087102969876d22350f951bd24be30c59b4f3 /vp9/encoder/vp9_onyx_if.c | |
parent | 1355af5c42ccd3c96b4c28d25594cb302672dcde (diff) | |
parent | 52549b4e78dba7116f5d6c91a785e65d32c570c9 (diff) | |
download | libvpx-69b88df206d9b0814e9fced583c7777d1c30028d.tar libvpx-69b88df206d9b0814e9fced583c7777d1c30028d.tar.gz libvpx-69b88df206d9b0814e9fced583c7777d1c30028d.tar.bz2 libvpx-69b88df206d9b0814e9fced583c7777d1c30028d.zip |
Merge "Adding is_best_mode() function."
Diffstat (limited to 'vp9/encoder/vp9_onyx_if.c')
-rw-r--r-- | vp9/encoder/vp9_onyx_if.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/vp9/encoder/vp9_onyx_if.c b/vp9/encoder/vp9_onyx_if.c index 5a7257338..e869e8fa2 100644 --- a/vp9/encoder/vp9_onyx_if.c +++ b/vp9/encoder/vp9_onyx_if.c @@ -372,9 +372,6 @@ static void update_reference_segmentation_map(VP9_COMP *cpi) { cache_ptr += cm->mi_cols; } } -static int is_slowest_mode(int mode) { - return (mode == TWO_PASS_SECOND_BEST || mode == ONE_PASS_BEST); -} static void set_rd_speed_thresholds(VP9_COMP *cpi) { int i; @@ -382,7 +379,7 @@ static void set_rd_speed_thresholds(VP9_COMP *cpi) { // Set baseline threshold values for (i = 0; i < MAX_MODES; ++i) - rd->thresh_mult[i] = is_slowest_mode(cpi->oxcf.mode) ? -500 : 0; + rd->thresh_mult[i] = is_best_mode(cpi->oxcf.mode) ? -500 : 0; rd->thresh_mult[THR_NEARESTMV] = 0; rd->thresh_mult[THR_NEARESTG] = 0; @@ -464,7 +461,7 @@ static void set_rd_speed_thresholds_sub8x8(VP9_COMP *cpi) { int i; for (i = 0; i < MAX_REFS; ++i) - rd->thresh_mult_sub8x8[i] = is_slowest_mode(cpi->oxcf.mode) ? -500 : 0; + rd->thresh_mult_sub8x8[i] = is_best_mode(cpi->oxcf.mode) ? -500 : 0; rd->thresh_mult_sub8x8[THR_LAST] += 2500; rd->thresh_mult_sub8x8[THR_GOLD] += 2500; |