Index: webrtc/video/end_to_end_tests.cc |
diff --git a/webrtc/video/end_to_end_tests.cc b/webrtc/video/end_to_end_tests.cc |
index 36206fae9cd2e7a58bf09fa190dbe9b6594cbb6e..7e04f5f8baed67cebfa887ce6b1df36d39eeb044 100644 |
--- a/webrtc/video/end_to_end_tests.cc |
+++ b/webrtc/video/end_to_end_tests.cc |
@@ -1342,6 +1342,9 @@ TEST_F(EndToEndTest, AssignsTransportSequenceNumbers) { |
virtual ~RtpExtensionHeaderObserver() {} |
bool SendRtp(const uint8_t* data, size_t length) override { |
+ if (IsDone()) |
+ return false; |
+ |
RTPHeader header; |
EXPECT_TRUE(parser_->Parse(data, length, &header)); |
if (header.extension.hasTransportSequenceNumber) { |
@@ -1361,14 +1364,17 @@ TEST_F(EndToEndTest, AssignsTransportSequenceNumbers) { |
streams_observed_.insert(header.ssrc); |
} |
- if (streams_observed_.size() == MultiStreamTest::kNumStreams && |
- padding_observed_ && rtx_padding_observed_) { |
+ if (IsDone()) |
done_->Set(); |
- } |
} |
return test::DirectTransport::SendRtp(data, length); |
} |
+ bool IsDone() { |
+ return streams_observed_.size() == MultiStreamTest::kNumStreams && |
+ padding_observed_ && rtx_padding_observed_; |
+ } |
+ |
EventTypeWrapper Wait() { return done_->Wait(kDefaultTimeoutMs); } |
rtc::scoped_ptr<EventWrapper> done_; |