diff options
| author | stefan@webrtc.org <stefan@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2013-08-21 16:22:21 +0000 |
|---|---|---|
| committer | stefan@webrtc.org <stefan@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2013-08-21 16:22:21 +0000 |
| commit | efe1f0f566a6a102bce8d961a1135b987b41d36d (patch) | |
| tree | d6a148ced7e02132201bb173d655b1f5a105669b /voice_engine/channel.h | |
| parent | f96e534570fa51d8b8c310346ecc3de737d17536 (diff) | |
| download | webrtc-efe1f0f566a6a102bce8d961a1135b987b41d36d.tar.gz | |
Reverts a second set of reverts caused by a bug in a dependency.
Revert "Revert r4328"
Revert "Revert r4322 "Support sending multiple report blocks and keeping track
of statistics on"
BUG=1811
R=henrika@webrtc.org, pbos@webrtc.org, tina.legrand@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/2072004
git-svn-id: http://webrtc.googlecode.com/svn/trunk/webrtc@4582 4adac7df-926f-26a2-2b94-8c16560cd09d
Diffstat (limited to 'voice_engine/channel.h')
| -rw-r--r-- | voice_engine/channel.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/voice_engine/channel.h b/voice_engine/channel.h index f88dca47..34013069 100644 --- a/voice_engine/channel.h +++ b/voice_engine/channel.h @@ -329,12 +329,12 @@ public: RTPAliveType alive); void OnIncomingSSRCChanged(int32_t id, - uint32_t SSRC); + uint32_t ssrc); void OnIncomingCSRCChanged(int32_t id, uint32_t CSRC, bool added); - void ResetStatistics(); + void ResetStatistics(uint32_t ssrc); public: // From RtcpFeedback in the RTP/RTCP module |