Move the QP scaling thresholds to the relevant encoders

webrtc/api/android/jni/androidmediaencoder_jni.cc

 /*
  *  Copyright 2015 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 68 matching lines @@
 #define ALOGV(...)
 #endif
 #define ALOGD LOG_TAG(rtc::LS_INFO, TAG_ENCODER)
 #define ALOGW LOG_TAG(rtc::LS_WARNING, TAG_ENCODER)
 #define ALOGE LOG_TAG(rtc::LS_ERROR, TAG_ENCODER)
 
 namespace {
 // Maximum time limit between incoming frames before requesting a key frame.
 const size_t kFrameDiffThresholdMs = 1100;
 const int kMinKeyFrameInterval = 2;
+
+const int kLowVp8QpThreshold = 29;
+const int kHighVp8QpThreshold = 95;
+
+const int kLowH264QpThreshold = 24;
+const int kHighH264QpThreshold = 37;
 }  // namespace
 
 // MediaCodecVideoEncoder is a webrtc::VideoEncoder implementation that uses
 // Android's MediaCodec SDK API behind the scenes to implement (hopefully)
 // HW-backed video encode.  This C++ class is implemented as a very thin shim,
 // delegating all of the interesting work to org.webrtc.MediaCodecVideoEncoder.
 // MediaCodecVideoEncoder is created, operated, and destroyed on a single
 // thread, currently the libjingle Worker thread.
 class MediaCodecVideoEncoder : public webrtc::VideoEncoder,
                                public rtc::MessageHandler {
@@ skipping 291 matching lines @@
   } else if (codecType_ != kVideoCodecVP9) {
     scale_ = true;
   }
 
   ALOGD << "InitEncode request: " << init_width << " x " << init_height;
   ALOGD << "Encoder automatic resize " << (scale_ ? "enabled" : "disabled");
 
   if (scale_) {
     if (codecType_ == kVideoCodecVP8) {
       quality_scaler_.Init(
-          QualityScaler::kLowVp8QpThreshold, QualityScaler::kBadVp8QpThreshold,
+          kLowVp8QpThreshold, kHighVp8QpThreshold,
           codec_settings->startBitrate, codec_settings->width,
           codec_settings->height, codec_settings->maxFramerate);
     } else if (codecType_ == kVideoCodecH264) {
-      quality_scaler_.Init(QualityScaler::kLowH264QpThreshold,
-                           QualityScaler::kBadH264QpThreshold,
+      quality_scaler_.Init(kLowH264QpThreshold,
+                           kHighH264QpThreshold,
                            codec_settings->startBitrate, codec_settings->width,
                            codec_settings->height,
                            codec_settings->maxFramerate);
     } else {
       // When adding codec support to additional hardware codecs, also configure
       // their QP thresholds for scaling.
       RTC_NOTREACHED() << "Unsupported codec without configured QP thresholds.";
       scale_ = false;
     }
     QualityScaler::Resolution res = quality_scaler_.GetScaledResolution();
@@ skipping 881 matching lines @@
   return supported_codecs_;
 }
 
 void MediaCodecVideoEncoderFactory::DestroyVideoEncoder(
     webrtc::VideoEncoder* encoder) {
   ALOGD << "Destroy video encoder.";
   delete encoder;
 }
 
 }  // namespace webrtc_jni