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

webrtc/video/send_statistics_proxy.cc

Index: webrtc/video/send_statistics_proxy.cc
diff --git a/webrtc/video/send_statistics_proxy.cc b/webrtc/video/send_statistics_proxy.cc
index 1f12b2d640ab63d9887d9f087d04cc2ac6993006..09ff9a55311e10b465b55822331d8f4bfa9f13c5 100644
--- a/webrtc/video/send_statistics_proxy.cc
+++ b/webrtc/video/send_statistics_proxy.cc
@@ -678,18 +678,23 @@ void SendStatisticsProxy::OnIncomingFrame(int width, int height) {
 }
 
 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) {
-    quality_downscales_ = num_quality_downscales;
-    stats_.bw_limited_resolution = quality_downscales_ > 0;
+  if (cpu_scaling_enabled) {
     stats_.cpu_limited_resolution = cpu_restricted;
   } else {
-    stats_.bw_limited_resolution = false;
     stats_.cpu_limited_resolution = false;
+  }
+
+  if (quality_scaling_enabled) {
+    quality_downscales_ = num_quality_downscales;
+    stats_.bw_limited_resolution = quality_downscales_ > 0;
+  } else {
     quality_downscales_ = -1;
+    stats_.bw_limited_resolution = false;
   }

[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.

 }