Move sent key frame stats to send_statistics_proxy class.

webrtc/video_engine/vie_encoder.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.
  */
 
@@ skipping 119 matching lines @@
       network_is_transmitting_(true),
       encoder_paused_(false),
       encoder_paused_and_dropped_frame_(false),
       fec_enabled_(false),
       nack_enabled_(false),
       module_process_thread_(module_process_thread),
       has_received_sli_(false),
       picture_id_sli_(0),
       has_received_rpsi_(false),
       picture_id_rpsi_(0),
-      video_suspended_(false),
-      start_ms_(Clock::GetRealTimeClock()->TimeInMilliseconds()) {
+      video_suspended_(false) {
   bitrate_observer_.reset(new ViEBitrateObserver(this));
 }
 
 bool ViEEncoder::Init() {
   vpm_->EnableTemporalDecimation(true);
 
   // Enable/disable content analysis: off by default for now.
   vpm_->EnableContentAnalysis(false);
 
   if (vcm_->RegisterTransportCallback(this) != 0) {
@@ skipping 16 matching lines @@
 }
 
 void ViEEncoder::StopThreadsAndRemoveSharedMembers() {
   if (bitrate_allocator_)
     bitrate_allocator_->RemoveBitrateObserver(bitrate_observer_.get());
   module_process_thread_->DeRegisterModule(vcm_.get());
   module_process_thread_->DeRegisterModule(vpm_.get());
 }
 
 ViEEncoder::~ViEEncoder() {
-  UpdateHistograms();
-}
-
-void ViEEncoder::UpdateHistograms() {
-  int64_t elapsed_sec =
-      (Clock::GetRealTimeClock()->TimeInMilliseconds() - start_ms_) / 1000;
-  if (elapsed_sec < metrics::kMinRunTimeInSeconds) {
-    return;
-  }
-  webrtc::VCMFrameCount frames;
-  if (vcm_->SentFrameCount(frames) != VCM_OK) {
-    return;
-  }
-  uint32_t total_frames = frames.numKeyFrames + frames.numDeltaFrames;
-  if (total_frames > 0) {
-    RTC_HISTOGRAM_COUNTS_1000("WebRTC.Video.KeyFramesSentInPermille",
-        static_cast<int>(
-            (frames.numKeyFrames * 1000.0f / total_frames) + 0.5f));
-  }
 }
 
 int ViEEncoder::Owner() const {
   return channel_id_;
 }
 
 void ViEEncoder::SetNetworkTransmissionState(bool is_transmitting) {
   {
     CriticalSectionScoped cs(data_cs_.get());
     network_is_transmitting_ = is_transmitting;
@@ skipping 279 matching lines @@
     return;
   }
 #endif
   vcm_->AddVideoFrame(*output_frame);
 }
 
 int ViEEncoder::SendKeyFrame() {
   return vcm_->IntraFrameRequest(0);
 }
 
-int32_t ViEEncoder::SendCodecStatistics(
-    uint32_t* num_key_frames, uint32_t* num_delta_frames) {
-  webrtc::VCMFrameCount sent_frames;
-  if (vcm_->SentFrameCount(sent_frames) != VCM_OK) {
-    return -1;
-  }
-  *num_key_frames = sent_frames.numKeyFrames;
-  *num_delta_frames = sent_frames.numDeltaFrames;
-  return 0;
-}
-
 uint32_t ViEEncoder::LastObservedBitrateBps() const {
   CriticalSectionScoped cs(data_cs_.get());
   return last_observed_bitrate_bps_;
 }
 
 int ViEEncoder::CodecTargetBitrate(uint32_t* bitrate) const {
   if (vcm_->Bitrate(bitrate) != 0)
     return -1;
   return 0;
 }
@@ skipping 237 matching lines @@
     const uint32_t width,
     const uint32_t height) {
   return vpm_->SetTargetResolution(width, height, frame_rate);
 }
 
 void QMVideoSettingsCallback::SetTargetFramerate(int frame_rate) {
   vpm_->SetTargetFramerate(frame_rate);
 }
 
 }  // namespace webrtc