generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Stop DirectTransports in VideoSendStreamTests.

Browse Source 
Prevents racy packet delivery during or after Call destruction.

BUG=
R=stefan@webrtc.org

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

git-svn-id: http://webrtc.googlecode.com/svn/trunk@5049 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
pbos@webrtc.org 2013-10-29 10:12:10 +00:00
parent 55e1723713
commit def22b455b
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
webrtc/video/video_send_stream_tests.cc
View File

@ -40,6 +40,8 @@ class SendTransportObserver : public test::NullTransport {
EventTypeWrapper Wait() { return send_test_complete_->Wait(timeout_ms_); } EventTypeWrapper Wait() { return send_test_complete_->Wait(timeout_ms_); }
virtual void Stop() {}
protected: protected:
scoped_ptr<RtpHeaderParser> rtp_header_parser_; scoped_ptr<RtpHeaderParser> rtp_header_parser_;
scoped_ptr<EventWrapper> send_test_complete_; scoped_ptr<EventWrapper> send_test_complete_;
@ -65,6 +67,7 @@ class VideoSendStreamTest : public ::testing::Test {
EXPECT_EQ(kEventSignaled, observer->Wait()); EXPECT_EQ(kEventSignaled, observer->Wait());
observer->Stop();
frame_generator_capturer->Stop(); frame_generator_capturer->Stop();
send_stream->StopSend(); send_stream->StopSend();
call->DestroySendStream(send_stream); call->DestroySendStream(send_stream);
@ -336,6 +339,8 @@ TEST_F(VideoSendStreamTest, SupportsFec) {
return true; return true;
} }
virtual void Stop() OVERRIDE { transport_.StopSending(); }
private: private:
internal::TransportAdapter transport_adapter_; internal::TransportAdapter transport_adapter_;
test::DirectTransport transport_; test::DirectTransport transport_;
@ -409,6 +414,8 @@ void VideoSendStreamTest::TestNackRetransmission(uint32_t retransmit_ssrc) {
return true; return true;
} }
virtual void Stop() OVERRIDE { transport_.StopSending(); }
private: private:
internal::TransportAdapter transport_adapter_; internal::TransportAdapter transport_adapter_;
test::DirectTransport transport_; test::DirectTransport transport_;
@ -555,6 +562,8 @@ TEST_F(VideoSendStreamTest, AutoMute) {
void set_high_remb_bps(int value) { high_remb_bps_ = value; } void set_high_remb_bps(int value) { high_remb_bps_ = value; }
virtual void Stop() OVERRIDE { transport_.StopSending(); }
private: private:
enum TestState { enum TestState {
kBeforeMute, kBeforeMute,