Move the QP scaling thresholds to the relevant encoders

webrtc/modules/video_coding/codecs/vp8/vp8_impl.cc

 /*
  *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 16 matching lines @@
 #include "webrtc/modules/include/module_common_types.h"
 #include "webrtc/modules/video_coding/include/video_codec_interface.h"
 #include "webrtc/modules/video_coding/codecs/vp8/include/vp8_common_types.h"
 #include "webrtc/modules/video_coding/codecs/vp8/screenshare_layers.h"
 #include "webrtc/modules/video_coding/codecs/vp8/temporal_layers.h"
 #include "webrtc/system_wrappers/include/clock.h"
 
 namespace webrtc {
 namespace {
 
+// QP is obtained from VP8-bitstream for HW, so the QP corresponds to the
+// bitstream range of [0, 127] and not the user-level range of [0,63].
+static const int kLowVp8QpThreshold = 29;
+static const int kHighVp8QpThreshold = 95;
+

[magjed_webrtc, 2016/09/06 07:49:09]

nit: remove extra line

+
 enum { kVp8ErrorPropagationTh = 30 };
 enum { kVp832ByteAlign = 32 };
 
 // VP8 denoiser states.
 enum denoiserState {
   kDenoiserOff,
   kDenoiserOnYOnly,
   kDenoiserOnYUV,
   kDenoiserOnYUVAggressive,
   // Adaptive mode defaults to kDenoiserOnYUV on key frame, but may switch
@@ skipping 549 matching lines @@
                     inst->simulcastStream[stream_idx].height, kVp832ByteAlign);
       SetStreamState(stream_bitrates[stream_idx] > 0, stream_idx);
       configurations_[i].rc_target_bitrate = stream_bitrates[stream_idx];
       temporal_layers_[stream_idx]->ConfigureBitrates(
           stream_bitrates[stream_idx], inst->maxBitrate, inst->maxFramerate,
           &configurations_[i]);
     }
   }
 
   rps_.Init();
-  quality_scaler_.Init(QualityScaler::kLowVp8QpThreshold,
-                       QualityScaler::kBadVp8QpThreshold, codec_.startBitrate,
+  quality_scaler_.Init(kLowVp8QpThreshold,
+                       kHighVp8QpThreshold, codec_.startBitrate,
                        codec_.width, codec_.height, codec_.maxFramerate);
 
   // Only apply scaling to improve for single-layer streams. The scaling metrics
   // use frame drops as a signal and is only applicable when we drop frames.
   quality_scaler_enabled_ = encoders_.size() == 1 &&
                             configurations_[0].rc_dropframe_thresh > 0 &&
                             codec_.codecSpecific.VP8.automaticResizeOn;
 
   return InitAndSetControlSettings();
 }
@@ skipping 786 matching lines @@
     return -1;
   }
   if (vpx_codec_control(copy->decoder_, VP8_SET_REFERENCE, ref_frame_) !=
       VPX_CODEC_OK) {
     return -1;
   }
   return 0;
 }
 
 }  // namespace webrtc