diff options
| author | Marco Paniconi <marpan@google.com> | 2017-05-16 22:48:38 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2017-05-16 22:48:39 +0000 |
| commit | b9987a7c25303df209e99ad4d9d332bf7fa04a22 (patch) | |
| tree | b174a18a2fe198b97ad1b957e95335f1b39da1e8 | |
| parent | dac3b597219a2befd2f1dc1c9cd4ff347a90f572 (diff) | |
| parent | 3704807805895850671261fa4470f1ce41dd2ac9 (diff) | |
| download | libvpx-b9987a7c25303df209e99ad4d9d332bf7fa04a22.tar libvpx-b9987a7c25303df209e99ad4d9d332bf7fa04a22.tar.gz libvpx-b9987a7c25303df209e99ad4d9d332bf7fa04a22.tar.bz2 libvpx-b9987a7c25303df209e99ad4d9d332bf7fa04a22.zip | |
Merge "Revert "vp8: Real-time mode: reduce mode_check_freq thresh for speed 10.""
| -rw-r--r-- | vp8/encoder/onyx_if.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/vp8/encoder/onyx_if.c b/vp8/encoder/onyx_if.c index b571d29d9..64d177581 100644 --- a/vp8/encoder/onyx_if.c +++ b/vp8/encoder/onyx_if.c @@ -728,7 +728,6 @@ void vp8_set_speed_features(VP8_COMP *cpi) { SPEED_FEATURES *sf = &cpi->sf; int Mode = cpi->compressor_speed; int Speed = cpi->Speed; - int Speed2; int i; VP8_COMMON *cm = &cpi->common; int last_improved_quant = sf->improved_quant; @@ -830,16 +829,9 @@ void vp8_set_speed_features(VP8_COMP *cpi) { cpi->mode_check_freq[THR_V_PRED] = cpi->mode_check_freq[THR_H_PRED] = cpi->mode_check_freq[THR_B_PRED] = speed_map(Speed, mode_check_freq_map_vhbpred); - - // For real-time mode at speed 10 keep the mode_check_freq threshold - // for NEW1 similar to that of speed 9. - Speed2 = Speed; - if (cpi->Speed == 10 && Mode == 2) Speed2 = RT(9); - cpi->mode_check_freq[THR_NEW1] = speed_map(Speed2, mode_check_freq_map_new1); - + cpi->mode_check_freq[THR_NEW1] = speed_map(Speed, mode_check_freq_map_new1); cpi->mode_check_freq[THR_NEW2] = cpi->mode_check_freq[THR_NEW3] = speed_map(Speed, mode_check_freq_map_new2); - cpi->mode_check_freq[THR_SPLIT1] = speed_map(Speed, mode_check_freq_map_split1); cpi->mode_check_freq[THR_SPLIT2] = cpi->mode_check_freq[THR_SPLIT3] = |