Move RTCP histograms from vie_channel to video channel stats proxies.

webrtc/video/vie_channel.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 162 matching lines @@
   }
   for (size_t i = 0; i < num_active_rtp_rtcp_modules_; ++i)
     packet_router_->RemoveRtpModule(rtp_rtcp_modules_[i], sender_);
   for (RtpRtcp* rtp_rtcp : rtp_rtcp_modules_) {
     module_process_thread_->DeRegisterModule(rtp_rtcp);
     delete rtp_rtcp;
   }
 }
 
 void ViEChannel::UpdateHistograms() {
-  int64_t now = Clock::GetRealTimeClock()->TimeInMilliseconds();
-
   if (sender_) {
-    RtcpPacketTypeCounter rtcp_counter;
-    GetSendRtcpPacketTypeCounter(&rtcp_counter);
-    int64_t elapsed_sec = rtcp_counter.TimeSinceFirstPacketInMs(now) / 1000;
-    if (elapsed_sec > metrics::kMinRunTimeInSeconds) {
-      RTC_HISTOGRAM_COUNTS_10000("WebRTC.Video.NackPacketsReceivedPerMinute",
-                                 rtcp_counter.nack_packets * 60 / elapsed_sec);
-      RTC_HISTOGRAM_COUNTS_10000("WebRTC.Video.FirPacketsReceivedPerMinute",
-                                 rtcp_counter.fir_packets * 60 / elapsed_sec);
-      RTC_HISTOGRAM_COUNTS_10000("WebRTC.Video.PliPacketsReceivedPerMinute",
-                                 rtcp_counter.pli_packets * 60 / elapsed_sec);
-      if (rtcp_counter.nack_requests > 0) {
-        RTC_HISTOGRAM_PERCENTAGE(
-            "WebRTC.Video.UniqueNackRequestsReceivedInPercent",
-            rtcp_counter.UniqueNackRequestsInPercent());
-      }
-    }
-
     StreamDataCounters rtp;
     StreamDataCounters rtx;
     GetSendStreamDataCounters(&rtp, &rtx);
     StreamDataCounters rtp_rtx = rtp;
     rtp_rtx.Add(rtx);
-    elapsed_sec = rtp_rtx.TimeSinceFirstPacketInMs(
-                      Clock::GetRealTimeClock()->TimeInMilliseconds()) /
-                  1000;
+    int64_t elapsed_sec = rtp_rtx.TimeSinceFirstPacketInMs(
+                              Clock::GetRealTimeClock()->TimeInMilliseconds()) /
+                          1000;
     if (elapsed_sec > metrics::kMinRunTimeInSeconds) {
       RTC_HISTOGRAM_COUNTS_100000(
           "WebRTC.Video.BitrateSentInKbps",
           static_cast<int>(rtp_rtx.transmitted.TotalBytes() * 8 / elapsed_sec /
                            1000));
       RTC_HISTOGRAM_COUNTS_10000(
           "WebRTC.Video.MediaBitrateSentInKbps",
           static_cast<int>(rtp.MediaPayloadBytes() * 8 / elapsed_sec / 1000));
       RTC_HISTOGRAM_COUNTS_10000(
           "WebRTC.Video.PaddingBitrateSentInKbps",
@@ skipping 13 matching lines @@
       uint8_t pltype_red;
       uint8_t pltype_fec;
       rtp_rtcp_modules_[0]->GenericFECStatus(&fec_enabled, &pltype_red,
                                              &pltype_fec);
       if (fec_enabled) {
         RTC_HISTOGRAM_COUNTS_10000("WebRTC.Video.FecBitrateSentInKbps",
                                    static_cast<int>(rtp_rtx.fec.TotalBytes() *
                                                     8 / elapsed_sec / 1000));
       }
     }
-  } else if (vie_receiver_.GetRemoteSsrc() > 0) {
-    // Get receive stats if we are receiving packets, i.e. there is a remote
-    // ssrc.
-    RtcpPacketTypeCounter rtcp_counter;
-    GetReceiveRtcpPacketTypeCounter(&rtcp_counter);
-    int64_t elapsed_sec = rtcp_counter.TimeSinceFirstPacketInMs(now) / 1000;
-    if (elapsed_sec > metrics::kMinRunTimeInSeconds) {
-      RTC_HISTOGRAM_COUNTS_10000("WebRTC.Video.NackPacketsSentPerMinute",
-                                 rtcp_counter.nack_packets * 60 / elapsed_sec);
-      RTC_HISTOGRAM_COUNTS_10000("WebRTC.Video.FirPacketsSentPerMinute",
-                                 rtcp_counter.fir_packets * 60 / elapsed_sec);
-      RTC_HISTOGRAM_COUNTS_10000("WebRTC.Video.PliPacketsSentPerMinute",
-                                 rtcp_counter.pli_packets * 60 / elapsed_sec);
-      if (rtcp_counter.nack_requests > 0) {
-        RTC_HISTOGRAM_PERCENTAGE("WebRTC.Video.UniqueNackRequestsSentInPercent",
-                                 rtcp_counter.UniqueNackRequestsInPercent());
-      }
-    }
   }
 }
 
 int32_t ViEChannel::SetSendCodec(const VideoCodec& video_codec,
                                  bool new_stream) {
   RTC_DCHECK(sender_);
   if (video_codec.codecType == kVideoCodecRED ||
       video_codec.codecType == kVideoCodecULPFEC) {
     LOG_F(LS_ERROR) << "Not a valid send codec " << video_codec.codecType;
     return -1;
@@ skipping 234 matching lines @@
   *rtx_counters = StreamDataCounters();
   for (RtpRtcp* rtp_rtcp : rtp_rtcp_modules_) {
     StreamDataCounters rtp_data;
     StreamDataCounters rtx_data;
     rtp_rtcp->GetSendStreamDataCounters(&rtp_data, &rtx_data);
     rtp_counters->Add(rtp_data);
     rtx_counters->Add(rtx_data);
   }
 }
 
-void ViEChannel::GetSendRtcpPacketTypeCounter(
-    RtcpPacketTypeCounter* packet_counter) const {
-  std::map<uint32_t, RtcpPacketTypeCounter> counter_map =
-      rtcp_packet_type_counter_observer_.GetPacketTypeCounterMap();
-
-  RtcpPacketTypeCounter counter;
-  for (RtpRtcp* rtp_rtcp : rtp_rtcp_modules_)
-    counter.Add(counter_map[rtp_rtcp->SSRC()]);
-  *packet_counter = counter;
-}
-
-void ViEChannel::GetReceiveRtcpPacketTypeCounter(
-    RtcpPacketTypeCounter* packet_counter) const {
-  std::map<uint32_t, RtcpPacketTypeCounter> counter_map =
-      rtcp_packet_type_counter_observer_.GetPacketTypeCounterMap();
-
-  RtcpPacketTypeCounter counter;
-  counter.Add(counter_map[vie_receiver_.GetRemoteSsrc()]);
-
-  *packet_counter = counter;
-}
-
 void ViEChannel::RegisterSendSideDelayObserver(
     SendSideDelayObserver* observer) {
   send_side_delay_observer_.Set(observer);
 }
 
 void ViEChannel::RegisterSendBitrateObserver(
     BitrateStatisticsObserver* observer) {
   send_bitrate_observer_.Set(observer);
 }
 
@@ skipping 244 matching lines @@
   rtc::CritScope lock(&crit_);
   receive_stats_callback_ = receive_statistics_proxy;
 }
 
 void ViEChannel::SetIncomingVideoStream(
     IncomingVideoStream* incoming_video_stream) {
   rtc::CritScope lock(&crit_);
   incoming_video_stream_ = incoming_video_stream;
 }
 }  // namespace webrtc