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

Add callbacks for receive channel RTCP statistics.

Browse Source 
This allows a listener to receive new statistics as it is generated - avoiding the need to poll. This also makes handling stats from multiple RTP streams more tractable.
The change is primarily targeted at the new video engine API.

TEST=Unit test in ReceiveStatisticsTest. Integration tests to follow as call tests when fully wired up.

BUG=2235
R=henrika@webrtc.org, pbos@webrtc.org, stefan@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/5089004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@5323 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
sprang@webrtc.org
2013-12-19 13:26:02 +00:00
parent e682aa5077
commit 54ae4ffb9e
12 changed files with 260 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
webrtc/modules/rtp_rtcp/source/receive_statistics_impl.h
View File

@ -25,11 +25,10 @@ class CriticalSectionWrapper;
class StreamStatisticianImpl : public StreamStatistician {
public:
explicit StreamStatisticianImpl(Clock* clock);
StreamStatisticianImpl(Clock* clock, RtcpStatisticsCallback* rtcp_callback);
virtual ~StreamStatisticianImpl() {}
virtual bool GetStatistics(Statistics* statistics, bool reset) OVERRIDE;
virtual bool GetStatistics(RtcpStatistics* statistics, bool reset) OVERRIDE;
virtual void GetDataCounters(uint32_t* bytes_received,
uint32_t* packets_received) const OVERRIDE;
virtual uint32_t BitrateReceived() const OVERRIDE;
@ -55,7 +54,6 @@ class StreamStatisticianImpl : public StreamStatistician {
// Stats on received RTP packets.
uint32_t jitter_q4_;
uint32_t jitter_max_q4_;
uint32_t cumulative_loss_;
uint32_t jitter_q4_transmission_time_offset_;
@ -79,10 +77,13 @@ class StreamStatisticianImpl : public StreamStatistician {
uint32_t last_report_inorder_packets_;
uint32_t last_report_old_packets_;
uint16_t last_report_seq_max_;
Statistics last_reported_statistics_;
RtcpStatistics last_reported_statistics_;
RtcpStatisticsCallback* const rtcp_callback_;
};
class ReceiveStatisticsImpl : public ReceiveStatistics {
class ReceiveStatisticsImpl : public ReceiveStatistics,
public RtcpStatisticsCallback {
public:
explicit ReceiveStatisticsImpl(Clock* clock);
@ -101,6 +102,12 @@ class ReceiveStatisticsImpl : public ReceiveStatistics {
void ChangeSsrc(uint32_t from_ssrc, uint32_t to_ssrc);
virtual void RegisterRtcpStatisticsCallback(RtcpStatisticsCallback* callback)
OVERRIDE;
virtual void StatisticsUpdated(const RtcpStatistics& statistics,
uint32_t ssrc) OVERRIDE;
private:
typedef std::map<uint32_t, StreamStatisticianImpl*> StatisticianImplMap;
@ -108,6 +115,8 @@ class ReceiveStatisticsImpl : public ReceiveStatistics {
scoped_ptr<CriticalSectionWrapper> crit_sect_;
int64_t last_rate_update_ms_;
StatisticianImplMap statisticians_;
RtcpStatisticsCallback* rtcp_stats_callback_;
};
} // namespace webrtc
#endif // WEBRTC_MODULES_RTP_RTCP_SOURCE_RECEIVE_STATISTICS_IMPL_H_