Remove traces from {send,receive}_statistics_proxy.cc

webrtc/video/send_statistics_proxy.cc

Index: webrtc/video/send_statistics_proxy.cc
diff --git a/webrtc/video/send_statistics_proxy.cc b/webrtc/video/send_statistics_proxy.cc
index 898bedcfa5982ccf4344951779994d45a4de8253..651fb25fe02b67efaf7094ac6330f23f840843ef 100644
--- a/webrtc/video/send_statistics_proxy.cc
+++ b/webrtc/video/send_statistics_proxy.cc
@@ -18,7 +18,6 @@
 #include "webrtc/common_types.h"
 #include "webrtc/modules/video_coding/include/video_codec_interface.h"
 #include "webrtc/rtc_base/checks.h"
-#include "webrtc/rtc_base/logging.h"

[sprang_webrtc, 2017/07/24 14:28:32]

I think you removed the wrong include. logging.h should still be around, but
trace_event.h is not needed.

 #include "webrtc/rtc_base/trace_event.h"
 #include "webrtc/system_wrappers/include/metrics.h"
 
@@ -472,8 +471,6 @@ void SendStatisticsProxy::OnEncoderStatsUpdate(uint32_t framerate,
   rtc::CritScope lock(&crit_);
   stats_.encode_frame_rate = framerate;
   stats_.media_bitrate_bps = bitrate;
-  TRACE_EVENT_INSTANT2("webrtc_stats", "WebRTC.Video.FrameRateSent",
-      "frame_rate", framerate, "ssrc", rtp_config_.ssrcs[0]);
 }
 
 void SendStatisticsProxy::OnEncodedFrameTimeMeasured(
@@ -484,12 +481,6 @@ void SendStatisticsProxy::OnEncodedFrameTimeMeasured(
   encode_time_.Apply(1.0f, encode_time_ms);
   stats_.avg_encode_time_ms = round(encode_time_.filtered());
   stats_.encode_usage_percent = metrics.encode_usage_percent;
-  TRACE_EVENT_INSTANT2("webrtc_stats", "WebRTC.Video.EncodeTimeInMs",
-      "encode_time_ms", stats_.avg_encode_time_ms,
-      "ssrc", rtp_config_.ssrcs[0]);
-  TRACE_EVENT_INSTANT2("webrtc_stats", "WebRTC.Video.EncodeUsagePercent",
-      "encode_usage_percent", stats_.encode_usage_percent,
-      "ssrc", rtp_config_.ssrcs[0]);
 }
 
 void SendStatisticsProxy::OnSuspendChange(bool is_suspended) {
@@ -706,11 +697,6 @@ void SendStatisticsProxy::OnSendEncodedImage(
   uma_container_->max_sent_height_per_timestamp_ =
       std::max(uma_container_->max_sent_height_per_timestamp_,
                static_cast<int>(encoded_image._encodedHeight));
-
-  TRACE_EVENT_INSTANT2("webrtc_stats", "WebRTC.Video.SentWidthInPixels",
-      "frame_width", encoded_image._encodedWidth, "ssrc", ssrc);
-  TRACE_EVENT_INSTANT2("webrtc_stats", "WebRTC.Video.SentHeightInPixels",
-      "frame_height", encoded_image._encodedHeight, "ssrc", ssrc);
 }
 
 int SendStatisticsProxy::GetSendFrameRate() const {
@@ -728,10 +714,6 @@ void SendStatisticsProxy::OnIncomingFrame(int width, int height) {
     uma_container_->cpu_limited_frame_counter_.Add(
         stats_.cpu_limited_resolution);
   }
-  TRACE_EVENT_INSTANT2("webrtc_stats", "WebRTC.Video.InputFrameRate",
-      "frame_rate", round(
-          uma_container_->input_frame_rate_tracker_.ComputeRate()),
-      "ssrc", rtp_config_.ssrcs[0]);
 }
 
 void SendStatisticsProxy::SetAdaptationStats(
@@ -749,7 +731,6 @@ void SendStatisticsProxy::OnCpuAdaptationChanged(
   rtc::CritScope lock(&crit_);
   ++stats_.number_of_cpu_adapt_changes;
   UpdateAdaptationStats(cpu_counts, quality_counts);
-  TRACE_EVENT_INSTANT0("webrtc_stats", "WebRTC.Video.CpuAdaptationChanges");
 }
 
 void SendStatisticsProxy::OnQualityAdaptationChanged(
@@ -794,13 +775,6 @@ void SendStatisticsProxy::RtcpPacketTypesCounterUpdated(
   stats->rtcp_packet_type_counts = packet_counter;
   if (uma_container_->first_rtcp_stats_time_ms_ == -1)
     uma_container_->first_rtcp_stats_time_ms_ = clock_->TimeInMilliseconds();
-
-  TRACE_EVENT_INSTANT2("webrtc_stats", "WebRTC.Video.FirPacketsReceived",
-      "fir_packets_received", packet_counter.fir_packets, "ssrc", ssrc);
-  TRACE_EVENT_INSTANT2("webrtc_stats", "WebRTC.Video.NackPacketsReceived",
-      "nack_packets_received", packet_counter.nack_packets, "ssrc", ssrc);
-  TRACE_EVENT_INSTANT2("webrtc_stats", "WebRTC.Video.PliPacketsReceived",
-      "pli_packets_received", packet_counter.pli_packets, "ssrc", ssrc);
 }
 
 void SendStatisticsProxy::StatisticsUpdated(const RtcpStatistics& statistics,
@@ -812,9 +786,6 @@ void SendStatisticsProxy::StatisticsUpdated(const RtcpStatistics& statistics,
 
   stats->rtcp_stats = statistics;
   uma_container_->report_block_stats_.Store(statistics, 0, ssrc);
-
-  TRACE_EVENT_INSTANT2("webrtc_stats", "WebRTC.Video.SentPacketsLost",
-      "packets_lost", statistics.cumulative_lost, "ssrc", ssrc);
 }
 
 void SendStatisticsProxy::CNameChanged(const char* cname, uint32_t ssrc) {}
@@ -853,9 +824,6 @@ void SendStatisticsProxy::DataCountersUpdated(
   } else {
     uma_container_->media_byte_counter_.Set(counters.MediaPayloadBytes(), ssrc);
   }
-
-  TRACE_EVENT_INSTANT2("webrtc_stats", "WebRTC.Video.SentPackets",
-      "packets_sent", counters.transmitted.packets, "ssrc", ssrc);
 }
 
 void SendStatisticsProxy::Notify(uint32_t total_bitrate_bps,