Do not report quality limited resolution stats when quality scaler is disabled.

webrtc/video/send_statistics_proxy.cc

 /*
  *  Copyright (c) 2013 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 660 matching lines @@
   uma_container_->input_width_counter_.Add(width);
   uma_container_->input_height_counter_.Add(height);
   uma_container_->cpu_limited_frame_counter_.Add(stats_.cpu_limited_resolution);
   TRACE_EVENT_INSTANT2("webrtc_stats", "WebRTC.Video.InputFrameRate",
       "frame_rate", round(
           uma_container_->input_frame_rate_tracker_.ComputeRate()),
       "ssrc", rtp_config_.ssrcs[0]);
 }
 
 void SendStatisticsProxy::SetResolutionRestrictionStats(
-    bool scaling_enabled,
+    bool cpu_scaling_enabled,
+    bool quality_scaling_enabled,
     bool cpu_restricted,
     int num_quality_downscales) {
   rtc::CritScope lock(&crit_);
-  if (scaling_enabled) {
+  if (cpu_scaling_enabled) {
+    stats_.cpu_limited_resolution = cpu_restricted;
+  } else {
+    stats_.cpu_limited_resolution = false;
+  }
+
+  if (quality_scaling_enabled) {
     quality_downscales_ = num_quality_downscales;
     stats_.bw_limited_resolution = quality_downscales_ > 0;
-    stats_.cpu_limited_resolution = cpu_restricted;
   } else {
+    quality_downscales_ = -1;
     stats_.bw_limited_resolution = false;
-    stats_.cpu_limited_resolution = false;
-    quality_downscales_ = -1;
   }

[kthelgason, 2017/03/31 07:57:38]

I think the amount of parameters and conditions here is getting a little unruly.

What do you think about simplifying this into two methods,
"SetCPUScalingStats(bool cpu_restricted)" and "SetQualityScalingStats(int
num_quality_downscales)" and making the decision of whether to report the stats
in the ViEEncoder? I think that would result in way simpler code here, and all
the decision making happens in ViEEncoder anyway, so it wouldn't add much there.

[åsapersson, 2017/03/31 09:53:38]

Done.

 }
 
 void SendStatisticsProxy::OnCpuRestrictedResolutionChanged(
     bool cpu_restricted_resolution) {
   rtc::CritScope lock(&crit_);
   stats_.cpu_limited_resolution = cpu_restricted_resolution;
   ++stats_.number_of_cpu_adapt_changes;
   TRACE_EVENT_INSTANT0("webrtc_stats", "WebRTC.Video.AdaptationChanges");
 }
 
@@ skipping 145 matching lines @@
 }
 
 int SendStatisticsProxy::BoolSampleCounter::Fraction(
     int64_t min_required_samples,
     float multiplier) const {
   if (num_samples < min_required_samples || num_samples == 0)
     return -1;
   return static_cast<int>((sum * multiplier / num_samples) + 0.5f);
 }
 }  // namespace webrtc