Implement a high-QP threshold for Android H.264.

webrtc/modules/video_coding/utility/quality_scaler.cc

 /*
  *  Copyright (c) 2014 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.
  */
 #include "webrtc/modules/video_coding/utility/include/quality_scaler.h"
@@ skipping 11 matching lines @@
 
 QualityScaler::QualityScaler()
     : num_samples_(0),
       low_qp_threshold_(-1),
       downscale_shift_(0),
       framerate_down_(false),
       min_width_(kDefaultMinDownscaleDimension),
       min_height_(kDefaultMinDownscaleDimension) {
 }
 
-void QualityScaler::Init(int low_qp_threshold, bool use_framerate_reduction) {
+void QualityScaler::Init(int low_qp_threshold,
+                         int high_qp_threshold,
+                         bool use_framerate_reduction) {
   ClearSamples();
   low_qp_threshold_ = low_qp_threshold;
+  high_qp_threshold_ = high_qp_threshold;
   use_framerate_reduction_ = use_framerate_reduction;
   target_framerate_ = -1;
 }
 
 void QualityScaler::SetMinResolution(int min_width, int min_height) {
   min_width_ = min_width;
   min_height_ = min_height;
 }
 
 // Report framerate(fps) to estimate # of samples.
@@ skipping 18 matching lines @@
   assert(num_samples_ > 0);
   res_.width = frame.width();
   res_.height = frame.height();
 
   // Update scale factor.
   int avg_drop = 0;
   int avg_qp = 0;
 
   // When encoder consistently overshoots, framerate reduction and spatial
   // resizing will be triggered to get a smoother video.
-  if (framedrop_percent_.GetAverage(num_samples_, &avg_drop) &&
-      avg_drop >= kFramedropPercentThreshold) {
+  if ((framedrop_percent_.GetAverage(num_samples_, &avg_drop) &&
+       avg_drop >= kFramedropPercentThreshold) ||
+      (average_qp_.GetAverage(num_samples_, &avg_qp) &&
+       avg_qp > high_qp_threshold_)) {
     // Reducing frame rate before spatial resolution change.
     // Reduce frame rate only when it is above a certain number.
     // Only one reduction is allowed for now.
     // TODO(jackychen): Allow more than one framerate reduction.
     if (use_framerate_reduction_ && !framerate_down_ && framerate_ >= 20) {
       target_framerate_ = framerate_ / 2;
       framerate_down_ = true;
       // If frame rate has been updated, clear the buffer. We don't want
       // spatial resolution to change right after frame rate change.
       ClearSamples();
@@ skipping 57 matching lines @@
 }
 
 void QualityScaler::AdjustScale(bool up) {
   downscale_shift_ += up ? -1 : 1;
   if (downscale_shift_ < 0)
     downscale_shift_ = 0;
   ClearSamples();
 }
 
 }  // namespace webrtc