From 3704807805895850671261fa4470f1ce41dd2ac9 Mon Sep 17 00:00:00 2001 From: Marco Paniconi Date: Tue, 16 May 2017 22:48:13 +0000 Subject: Revert "vp8: Real-time mode: reduce mode_check_freq thresh for speed 10." This reverts commit 4a7424adba7a65766a92635dc67b6e7d94646693. Reason for revert: Possibly causing test failures in roll into chromium. Original change's description: > vp8: Real-time mode: reduce mode_check_freq thresh for speed 10. > > Reduces quality regression at speed 10 for real-time mode. > > Change-Id: I9f624bea9ca262dab32ce9de7d6d91175d6becc8 > TBR=marpan@google.com,builds@webmproject.org,jianj@google.com # Not skipping CQ checks because original CL landed > 1 day ago. Change-Id: I1defcb74e78a5a3bd29b7d1b21a96a79fa26a457 --- vp8/encoder/onyx_if.c | 10 +--------- 1 file changed, 1 insertion(+), 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] = -- cgit v1.2.3