diff options
| author | pbos@webrtc.org <pbos@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2014-07-07 13:06:48 +0000 |
|---|---|---|
| committer | pbos@webrtc.org <pbos@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2014-07-07 13:06:48 +0000 |
| commit | 2fd91bd35094b909b4b3cce636454426fc893ac2 (patch) | |
| tree | ebeb24963e41255286ae4780781ab87c3002477c /test/call_test.cc | |
| parent | 857f9343b86c4a49fc81ea78cefd96dc2175b289 (diff) | |
| download | webrtc-2fd91bd35094b909b4b3cce636454426fc893ac2.tar.gz | |
Preserve RTP states for restarted VideoSendStreams.
A restarted VideoSendStream would previously be completely reset,
causing gaps in sequence numbers and potentially RTP timestamps as well.
This broke SRTP which requires fairly sequential sequence numbers.
Presumably, were this sent without SRTP, we'd still have problems on the
receiving end as the corresponding receiver is unaware of this reset.
Also adding annotation to RTPSender and addressing some unlocked
access to ssrc_, ssrc_rtx_ and rtx_.
BUG=
R=mflodman@webrtc.org, stefan@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/20819004
git-svn-id: http://webrtc.googlecode.com/svn/trunk/webrtc@6612 4adac7df-926f-26a2-2b94-8c16560cd09d
Diffstat (limited to 'test/call_test.cc')
| -rw-r--r-- | test/call_test.cc | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/test/call_test.cc b/test/call_test.cc index ec2f815f..16dad719 100644 --- a/test/call_test.cc +++ b/test/call_test.cc @@ -15,8 +15,9 @@ namespace webrtc { namespace test { CallTest::CallTest() - : send_stream_(NULL), - fake_encoder_(Clock::GetRealTimeClock()) { + : clock_(Clock::GetRealTimeClock()), + send_stream_(NULL), + fake_encoder_(clock_) { } CallTest::~CallTest() { } @@ -121,7 +122,7 @@ void CallTest::CreateFrameGeneratorCapturer() { stream.width, stream.height, stream.max_framerate, - Clock::GetRealTimeClock())); + clock_)); } void CallTest::CreateStreams() { assert(send_stream_ == NULL); @@ -150,7 +151,8 @@ const unsigned int CallTest::kLongTimeoutMs = 120 * 1000; const uint8_t CallTest::kSendPayloadType = 100; const uint8_t CallTest::kFakeSendPayloadType = 125; const uint8_t CallTest::kSendRtxPayloadType = 98; -const uint32_t CallTest::kSendRtxSsrc = 0xBADCAFE; +const uint32_t CallTest::kSendRtxSsrcs[kNumSsrcs] = {0xBADCAFD, 0xBADCAFE, + 0xBADCAFF}; const uint32_t CallTest::kSendSsrcs[kNumSsrcs] = {0xC0FFED, 0xC0FFEE, 0xC0FFEF}; const uint32_t CallTest::kReceiverLocalSsrc = 0x123456; const int CallTest::kNackRtpHistoryMs = 1000; |