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

Change ReceiveStatistics to implement RtpPacketSinkInterface, part 2.

Browse Source 
Delete the deprecated IncomingPacket method, and convert implementation
to use RtpPacketReceived rather than RTPHeader.

Part 1 was https://webrtc-review.googlesource.com/c/src/+/100104

Bug: webrtc:7135, webrtc:8016
Change-Id: Ib4840d947870403deea2f9067f847e4b0f182479
Reviewed-on: https://webrtc-review.googlesource.com/c/6762
Commit-Queue: Niels Moller <nisse@webrtc.org>
Reviewed-by: Danil Chapovalov <danilchap@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#25648}
This commit is contained in:
Niels Möller
2018-11-15 08:05:16 +01:00
committed by Commit Bot
parent 7af4ac8937
commit dbb988b016
6 changed files with 59 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -23,7 +23,8 @@
namespace webrtc {
class StreamStatisticianImpl : public StreamStatistician {
class StreamStatisticianImpl : public StreamStatistician,
public RtpPacketSinkInterface {
public:
StreamStatisticianImpl(uint32_t ssrc,
Clock* clock,
@ -41,22 +42,23 @@ class StreamStatisticianImpl : public StreamStatistician {
StreamDataCounters* data_counters) const override;
uint32_t BitrateReceived() const override;
void IncomingPacket(const RTPHeader& rtp_header, size_t packet_length);
void FecPacketReceived(const RTPHeader& header, size_t packet_length);
// Implements RtpPacketSinkInterface
void OnRtpPacket(const RtpPacketReceived& packet) override;
void FecPacketReceived(const RtpPacketReceived& packet);
void SetMaxReorderingThreshold(int max_reordering_threshold);
void EnableRetransmitDetection(bool enable);
private:
bool IsRetransmitOfOldPacket(const RTPHeader& header) const
bool IsRetransmitOfOldPacket(const RtpPacketReceived& packet) const
RTC_EXCLUSIVE_LOCKS_REQUIRED(stream_lock_);
bool InOrderPacketInternal(uint16_t sequence_number) const
RTC_EXCLUSIVE_LOCKS_REQUIRED(stream_lock_);
RtcpStatistics CalculateRtcpStatistics()
RTC_EXCLUSIVE_LOCKS_REQUIRED(stream_lock_);
void UpdateJitter(const RTPHeader& header, NtpTime receive_time)
void UpdateJitter(const RtpPacketReceived& packet, NtpTime receive_time)
RTC_EXCLUSIVE_LOCKS_REQUIRED(stream_lock_);
StreamDataCounters UpdateCounters(const RTPHeader& rtp_header,
size_t packet_length,
StreamDataCounters UpdateCounters(const RtpPacketReceived& packet,
bool retransmitted)
RTC_EXCLUSIVE_LOCKS_REQUIRED(stream_lock_);
@ -102,14 +104,13 @@ class ReceiveStatisticsImpl : public ReceiveStatistics,
~ReceiveStatisticsImpl() override;
// Implement ReceiveStatisticsProvider.
// Implements ReceiveStatisticsProvider.
std::vector<rtcp::ReportBlock> RtcpReportBlocks(size_t max_blocks) override;
// Implement RtpPacketSinkInterface
// Implements RtpPacketSinkInterface
void OnRtpPacket(const RtpPacketReceived& packet) override;
// Implement ReceiveStatistics.
void IncomingPacket(const RTPHeader& header, size_t packet_length) override;
// Implements ReceiveStatistics.
void FecPacketReceived(const RtpPacketReceived& packet) override;
StreamStatistician* GetStatistician(uint32_t ssrc) const override;
void SetMaxReorderingThreshold(int max_reordering_threshold) override;