Add sent framerates to histogram stats:

webrtc/modules/video_coding/main/source/video_sender.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.
  */
 
 #include "webrtc/common_types.h"
 
 #include <algorithm>  // std::max
 
 #include "webrtc/base/checks.h"
 #include "webrtc/common_video/libyuv/include/webrtc_libyuv.h"
 #include "webrtc/modules/video_coding/codecs/interface/video_codec_interface.h"
 #include "webrtc/modules/video_coding/main/source/encoded_frame.h"
 #include "webrtc/modules/video_coding/main/source/video_coding_impl.h"
 #include "webrtc/modules/video_coding/utility/include/quality_scaler.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 vcm {
 
 VideoSender::VideoSender(Clock* clock,
                          EncodedImageCallback* post_encode_callback,
                          VideoEncoderRateObserver* encoder_rate_observer,
                          VCMQMSettingsCallback* qm_settings_callback)
     : clock_(clock),
       process_crit_sect_(CriticalSectionWrapper::CreateCriticalSection()),
@@ skipping 11 matching lines @@
       protection_callback_(nullptr) {
   // Allow VideoSender to be created on one thread but used on another, post
   // construction. This is currently how this class is being used by at least
   // one external project (diffractor).
   _mediaOpt.EnableQM(qm_settings_callback_ != nullptr);
   _mediaOpt.Reset();
   main_thread_.DetachFromThread();
 }
 
 VideoSender::~VideoSender() {
+  UpdateHistograms();
   delete _sendCritSect;
 }
 
+void VideoSender::UpdateHistograms() {
+  int avg_encode_time_ms;
+  int max_encode_time_ms;
+  {
+    CriticalSectionScoped cs(_sendCritSect);
+    avg_encode_time_ms = stats_.AvgEncodeTimeMs();
+    max_encode_time_ms = stats_.MaxEncodeTimeMs();
+  }
+  if (avg_encode_time_ms != -1) {
+    RTC_HISTOGRAM_COUNTS_1000("WebRTC.Video.AvgEncodeTimeInMs",
+        avg_encode_time_ms);
+  }
+  if (max_encode_time_ms != -1) {
+    RTC_HISTOGRAM_COUNTS_1000("WebRTC.Video.MaxEncodeTimeInMs",
+        max_encode_time_ms);
+  }
+}
+
 int32_t VideoSender::Process() {
   int32_t returnValue = VCM_OK;
 
   if (_sendStatsTimer.TimeUntilProcess() == 0) {
     _sendStatsTimer.Processed();
     CriticalSectionScoped cs(process_crit_sect_.get());
     if (_sendStatsCallback != nullptr) {
       uint32_t bitRate = _mediaOpt.SentBitRate();
       uint32_t frameRate = _mediaOpt.SentFrameRate();
       _sendStatsCallback->SendStatistics(bitRate, frameRate);
@@ skipping 255 matching lines @@
     return VCM_PARAMETER_ERROR;
   }
   VideoFrame converted_frame = videoFrame;
   if (converted_frame.native_handle() && !_encoder->SupportsNativeHandle()) {
     // This module only supports software encoding.
     // TODO(pbos): Offload conversion from the encoder thread.
     converted_frame = converted_frame.ConvertNativeToI420Frame();
     CHECK(!converted_frame.IsZeroSize())
         << "Frame conversion failed, won't be able to encode frame.";
   }
+  int64_t encode_start_time_ms = clock_->TimeInMilliseconds();
   int32_t ret =
       _encoder->Encode(converted_frame, codecSpecificInfo, _nextFrameTypes);
   if (ret < 0) {
     LOG(LS_ERROR) << "Failed to encode frame. Error code: " << ret;
     return ret;
   }
+  stats_.Update(clock_->TimeInMilliseconds() - encode_start_time_ms);
+
   for (size_t i = 0; i < _nextFrameTypes.size(); ++i) {
     _nextFrameTypes[i] = kVideoFrameDelta;  // Default frame type.
   }
   return VCM_OK;
 }
 
 int32_t VideoSender::IntraFrameRequest(int stream_index) {
   CriticalSectionScoped cs(_sendCritSect);
   if (stream_index < 0 ||
       static_cast<unsigned int>(stream_index) >= _nextFrameTypes.size()) {
@@ skipping 28 matching lines @@
   // Set the hysteresis window to be at 10% of the threshold, but at least
   // 10 kbps.
   int window_bps = std::max(threshold_bps / 10, 10000);
   _mediaOpt.SuspendBelowMinBitrate(threshold_bps, window_bps);
 }
 
 bool VideoSender::VideoSuspended() const {
   CriticalSectionScoped cs(_sendCritSect);
   return _mediaOpt.IsVideoSuspended();
 }
+
+void VideoSender::EncodedFrameStats::Update(int64_t encode_time_ms) {
+  sum_encode_time_ms += encode_time_ms;
+  max_encode_time_ms = std::max(max_encode_time_ms, encode_time_ms);
+  ++encoded_frames;
+}
 }  // namespace vcm
 }  // namespace webrtc