Add sent framerates to histogram stats:

webrtc/modules/video_coding/main/source/media_optimization.cc

 /*
  *  Copyright (c) 2012 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/main/source/media_optimization.h"
 
 #include "webrtc/modules/video_coding/main/source/content_metrics_processing.h"
 #include "webrtc/modules/video_coding/main/source/qm_select.h"
 #include "webrtc/modules/video_coding/utility/include/frame_dropper.h"
 #include "webrtc/system_wrappers/interface/clock.h"
 #include "webrtc/system_wrappers/interface/logging.h"
+#include "webrtc/system_wrappers/interface/metrics.h"
 
 namespace webrtc {
 namespace media_optimization {
 namespace {
 void UpdateProtectionCallback(
     VCMProtectionMethod* selected_method,
     uint32_t* video_rate_bps,
     uint32_t* nack_overhead_rate_bps,
     uint32_t* fec_overhead_rate_bps,
     VCMProtectionCallback* video_protection_callback) {
@@ skipping 69 matching lines @@
       key_frame_cnt_(0),
       delta_frame_cnt_(0),
       content_(new VCMContentMetricsProcessing()),
       qm_resolution_(new VCMQmResolution()),
       last_qm_update_time_(0),
       last_change_time_(0),
       num_layers_(0),
       suspension_enabled_(false),
       video_suspended_(false),
       suspension_threshold_bps_(0),
-      suspension_window_bps_(0) {
+      suspension_window_bps_(0),
+      sent_frames_(0),
+      first_sent_frame_time_ms_(-1) {
   memset(send_statistics_, 0, sizeof(send_statistics_));
   memset(incoming_frame_times_, -1, sizeof(incoming_frame_times_));
 }
 
 MediaOptimization::~MediaOptimization(void) {
+  UpdateHistograms();
   loss_prot_logic_->Release();
 }
 
+void MediaOptimization::UpdateHistograms() {
+  int fps = -1;
+  {
+    CriticalSectionScoped lock(crit_sect_.get());
+    if (sent_frames_ > 0) {
+      int64_t elapsed_sec =
+          (clock_->TimeInMilliseconds() - first_sent_frame_time_ms_) / 1000;
+      if (elapsed_sec > metrics::kMinRunTimeInSeconds) {
+        fps = sent_frames_ / elapsed_sec;
+      }
+    }
+  }
+  if (fps != -1) {
+    RTC_HISTOGRAM_COUNTS_100("WebRTC.Video.SentFramesPerSecond", fps);

[pbos-webrtc, 2015/06/09 12:49:01]

Can you move these histograms to SendStatisticsProxy? I'd like us to do all
histograms from there if possible.

stats_.encode_frame_rate already contains the FPS right? Is that one good
enough, or is it a different framerate since this one's taken over the entire
lifetime?

Either way I'd like to move all of these new histograms to SendStatisticsProxy
and plumb the necessary signals (total number of frames sent for instance).
WDYT?

+  }
+}
+
 void MediaOptimization::Reset() {
   CriticalSectionScoped lock(crit_sect_.get());
   SetEncodingDataInternal(
       kVideoCodecUnknown, 0, 0, 0, 0, 0, 0, max_payload_size_);
   memset(incoming_frame_times_, -1, sizeof(incoming_frame_times_));
   incoming_frame_rate_ = 0.0;
   frame_dropper_->Reset();
   loss_prot_logic_->Reset(clock_->TimeInMilliseconds());
   frame_dropper_->SetRates(0, 0);
   content_->Reset();
@@ skipping 248 matching lines @@
   if (encoded_frame_samples_.size() > 0 &&
       encoded_frame_samples_.back().timestamp == timestamp) {
     // Frames having the same timestamp are generated from the same input
     // frame. We don't want to double count them, but only increment the
     // size_bytes.
     encoded_frame_samples_.back().size_bytes += encoded_length;
     encoded_frame_samples_.back().time_complete_ms = now_ms;
   } else {
     encoded_frame_samples_.push_back(
         EncodedFrameSample(encoded_length, timestamp, now_ms));
+    ++sent_frames_;
+    if (first_sent_frame_time_ms_ == -1)
+      first_sent_frame_time_ms_ = now_ms;
   }
   UpdateSentBitrate(now_ms);
   UpdateSentFramerate();
   if (encoded_length > 0) {
     const bool delta_frame = encoded_image._frameType != kKeyFrame;
 
     frame_dropper_->Fill(encoded_length, delta_frame);
     if (max_payload_size_ > 0 && encoded_length > 0) {
       const float min_packets_per_frame =
           encoded_length / static_cast<float>(max_payload_size_);
@@ skipping 259 matching lines @@
       if (target_bit_rate_ >
           suspension_threshold_bps_ + suspension_window_bps_) {
         video_suspended_ = false;
       }
     }
   }
 }
 
 }  // namespace media_optimization
 }  // namespace webrtc