diff --git a/webrtc/call/call.cc b/webrtc/call/call.cc index 111bc4562c..652cfb0294 100644 --- a/webrtc/call/call.cc +++ b/webrtc/call/call.cc @@ -252,12 +252,12 @@ void Call::UpdateSendHistograms() { estimated_send_bitrate_sum_kbits_ / num_bitrate_updates_; int pacer_bitrate_kbps = pacer_bitrate_sum_kbits_ / num_bitrate_updates_; if (send_bitrate_kbps > 0) { - RTC_HISTOGRAM_COUNTS_SPARSE_100000("WebRTC.Call.EstimatedSendBitrateInKbps", - send_bitrate_kbps); + RTC_HISTOGRAM_COUNTS_100000("WebRTC.Call.EstimatedSendBitrateInKbps", + send_bitrate_kbps); } if (pacer_bitrate_kbps > 0) { - RTC_HISTOGRAM_COUNTS_SPARSE_100000("WebRTC.Call.PacerBitrateInKbps", - pacer_bitrate_kbps); + RTC_HISTOGRAM_COUNTS_100000("WebRTC.Call.PacerBitrateInKbps", + pacer_bitrate_kbps); } } @@ -272,18 +272,18 @@ void Call::UpdateReceiveHistograms() { int video_bitrate_kbps = received_video_bytes_ * 8 / elapsed_sec / 1000; int rtcp_bitrate_bps = received_rtcp_bytes_ * 8 / elapsed_sec; if (video_bitrate_kbps > 0) { - RTC_HISTOGRAM_COUNTS_SPARSE_100000("WebRTC.Call.VideoBitrateReceivedInKbps", - video_bitrate_kbps); + RTC_HISTOGRAM_COUNTS_100000("WebRTC.Call.VideoBitrateReceivedInKbps", + video_bitrate_kbps); } if (audio_bitrate_kbps > 0) { - RTC_HISTOGRAM_COUNTS_SPARSE_100000("WebRTC.Call.AudioBitrateReceivedInKbps", - audio_bitrate_kbps); + RTC_HISTOGRAM_COUNTS_100000("WebRTC.Call.AudioBitrateReceivedInKbps", + audio_bitrate_kbps); } if (rtcp_bitrate_bps > 0) { - RTC_HISTOGRAM_COUNTS_SPARSE_100000("WebRTC.Call.RtcpBitrateReceivedInBps", - rtcp_bitrate_bps); + RTC_HISTOGRAM_COUNTS_100000("WebRTC.Call.RtcpBitrateReceivedInBps", + rtcp_bitrate_bps); } - RTC_HISTOGRAM_COUNTS_SPARSE_100000( + RTC_HISTOGRAM_COUNTS_100000( "WebRTC.Call.BitrateReceivedInKbps", audio_bitrate_kbps + video_bitrate_kbps + rtcp_bitrate_bps / 1000); } diff --git a/webrtc/modules/bitrate_controller/send_side_bandwidth_estimation.cc b/webrtc/modules/bitrate_controller/send_side_bandwidth_estimation.cc index bdd980db43..001937a217 100644 --- a/webrtc/modules/bitrate_controller/send_side_bandwidth_estimation.cc +++ b/webrtc/modules/bitrate_controller/send_side_bandwidth_estimation.cc @@ -165,19 +165,19 @@ void SendSideBandwidthEstimation::UpdateUmaStats(int64_t now_ms, } else if (uma_update_state_ == kNoUpdate) { uma_update_state_ = kFirstDone; bitrate_at_2_seconds_kbps_ = bitrate_kbps; - RTC_HISTOGRAM_COUNTS_SPARSE("WebRTC.BWE.InitiallyLostPackets", - initially_lost_packets_, 0, 100, 50); - RTC_HISTOGRAM_COUNTS_SPARSE("WebRTC.BWE.InitialRtt", static_cast(rtt), - 0, 2000, 50); - RTC_HISTOGRAM_COUNTS_SPARSE("WebRTC.BWE.InitialBandwidthEstimate", - bitrate_at_2_seconds_kbps_, 0, 2000, 50); + RTC_HISTOGRAM_COUNTS("WebRTC.BWE.InitiallyLostPackets", + initially_lost_packets_, 0, 100, 50); + RTC_HISTOGRAM_COUNTS("WebRTC.BWE.InitialRtt", static_cast(rtt), 0, + 2000, 50); + RTC_HISTOGRAM_COUNTS("WebRTC.BWE.InitialBandwidthEstimate", + bitrate_at_2_seconds_kbps_, 0, 2000, 50); } else if (uma_update_state_ == kFirstDone && now_ms - first_report_time_ms_ >= kBweConverganceTimeMs) { uma_update_state_ = kDone; int bitrate_diff_kbps = std::max(bitrate_at_2_seconds_kbps_ - bitrate_kbps, 0); - RTC_HISTOGRAM_COUNTS_SPARSE("WebRTC.BWE.InitialVsConvergedDiff", - bitrate_diff_kbps, 0, 2000, 50); + RTC_HISTOGRAM_COUNTS("WebRTC.BWE.InitialVsConvergedDiff", bitrate_diff_kbps, + 0, 2000, 50); } } diff --git a/webrtc/modules/video_coding/jitter_buffer.cc b/webrtc/modules/video_coding/jitter_buffer.cc index 640bcb4f22..663bf03a7f 100644 --- a/webrtc/modules/video_coding/jitter_buffer.cc +++ b/webrtc/modules/video_coding/jitter_buffer.cc @@ -281,18 +281,18 @@ void VCMJitterBuffer::UpdateHistograms() { return; } - RTC_HISTOGRAM_PERCENTAGE_SPARSE("WebRTC.Video.DiscardedPacketsInPercent", - num_discarded_packets_ * 100 / num_packets_); - RTC_HISTOGRAM_PERCENTAGE_SPARSE("WebRTC.Video.DuplicatedPacketsInPercent", - num_duplicated_packets_ * 100 / num_packets_); + RTC_HISTOGRAM_PERCENTAGE("WebRTC.Video.DiscardedPacketsInPercent", + num_discarded_packets_ * 100 / num_packets_); + RTC_HISTOGRAM_PERCENTAGE("WebRTC.Video.DuplicatedPacketsInPercent", + num_duplicated_packets_ * 100 / num_packets_); int total_frames = receive_statistics_.key_frames + receive_statistics_.delta_frames; if (total_frames > 0) { - RTC_HISTOGRAM_COUNTS_SPARSE_100( + RTC_HISTOGRAM_COUNTS_100( "WebRTC.Video.CompleteFramesReceivedPerSecond", static_cast((total_frames / elapsed_sec) + 0.5f)); - RTC_HISTOGRAM_COUNTS_SPARSE_1000( + RTC_HISTOGRAM_COUNTS_1000( "WebRTC.Video.KeyFramesReceivedInPermille", static_cast( (receive_statistics_.key_frames * 1000.0f / total_frames) + 0.5f)); diff --git a/webrtc/modules/video_coding/timing.cc b/webrtc/modules/video_coding/timing.cc index 08dc307524..680860a191 100644 --- a/webrtc/modules/video_coding/timing.cc +++ b/webrtc/modules/video_coding/timing.cc @@ -62,14 +62,14 @@ void VCMTiming::UpdateHistograms() const { if (elapsed_sec < metrics::kMinRunTimeInSeconds) { return; } - RTC_HISTOGRAM_COUNTS_SPARSE_100( + RTC_HISTOGRAM_COUNTS_100( "WebRTC.Video.DecodedFramesPerSecond", static_cast((num_decoded_frames_ / elapsed_sec) + 0.5f)); - RTC_HISTOGRAM_PERCENTAGE_SPARSE( + RTC_HISTOGRAM_PERCENTAGE( "WebRTC.Video.DelayedFramesToRenderer", num_delayed_decoded_frames_ * 100 / num_decoded_frames_); if (num_delayed_decoded_frames_ > 0) { - RTC_HISTOGRAM_COUNTS_SPARSE_1000( + RTC_HISTOGRAM_COUNTS_1000( "WebRTC.Video.DelayedFramesToRenderer_AvgDelayInMs", sum_missed_render_deadline_ms_ / num_delayed_decoded_frames_); } diff --git a/webrtc/video/receive_statistics_proxy.cc b/webrtc/video/receive_statistics_proxy.cc index 9a49b6424d..649ea0cd6e 100644 --- a/webrtc/video/receive_statistics_proxy.cc +++ b/webrtc/video/receive_statistics_proxy.cc @@ -36,39 +36,38 @@ ReceiveStatisticsProxy::~ReceiveStatisticsProxy() { void ReceiveStatisticsProxy::UpdateHistograms() { int fraction_lost = report_block_stats_.FractionLostInPercent(); if (fraction_lost != -1) { - RTC_HISTOGRAM_PERCENTAGE_SPARSE("WebRTC.Video.ReceivedPacketsLostInPercent", - fraction_lost); + RTC_HISTOGRAM_PERCENTAGE("WebRTC.Video.ReceivedPacketsLostInPercent", + fraction_lost); } const int kMinRequiredSamples = 200; int samples = static_cast(render_fps_tracker_.TotalSampleCount()); if (samples > kMinRequiredSamples) { - RTC_HISTOGRAM_COUNTS_SPARSE_100("WebRTC.Video.RenderFramesPerSecond", - round(render_fps_tracker_.ComputeTotalRate())); - RTC_HISTOGRAM_COUNTS_SPARSE_100000("WebRTC.Video.RenderSqrtPixelsPerSecond", + RTC_HISTOGRAM_COUNTS_100("WebRTC.Video.RenderFramesPerSecond", + round(render_fps_tracker_.ComputeTotalRate())); + RTC_HISTOGRAM_COUNTS_100000( + "WebRTC.Video.RenderSqrtPixelsPerSecond", round(render_pixel_tracker_.ComputeTotalRate())); } int width = render_width_counter_.Avg(kMinRequiredSamples); int height = render_height_counter_.Avg(kMinRequiredSamples); if (width != -1) { - RTC_HISTOGRAM_COUNTS_SPARSE_10000("WebRTC.Video.ReceivedWidthInPixels", - width); - RTC_HISTOGRAM_COUNTS_SPARSE_10000("WebRTC.Video.ReceivedHeightInPixels", - height); + RTC_HISTOGRAM_COUNTS_10000("WebRTC.Video.ReceivedWidthInPixels", width); + RTC_HISTOGRAM_COUNTS_10000("WebRTC.Video.ReceivedHeightInPixels", height); } int qp = qp_counters_.vp8.Avg(kMinRequiredSamples); if (qp != -1) - RTC_HISTOGRAM_COUNTS_SPARSE_200("WebRTC.Video.Decoded.Vp8.Qp", qp); + RTC_HISTOGRAM_COUNTS_200("WebRTC.Video.Decoded.Vp8.Qp", qp); // TODO(asapersson): DecoderTiming() is call periodically (each 1000ms) and // not per frame. Change decode time to include every frame. const int kMinRequiredDecodeSamples = 5; int decode_ms = decode_time_counter_.Avg(kMinRequiredDecodeSamples); if (decode_ms != -1) - RTC_HISTOGRAM_COUNTS_SPARSE_1000("WebRTC.Video.DecodeTimeInMs", decode_ms); + RTC_HISTOGRAM_COUNTS_1000("WebRTC.Video.DecodeTimeInMs", decode_ms); int delay_ms = delay_counter_.Avg(kMinRequiredDecodeSamples); if (delay_ms != -1) - RTC_HISTOGRAM_COUNTS_SPARSE_10000("WebRTC.Video.OnewayDelayInMs", delay_ms); + RTC_HISTOGRAM_COUNTS_10000("WebRTC.Video.OnewayDelayInMs", delay_ms); } VideoReceiveStream::Stats ReceiveStatisticsProxy::GetStats() const { diff --git a/webrtc/video/send_statistics_proxy.cc b/webrtc/video/send_statistics_proxy.cc index 281d1950bb..83399a9013 100644 --- a/webrtc/video/send_statistics_proxy.cc +++ b/webrtc/video/send_statistics_proxy.cc @@ -56,8 +56,9 @@ HistogramCodecType PayloadNameToHistogramCodecType( } void UpdateCodecTypeHistogram(const std::string& payload_name) { - RTC_HISTOGRAM_ENUMERATION_SPARSE("WebRTC.Video.Encoder.CodecType", - PayloadNameToHistogramCodecType(payload_name), kVideoMax); + RTC_HISTOGRAM_ENUMERATION("WebRTC.Video.Encoder.CodecType", + PayloadNameToHistogramCodecType(payload_name), + kVideoMax); } } // namespace diff --git a/webrtc/video/vie_channel.cc b/webrtc/video/vie_channel.cc index 63ab809acd..b1b0f0c4b8 100644 --- a/webrtc/video/vie_channel.cc +++ b/webrtc/video/vie_channel.cc @@ -199,7 +199,7 @@ void ViEChannel::UpdateHistograms() { if (time_of_first_rtt_ms_ != -1 && num_rtts_ > 0 && elapsed_sec > metrics::kMinRunTimeInSeconds) { int64_t avg_rtt_ms = (rtt_sum_ms_ + num_rtts_ / 2) / num_rtts_; - RTC_HISTOGRAM_COUNTS_SPARSE_10000( + RTC_HISTOGRAM_COUNTS_10000( "WebRTC.Video.AverageRoundTripTimeInMilliseconds", avg_rtt_ms); } } @@ -209,24 +209,21 @@ void ViEChannel::UpdateHistograms() { GetSendRtcpPacketTypeCounter(&rtcp_counter); int64_t elapsed_sec = rtcp_counter.TimeSinceFirstPacketInMs(now) / 1000; if (elapsed_sec > metrics::kMinRunTimeInSeconds) { - RTC_HISTOGRAM_COUNTS_SPARSE_10000( - "WebRTC.Video.NackPacketsReceivedPerMinute", - rtcp_counter.nack_packets * 60 / elapsed_sec); - RTC_HISTOGRAM_COUNTS_SPARSE_10000( - "WebRTC.Video.FirPacketsReceivedPerMinute", - rtcp_counter.fir_packets * 60 / elapsed_sec); - RTC_HISTOGRAM_COUNTS_SPARSE_10000( - "WebRTC.Video.PliPacketsReceivedPerMinute", - rtcp_counter.pli_packets * 60 / elapsed_sec); + 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_SPARSE( + RTC_HISTOGRAM_PERCENTAGE( "WebRTC.Video.UniqueNackRequestsReceivedInPercent", rtcp_counter.UniqueNackRequestsInPercent()); } int fraction_lost = report_block_stats_sender_->FractionLostInPercent(); if (fraction_lost != -1) { - RTC_HISTOGRAM_PERCENTAGE_SPARSE("WebRTC.Video.SentPacketsLostInPercent", - fraction_lost); + RTC_HISTOGRAM_PERCENTAGE("WebRTC.Video.SentPacketsLostInPercent", + fraction_lost); } } @@ -239,23 +236,23 @@ void ViEChannel::UpdateHistograms() { Clock::GetRealTimeClock()->TimeInMilliseconds()) / 1000; if (elapsed_sec > metrics::kMinRunTimeInSeconds) { - RTC_HISTOGRAM_COUNTS_SPARSE_100000( + RTC_HISTOGRAM_COUNTS_100000( "WebRTC.Video.BitrateSentInKbps", static_cast(rtp_rtx.transmitted.TotalBytes() * 8 / elapsed_sec / 1000)); - RTC_HISTOGRAM_COUNTS_SPARSE_10000( + RTC_HISTOGRAM_COUNTS_10000( "WebRTC.Video.MediaBitrateSentInKbps", static_cast(rtp.MediaPayloadBytes() * 8 / elapsed_sec / 1000)); - RTC_HISTOGRAM_COUNTS_SPARSE_10000( + RTC_HISTOGRAM_COUNTS_10000( "WebRTC.Video.PaddingBitrateSentInKbps", static_cast(rtp_rtx.transmitted.padding_bytes * 8 / elapsed_sec / 1000)); - RTC_HISTOGRAM_COUNTS_SPARSE_10000( + RTC_HISTOGRAM_COUNTS_10000( "WebRTC.Video.RetransmittedBitrateSentInKbps", static_cast(rtp_rtx.retransmitted.TotalBytes() * 8 / elapsed_sec / 1000)); if (rtp_rtcp_modules_[0]->RtxSendStatus() != kRtxOff) { - RTC_HISTOGRAM_COUNTS_SPARSE_10000( + RTC_HISTOGRAM_COUNTS_10000( "WebRTC.Video.RtxBitrateSentInKbps", static_cast(rtx.transmitted.TotalBytes() * 8 / elapsed_sec / 1000)); @@ -266,10 +263,9 @@ void ViEChannel::UpdateHistograms() { rtp_rtcp_modules_[0]->GenericFECStatus(&fec_enabled, &pltype_red, &pltype_fec); if (fec_enabled) { - RTC_HISTOGRAM_COUNTS_SPARSE_10000( - "WebRTC.Video.FecBitrateSentInKbps", - static_cast(rtp_rtx.fec.TotalBytes() * 8 / elapsed_sec / - 1000)); + RTC_HISTOGRAM_COUNTS_10000("WebRTC.Video.FecBitrateSentInKbps", + static_cast(rtp_rtx.fec.TotalBytes() * + 8 / elapsed_sec / 1000)); } } } else if (vie_receiver_.GetRemoteSsrc() > 0) { @@ -279,19 +275,15 @@ void ViEChannel::UpdateHistograms() { GetReceiveRtcpPacketTypeCounter(&rtcp_counter); int64_t elapsed_sec = rtcp_counter.TimeSinceFirstPacketInMs(now) / 1000; if (elapsed_sec > metrics::kMinRunTimeInSeconds) { - RTC_HISTOGRAM_COUNTS_SPARSE_10000( - "WebRTC.Video.NackPacketsSentPerMinute", - rtcp_counter.nack_packets * 60 / elapsed_sec); - RTC_HISTOGRAM_COUNTS_SPARSE_10000( - "WebRTC.Video.FirPacketsSentPerMinute", - rtcp_counter.fir_packets * 60 / elapsed_sec); - RTC_HISTOGRAM_COUNTS_SPARSE_10000( - "WebRTC.Video.PliPacketsSentPerMinute", - rtcp_counter.pli_packets * 60 / elapsed_sec); + 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_SPARSE( - "WebRTC.Video.UniqueNackRequestsSentInPercent", - rtcp_counter.UniqueNackRequestsInPercent()); + RTC_HISTOGRAM_PERCENTAGE("WebRTC.Video.UniqueNackRequestsSentInPercent", + rtcp_counter.UniqueNackRequestsInPercent()); } } @@ -302,33 +294,32 @@ void ViEChannel::UpdateHistograms() { rtp_rtx.Add(rtx); elapsed_sec = rtp_rtx.TimeSinceFirstPacketInMs(now) / 1000; if (elapsed_sec > metrics::kMinRunTimeInSeconds) { - RTC_HISTOGRAM_COUNTS_SPARSE_10000( + RTC_HISTOGRAM_COUNTS_10000( "WebRTC.Video.BitrateReceivedInKbps", static_cast(rtp_rtx.transmitted.TotalBytes() * 8 / elapsed_sec / 1000)); - RTC_HISTOGRAM_COUNTS_SPARSE_10000( + RTC_HISTOGRAM_COUNTS_10000( "WebRTC.Video.MediaBitrateReceivedInKbps", static_cast(rtp.MediaPayloadBytes() * 8 / elapsed_sec / 1000)); - RTC_HISTOGRAM_COUNTS_SPARSE_10000( + RTC_HISTOGRAM_COUNTS_10000( "WebRTC.Video.PaddingBitrateReceivedInKbps", static_cast(rtp_rtx.transmitted.padding_bytes * 8 / elapsed_sec / 1000)); - RTC_HISTOGRAM_COUNTS_SPARSE_10000( + RTC_HISTOGRAM_COUNTS_10000( "WebRTC.Video.RetransmittedBitrateReceivedInKbps", static_cast(rtp_rtx.retransmitted.TotalBytes() * 8 / elapsed_sec / 1000)); uint32_t ssrc = 0; if (vie_receiver_.GetRtxSsrc(&ssrc)) { - RTC_HISTOGRAM_COUNTS_SPARSE_10000( + RTC_HISTOGRAM_COUNTS_10000( "WebRTC.Video.RtxBitrateReceivedInKbps", static_cast(rtx.transmitted.TotalBytes() * 8 / elapsed_sec / 1000)); } if (vie_receiver_.IsFecEnabled()) { - RTC_HISTOGRAM_COUNTS_SPARSE_10000( - "WebRTC.Video.FecBitrateReceivedInKbps", - static_cast(rtp_rtx.fec.TotalBytes() * 8 / elapsed_sec / - 1000)); + RTC_HISTOGRAM_COUNTS_10000("WebRTC.Video.FecBitrateReceivedInKbps", + static_cast(rtp_rtx.fec.TotalBytes() * + 8 / elapsed_sec / 1000)); } } } diff --git a/webrtc/video/vie_receiver.cc b/webrtc/video/vie_receiver.cc index da14a3ceff..0bb311a140 100644 --- a/webrtc/video/vie_receiver.cc +++ b/webrtc/video/vie_receiver.cc @@ -66,15 +66,14 @@ ViEReceiver::~ViEReceiver() { void ViEReceiver::UpdateHistograms() { FecPacketCounter counter = fec_receiver_->GetPacketCounter(); if (counter.num_packets > 0) { - RTC_HISTOGRAM_PERCENTAGE_SPARSE( + RTC_HISTOGRAM_PERCENTAGE( "WebRTC.Video.ReceivedFecPacketsInPercent", static_cast(counter.num_fec_packets * 100 / counter.num_packets)); } if (counter.num_fec_packets > 0) { - RTC_HISTOGRAM_PERCENTAGE_SPARSE( - "WebRTC.Video.RecoveredMediaPacketsInPercentOfFec", - static_cast(counter.num_recovered_packets * 100 / - counter.num_fec_packets)); + RTC_HISTOGRAM_PERCENTAGE("WebRTC.Video.RecoveredMediaPacketsInPercentOfFec", + static_cast(counter.num_recovered_packets * + 100 / counter.num_fec_packets)); } }