zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Update packetsLost and jitter stats any time a packet is received."

Browse Source 
This reverts commit 84916937b70472715efe5682bc273e91c3a72695.

Reason for revert: breaking downstream projects.

Original change's description:
> Update packetsLost and jitter stats any time a packet is received.
>
> Before this CL, the packetsLost and jitter stats (as returned by
> GetStats, at the API level) were only being updated when an RTCP SR or
> RR is generated. According to the stats spec, "local" stats like this
> should be updated any time a packet is received.
>
> This CL also fixes some minor issues with the calculation of packetsLost
> (and fractionLost):
> * Packets weren't being count as lost if lost over a sequence number
>   rollover.
> * Temporary periods of "negative" loss (caused by duplicate or out of
>   order packets) weren't being accumulated into the cumulative loss
>   counter. Example:
>   Period 1: Received packets 1, 2, 4
>     Loss over that period: 1 (expected 4 packets, got 3)
>     Reported cumulative loss: 1
>   Period 2: Received packets 3, 5
>     Loss over that period: -1 (expected 1 packet, got 2)
>     Reported cumulative loss: 1 (should be 0!)
>
> Landing with NOTRY because Android compile bots are broken for an
> unrelated reason.
> NOTRY=True
>
> Bug: webrtc:8804
> Change-Id: I840ba34de8957b1276f6bdaf93718f805629f5c8
> Reviewed-on: https://webrtc-review.googlesource.com/50020
> Commit-Queue: Taylor Brandstetter <deadbeef@webrtc.org>
> Reviewed-by: Danil Chapovalov <danilchap@webrtc.org>
> Reviewed-by: Oskar Sundbom <ossu@webrtc.org>
> Cr-Commit-Position: refs/heads/master@{#23731}

TBR=danilchap@webrtc.org,deadbeef@webrtc.org,ossu@webrtc.org

# Not skipping CQ checks because original CL landed > 1 day ago.

Landing with NOTRY because ios64_sim_ios10_dbg bot is broken.
Passing all other bots.
NOTRY=True

Bug: webrtc:8804
Change-Id: I07bd6b1206d5a8d211792ad392842f9ed6c505e9
Reviewed-on: https://webrtc-review.googlesource.com/95280
Commit-Queue: Qingsi Wang <qingsi@webrtc.org>
Reviewed-by: Qingsi Wang <qingsi@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#24370}
This commit is contained in:
Qingsi Wang
2018-08-21 14:24:26 -07:00
committed by Commit Bot
parent ddbbf4601b
commit 2370b0831f
5 changed files with 150 additions and 534 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
modules/rtp_rtcp/source/receive_statistics_impl.h
View File

@ -13,8 +13,6 @@
#include "modules/rtp_rtcp/include/receive_statistics.h"
#include <math.h>
#include <algorithm>
#include <map>
#include <vector>
@ -33,8 +31,8 @@ class StreamStatisticianImpl : public StreamStatistician {
StreamDataCountersCallback* rtp_callback);
~StreamStatisticianImpl() override;
bool GetStatistics(RtcpStatistics* statistics,
bool update_fraction_lost) override;
// |reset| here and in next method restarts calculation of fraction_lost stat.
bool GetStatistics(RtcpStatistics* statistics, bool reset) override;
bool GetActiveStatisticsAndReset(RtcpStatistics* statistics);
void GetDataCounters(size_t* bytes_received,
uint32_t* packets_received) const override;
@ -50,15 +48,13 @@ class StreamStatisticianImpl : public StreamStatistician {
void SetMaxReorderingThreshold(int max_reordering_threshold);
private:
bool InOrderPacketInternal(uint16_t sequence_number) const
RTC_EXCLUSIVE_LOCKS_REQUIRED(stream_lock_);
RtcpStatistics CalculateRtcpStatistics(bool update_fraction_lost)
bool InOrderPacketInternal(uint16_t sequence_number) const;
RtcpStatistics CalculateRtcpStatistics()
RTC_EXCLUSIVE_LOCKS_REQUIRED(stream_lock_);
void UpdateJitter(const RTPHeader& header, NtpTime receive_time);
StreamDataCounters UpdateCounters(const RTPHeader& rtp_header,
size_t packet_length,
bool retransmitted)
RTC_EXCLUSIVE_LOCKS_REQUIRED(stream_lock_);
bool retransmitted);
const uint32_t ssrc_;
Clock* const clock_;
@ -68,6 +64,7 @@ class StreamStatisticianImpl : public StreamStatistician {
// Stats on received RTP packets.
uint32_t jitter_q4_;
uint32_t cumulative_loss_;
int64_t last_receive_time_ms_;
NtpTime last_receive_time_ntp_;
@ -78,12 +75,13 @@ class StreamStatisticianImpl : public StreamStatistician {
// Current counter values.
size_t received_packet_overhead_;
StreamDataCounters receive_counters_ RTC_GUARDED_BY(stream_lock_);
StreamDataCounters receive_counters_;
// Used to calculate fraction_lost between reports.
uint32_t last_report_received_packets_ = 0;
uint32_t last_report_extended_seq_max_ = 0;
uint8_t last_fraction_lost_ = 0;
// Counter values when we sent the last report.
uint32_t last_report_inorder_packets_;
uint32_t last_report_old_packets_;
uint16_t last_report_seq_max_;
RtcpStatistics last_reported_statistics_;
// stream_lock_ shouldn't be held when calling callbacks.
RtcpStatisticsCallback* const rtcp_callback_;