Properly report number of quality downscales in stats.

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 456 matching lines @@
 
 void SendStatisticsProxy::OnSetEncoderTargetRate(uint32_t bitrate_bps) {
   rtc::CritScope lock(&crit_);
   stats_.target_media_bitrate_bps = bitrate_bps;
 }
 
 void SendStatisticsProxy::OnSendEncodedImage(
     const EncodedImage& encoded_image,
     const CodecSpecificInfo* codec_info) {
   size_t simulcast_idx = 0;
+  bool report_quality_scales = true;
 
   rtc::CritScope lock(&crit_);
   ++stats_.frames_encoded;
   if (codec_info) {
     if (codec_info->codecType == kVideoCodecVP8) {
       simulcast_idx = codec_info->codecSpecific.VP8.simulcastIdx;
+      report_quality_scales = simulcast_idx == 0;

[åsapersson, 2016/12/14 09:25:13]

Scaling could be disabled for simulcast_idx == 0? Maybe initialize
quality_downscales_ to -1 and use on line 513. 

[kthelgason, 2016/12/15 10:33:54]

Done.

     } else if (codec_info->codecType == kVideoCodecGeneric) {
       simulcast_idx = codec_info->codecSpecific.generic.simulcast_idx;
     }
     if (codec_info->codec_name) {
       stats_.encoder_implementation_name = codec_info->codec_name;
     }
   }
 
   if (simulcast_idx >= rtp_config_.ssrcs.size()) {
     LOG(LS_ERROR) << "Encoded image outside simulcast range (" << simulcast_idx
                   << " >= " << rtp_config_.ssrcs.size() << ").";
     return;
   }
   uint32_t ssrc = rtp_config_.ssrcs[simulcast_idx];
 
   VideoSendStream::StreamStats* stats = GetStatsEntry(ssrc);
   if (!stats)
     return;
 
   stats->width = encoded_image._encodedWidth;
   stats->height = encoded_image._encodedHeight;
   update_times_[ssrc].resolution_update_ms = clock_->TimeInMilliseconds();
 
   uma_container_->key_frame_counter_.Add(encoded_image._frameType ==
                                          kVideoFrameKey);
   stats_.bw_limited_resolution =
-      stats_.bw_limited_resolution ||
-      encoded_image.adapt_reason_.bw_resolutions_disabled > 0;
+      stats_.bw_limited_resolution || quality_downscales_ > 0;

[åsapersson, 2016/12/14 09:25:13]

Why remove encoded_image.adapt_reason_.bw_resolutions_disabled > 0.

[kthelgason, 2016/12/15 10:33:54]

Sorry, that should not have been removed. Fixed!

 
-  if (encoded_image.adapt_reason_.quality_resolution_downscales != -1) {
-    bool downscaled =
-        encoded_image.adapt_reason_.quality_resolution_downscales > 0;
-    uma_container_->quality_limited_frame_counter_.Add(downscaled);
-    if (downscaled) {
-      uma_container_->quality_downscales_counter_.Add(
-          encoded_image.adapt_reason_.quality_resolution_downscales);
+  if (report_quality_scales) {
+    if (quality_downscales_ >= 0) {

[åsapersson, 2016/12/14 09:25:13]

always >= 0?

[kthelgason, 2016/12/15 10:33:54]

Acknowledged.

+      uma_container_->quality_limited_frame_counter_.Add(quality_downscales_ >
+                                                         0);
+      if (quality_downscales_ > 0)
+        uma_container_->quality_downscales_counter_.Add(quality_downscales_);
     }
   }
   if (encoded_image.adapt_reason_.bw_resolutions_disabled != -1) {
     bool bw_limited = encoded_image.adapt_reason_.bw_resolutions_disabled > 0;
     uma_container_->bw_limited_frame_counter_.Add(bw_limited);
     if (bw_limited) {
       uma_container_->bw_resolutions_disabled_counter_.Add(
           encoded_image.adapt_reason_.bw_resolutions_disabled);
     }
   }
@@ skipping 66 matching lines @@
 }
 
 void SendStatisticsProxy::OnCpuRestrictedResolutionChanged(
     bool cpu_restricted_resolution) {
   rtc::CritScope lock(&crit_);
   stats_.cpu_limited_resolution = cpu_restricted_resolution;
   ++stats_.number_of_cpu_adapt_changes;
 }
 
 void SendStatisticsProxy::OnQualityRestrictedResolutionChanged(
-    bool restricted) {
+    int nr_of_downscales) {
   rtc::CritScope lock(&crit_);
-  uma_container_->quality_downscales_counter_.Add(restricted);
-  stats_.bw_limited_resolution = restricted;
+  quality_downscales_ = nr_of_downscales;
+  stats_.bw_limited_resolution = nr_of_downscales > 0;
 }
 
 void SendStatisticsProxy::RtcpPacketTypesCounterUpdated(
     uint32_t ssrc,
     const RtcpPacketTypeCounter& packet_counter) {
   rtc::CritScope lock(&crit_);
   VideoSendStream::StreamStats* stats = GetStatsEntry(ssrc);
   if (!stats)
     return;
 
@@ skipping 97 matching lines @@
   return Fraction(min_required_samples, 1000.0f);
 }
 
 int SendStatisticsProxy::BoolSampleCounter::Fraction(
     int 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