diff options
author | pbos@webrtc.org <pbos@webrtc.org> | 2014-11-14 11:52:04 +0000 |
---|---|---|
committer | pbos@webrtc.org <pbos@webrtc.org> | 2014-11-14 11:52:04 +0000 |
commit | ece3890d3a40fe911ae895e28c329491e795b14d (patch) | |
tree | 4cff912ea0f1695ba2aa658d5ec87e129cbac5d2 /webrtc/voice_engine/test/auto_test | |
parent | 35c1ace18532b50ff274f65b1369889baefca319 (diff) | |
download | webrtc-ece3890d3a40fe911ae895e28c329491e795b14d.tar.gz |
Report total bitrate for all streams in GetStats.
This regression wasn't caught because I accidentally disabled multiple
streams for EndToEndTest.GetStats in a refactoring.
R=stefan@webrtc.org, xians@webrtc.org
BUG=1667
Review URL: https://webrtc-codereview.appspot.com/27179004
git-svn-id: http://webrtc.googlecode.com/svn/trunk@7701 4adac7df-926f-26a2-2b94-8c16560cd09d
Diffstat (limited to 'webrtc/voice_engine/test/auto_test')
-rw-r--r-- | webrtc/voice_engine/test/auto_test/standard/rtp_rtcp_test.cc | 34 |
1 files changed, 0 insertions, 34 deletions
diff --git a/webrtc/voice_engine/test/auto_test/standard/rtp_rtcp_test.cc b/webrtc/voice_engine/test/auto_test/standard/rtp_rtcp_test.cc index 9a732c0e2b..5ba84216e5 100644 --- a/webrtc/voice_engine/test/auto_test/standard/rtp_rtcp_test.cc +++ b/webrtc/voice_engine/test/auto_test/standard/rtp_rtcp_test.cc @@ -55,23 +55,6 @@ void TestRtpObserver::OnIncomingSSRCChanged(int channel, } } -class RtcpAppHandler : public webrtc::VoERTCPObserver { - public: - RtcpAppHandler() : length_in_bytes_(0), sub_type_(0), name_(0) {} - void OnApplicationDataReceived(int channel, - unsigned char sub_type, - unsigned int name, - const unsigned char* data, - unsigned short length_in_bytes); - void Reset(); - ~RtcpAppHandler() {} - unsigned short length_in_bytes_; - unsigned char data_[256]; - unsigned char sub_type_; - unsigned int name_; -}; - - static const char* const RTCP_CNAME = "Whatever"; class RtpRtcpTest : public AfterStreamingFixture { @@ -104,23 +87,6 @@ class RtpRtcpTest : public AfterStreamingFixture { LoopBackTransport* transport_; }; -void RtcpAppHandler::OnApplicationDataReceived( - const int /*channel*/, unsigned char sub_type, - unsigned int name, const unsigned char* data, - unsigned short length_in_bytes) { - length_in_bytes_ = length_in_bytes; - memcpy(data_, &data[0], length_in_bytes); - sub_type_ = sub_type; - name_ = name; -} - -void RtcpAppHandler::Reset() { - length_in_bytes_ = 0; - memset(data_, 0, sizeof(data_)); - sub_type_ = 0; - name_ = 0; -} - TEST_F(RtpRtcpTest, RemoteRtcpCnameHasPropagatedToRemoteSide) { if (!FLAGS_include_timing_dependent_tests) { TEST_LOG("Skipping test - running in slow execution environment...\n"); |