From 5de6b1a2114eceae8131c4911c59fef73ee35af2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20M=C3=B6ller?= Date: Wed, 11 Oct 2017 15:11:39 +0200 Subject: [PATCH] Delete remnants of support for RFC 5450, extended jitter report. Bug: None Change-Id: If8f90734d7a152b4d976465ade9d145a22df4d9f Reviewed-on: https://webrtc-review.googlesource.com/8500 Reviewed-by: Danil Chapovalov Reviewed-by: Stefan Holmer Commit-Queue: Niels Moller Commit-Queue: Stefan Holmer Cr-Commit-Position: refs/heads/master@{#20250} --- .../source/receive_statistics_impl.cc | 20 ------------------- .../rtp_rtcp/source/receive_statistics_impl.h | 2 -- 2 files changed, 22 deletions(-) diff --git a/modules/rtp_rtcp/source/receive_statistics_impl.cc b/modules/rtp_rtcp/source/receive_statistics_impl.cc index 7f3d5bb1eb..538ff7b2b7 100644 --- a/modules/rtp_rtcp/source/receive_statistics_impl.cc +++ b/modules/rtp_rtcp/source/receive_statistics_impl.cc @@ -40,10 +40,8 @@ StreamStatisticianImpl::StreamStatisticianImpl( max_reordering_threshold_(kDefaultMaxReorderingThreshold), jitter_q4_(0), cumulative_loss_(0), - jitter_q4_transmission_time_offset_(0), last_receive_time_ms_(0), last_received_timestamp_(0), - last_received_transmission_time_offset_(0), received_seq_first_(0), received_seq_max_(0), received_seq_wraps_(0), @@ -133,24 +131,6 @@ void StreamStatisticianImpl::UpdateJitter(const RTPHeader& header, int32_t jitter_diff_q4 = (time_diff_samples << 4) - jitter_q4_; jitter_q4_ += ((jitter_diff_q4 + 8) >> 4); } - - // Extended jitter report, RFC 5450. - // Actual network jitter, excluding the source-introduced jitter. - int32_t time_diff_samples_ext = - (receive_time_rtp - last_receive_time_rtp) - - ((header.timestamp + - header.extension.transmissionTimeOffset) - - (last_received_timestamp_ + - last_received_transmission_time_offset_)); - - time_diff_samples_ext = std::abs(time_diff_samples_ext); - - if (time_diff_samples_ext < 450000) { - int32_t jitter_diffQ4TransmissionTimeOffset = - (time_diff_samples_ext << 4) - jitter_q4_transmission_time_offset_; - jitter_q4_transmission_time_offset_ += - ((jitter_diffQ4TransmissionTimeOffset + 8) >> 4); - } } void StreamStatisticianImpl::FecPacketReceived(const RTPHeader& header, diff --git a/modules/rtp_rtcp/source/receive_statistics_impl.h b/modules/rtp_rtcp/source/receive_statistics_impl.h index dd17d77178..f0749a3744 100644 --- a/modules/rtp_rtcp/source/receive_statistics_impl.h +++ b/modules/rtp_rtcp/source/receive_statistics_impl.h @@ -67,12 +67,10 @@ class StreamStatisticianImpl : public StreamStatistician { // Stats on received RTP packets. uint32_t jitter_q4_; uint32_t cumulative_loss_; - uint32_t jitter_q4_transmission_time_offset_; int64_t last_receive_time_ms_; NtpTime last_receive_time_ntp_; uint32_t last_received_timestamp_; - int32_t last_received_transmission_time_offset_; uint16_t received_seq_first_; uint16_t received_seq_max_; uint16_t received_seq_wraps_;