| Index: webrtc/video/vie_channel.cc
|
| diff --git a/webrtc/video/vie_channel.cc b/webrtc/video/vie_channel.cc
|
| index 97957352fe9249c320a20453bc810b9c4d570410..63ac13c07b6a6fac3e006aa0be714954adb4586c 100644
|
| --- a/webrtc/video/vie_channel.cc
|
| +++ b/webrtc/video/vie_channel.cc
|
| @@ -164,7 +164,6 @@ int32_t ViEChannel::Init() {
|
| }
|
|
|
| ViEChannel::~ViEChannel() {
|
| - UpdateHistograms();
|
| // Make sure we don't get more callbacks from the RTP module.
|
| module_process_thread_->DeRegisterModule(
|
| vie_receiver_.GetReceiveStatistics());
|
| @@ -179,52 +178,6 @@ ViEChannel::~ViEChannel() {
|
| }
|
| }
|
|
|
| -void ViEChannel::UpdateHistograms() {
|
| - if (sender_) {
|
| - StreamDataCounters rtp;
|
| - StreamDataCounters rtx;
|
| - GetSendStreamDataCounters(&rtp, &rtx);
|
| - StreamDataCounters rtp_rtx = rtp;
|
| - rtp_rtx.Add(rtx);
|
| - 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",
|
| - static_cast<int>(rtp_rtx.transmitted.padding_bytes * 8 / elapsed_sec /
|
| - 1000));
|
| - RTC_HISTOGRAM_COUNTS_10000(
|
| - "WebRTC.Video.RetransmittedBitrateSentInKbps",
|
| - static_cast<int>(rtp_rtx.retransmitted.TotalBytes() * 8 /
|
| - elapsed_sec / 1000));
|
| - if (rtp_rtcp_modules_[0]->RtxSendStatus() != kRtxOff) {
|
| - RTC_HISTOGRAM_COUNTS_10000(
|
| - "WebRTC.Video.RtxBitrateSentInKbps",
|
| - static_cast<int>(rtx.transmitted.TotalBytes() * 8 / elapsed_sec /
|
| - 1000));
|
| - }
|
| - bool fec_enabled = false;
|
| - 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));
|
| - }
|
| - }
|
| - }
|
| -}
|
| -
|
| int32_t ViEChannel::SetSendCodec(const VideoCodec& video_codec,
|
| bool new_stream) {
|
| RTC_DCHECK(sender_);
|
|
|