admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Deflake VideoSendStreamTest.SupportsVideoTimingFrames

Browse Source 
Bug: none
Change-Id: I1544bb699056acbe55058da615004d137e932d96
Reviewed-on: https://webrtc-review.googlesource.com/c/117640
Reviewed-by: Erik Språng <sprang@webrtc.org>
Commit-Queue: Ilya Nikolaevskiy <ilnik@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#26280}
This commit is contained in:
Ilya Nikolaevskiy 2019-01-15 14:28:59 +01:00 committed by Commit Bot
parent 50e77457db
commit 90d0a627c4
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
video/video_send_stream_tests.cc
View File

@ -399,7 +399,8 @@ TEST_P(VideoSendStreamTest, SupportsVideoContentType) {
TEST_P(VideoSendStreamTest, SupportsVideoTimingFrames) {
class VideoTimingObserver : public test::SendTest {
public:
VideoTimingObserver() : SendTest(kDefaultTimeoutMs) {
VideoTimingObserver()
: SendTest(kDefaultTimeoutMs), first_frame_sent_(false) {
EXPECT_TRUE(parser_->RegisterRtpHeaderExtension(
kRtpExtensionVideoTiming, test::kVideoTimingExtensionId));
}
@ -408,10 +409,13 @@ TEST_P(VideoSendStreamTest, SupportsVideoTimingFrames) {
RTPHeader header;
EXPECT_TRUE(parser_->Parse(packet, length, &header));
// Only the last packet of the frame must have extension.
if (!header.markerBit)
// Also don't check packets of the second frame if they happen to get
// through before the test terminates.
if (!header.markerBit || first_frame_sent_)
return SEND_PACKET;
EXPECT_TRUE(header.extension.has_video_timing);
observation_complete_.Set();
first_frame_sent_ = true;
return SEND_PACKET;
}
@ -427,6 +431,9 @@ TEST_P(VideoSendStreamTest, SupportsVideoTimingFrames) {
void PerformTest() override {
EXPECT_TRUE(Wait()) << "Timed out while waiting for timing frames.";
}
private:
bool first_frame_sent_;
} test;
RunBaseTest(&test);