Add histogram stats for average QP per frame for VP9 (for sent video streams):

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 176 matching lines @@
     RTC_LOGGED_HISTOGRAMS_COUNTS_100000(
         kIndex, uma_prefix_ + "SendSideDelayInMs", delay_ms);
 
   int max_delay_ms = max_delay_counter_.Avg(kMinRequiredSamples);
   if (max_delay_ms != -1) {
     RTC_LOGGED_HISTOGRAMS_COUNTS_100000(
         kIndex, uma_prefix_ + "SendSideDelayMaxInMs", max_delay_ms);
   }
 
   for (const auto& it : qp_counters_) {
-    int qp = it.second.vp8.Avg(kMinRequiredSamples);
-    if (qp != -1) {
+    int qp_vp8 = it.second.vp8.Avg(kMinRequiredSamples);
+    if (qp_vp8 != -1) {
       int spatial_idx = it.first;
       if (spatial_idx == -1) {
         RTC_LOGGED_HISTOGRAMS_COUNTS_200(kIndex, uma_prefix_ + "Encoded.Qp.Vp8",
-                                         qp);
+                                         qp_vp8);
       } else if (spatial_idx == 0) {
-        RTC_LOGGED_HISTOGRAMS_COUNTS_200(kIndex,
-                                         uma_prefix_ + "Encoded.Qp.Vp8.S0", qp);
+        RTC_LOGGED_HISTOGRAMS_COUNTS_200(
+            kIndex, uma_prefix_ + "Encoded.Qp.Vp8.S0", qp_vp8);
       } else if (spatial_idx == 1) {
-        RTC_LOGGED_HISTOGRAMS_COUNTS_200(kIndex,
-                                         uma_prefix_ + "Encoded.Qp.Vp8.S1", qp);
+        RTC_LOGGED_HISTOGRAMS_COUNTS_200(
+            kIndex, uma_prefix_ + "Encoded.Qp.Vp8.S1", qp_vp8);
       } else if (spatial_idx == 2) {
-        RTC_LOGGED_HISTOGRAMS_COUNTS_200(kIndex,
-                                         uma_prefix_ + "Encoded.Qp.Vp8.S2", qp);
+        RTC_LOGGED_HISTOGRAMS_COUNTS_200(
+            kIndex, uma_prefix_ + "Encoded.Qp.Vp8.S2", qp_vp8);
       } else {
         LOG(LS_WARNING) << "QP stats not recorded for VP8 spatial idx "
                         << spatial_idx;
       }
     }
+    int qp_vp9 = it.second.vp9.Avg(kMinRequiredSamples);
+    if (qp_vp9 != -1) {
+      int spatial_idx = it.first;
+      if (spatial_idx == -1) {
+        RTC_LOGGED_HISTOGRAMS_COUNTS_500(kIndex, uma_prefix_ + "Encoded.Qp.Vp9",
+                                         qp_vp9);
+      } else if (spatial_idx == 0) {
+        RTC_LOGGED_HISTOGRAMS_COUNTS_500(
+            kIndex, uma_prefix_ + "Encoded.Qp.Vp9.S0", qp_vp9);
+      } else if (spatial_idx == 1) {
+        RTC_LOGGED_HISTOGRAMS_COUNTS_500(
+            kIndex, uma_prefix_ + "Encoded.Qp.Vp9.S1", qp_vp9);
+      } else if (spatial_idx == 2) {
+        RTC_LOGGED_HISTOGRAMS_COUNTS_500(
+            kIndex, uma_prefix_ + "Encoded.Qp.Vp9.S2", qp_vp9);
+      } else {
+        LOG(LS_WARNING) << "QP stats not recorded for VP9 spatial layer "
+                        << spatial_idx;
+      }
+    }
   }
 
   if (first_rtcp_stats_time_ms_ != -1) {
     int64_t elapsed_sec =
         (clock_->TimeInMilliseconds() - first_rtcp_stats_time_ms_) / 1000;
     if (elapsed_sec >= metrics::kMinRunTimeInSeconds) {
       int fraction_lost = report_block_stats_.FractionLostInPercent();
       if (fraction_lost != -1) {
         RTC_LOGGED_HISTOGRAMS_PERCENTAGE(
             kIndex, uma_prefix_ + "SentPacketsLostInPercent", fraction_lost);
@@ skipping 215 matching lines @@
   }
   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);
     }
   }
 
-  if (encoded_image.qp_ != -1 && rtp_video_header &&
-      rtp_video_header->codec == kRtpVideoVp8) {
-    int spatial_idx =
-        (config_.rtp.ssrcs.size() == 1) ? -1 : static_cast<int>(simulcast_idx);
-    uma_container_->qp_counters_[spatial_idx].vp8.Add(encoded_image.qp_);
+  if (encoded_image.qp_ != -1 && rtp_video_header) {
+    if (rtp_video_header->codec == kRtpVideoVp8) {
+      int spatial_idx = (config_.rtp.ssrcs.size() == 1)
+                            ? -1
+                            : static_cast<int>(simulcast_idx);
+      uma_container_->qp_counters_[spatial_idx].vp8.Add(encoded_image.qp_);
+    } else if (rtp_video_header->codec == kRtpVideoVp9) {
+      int spatial_idx =
+          (rtp_video_header->codecHeader.VP9.num_spatial_layers == 1)
+              ? -1
+              : rtp_video_header->codecHeader.VP9.spatial_idx;
+      uma_container_->qp_counters_[spatial_idx].vp9.Add(encoded_image.qp_);
+    }
   }
 
   // TODO(asapersson): This is incorrect if simulcast layers are encoded on
   // different threads and there is no guarantee that one frame of all layers
   // are encoded before the next start.
   if (last_sent_frame_timestamp_ > 0 &&
       encoded_image._timeStamp != last_sent_frame_timestamp_) {
     uma_container_->sent_frame_rate_tracker_.AddSamples(1);
     uma_container_->sent_width_counter_.Add(
         uma_container_->max_sent_width_per_timestamp_);
@@ skipping 120 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