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

Fix flacky VideoSendStreamTest.SupportsVideoContentType

Browse Source 
Bug: webrtc:8987
Change-Id: Iebceebe2879e3f2048274a07b63bfd8a23112280
Reviewed-on: https://webrtc-review.googlesource.com/61260
Reviewed-by: Erik Språng <sprang@webrtc.org>
Commit-Queue: Ilya Nikolaevskiy <ilnik@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#22415}
This commit is contained in:
Ilya Nikolaevskiy 2018-03-12 10:42:08 +01:00 committed by Commit Bot
parent 3f027b35cb
commit efbb978a69
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
video/video_send_stream_tests.cc
View File

@ -324,7 +324,8 @@ TEST_F(VideoSendStreamTest, SupportsVideoRotation) {
TEST_F(VideoSendStreamTest, SupportsVideoContentType) {
class VideoContentTypeObserver : public test::SendTest {
public:
VideoContentTypeObserver() : SendTest(kDefaultTimeoutMs) {
VideoContentTypeObserver()
: SendTest(kDefaultTimeoutMs), first_frame_sent_(false) {
EXPECT_TRUE(parser_->RegisterRtpHeaderExtension(
kRtpExtensionVideoContentType, test::kVideoContentTypeExtensionId));
}
@ -332,9 +333,11 @@ TEST_F(VideoSendStreamTest, SupportsVideoContentType) {
Action OnSendRtp(const uint8_t* packet, size_t length) override {
RTPHeader header;
EXPECT_TRUE(parser_->Parse(packet, length, &header));
// Only the last packet of the frame must have extension.
if (!header.markerBit)
// Only the last packet of the key-frame must have extension.
if (!header.markerBit || first_frame_sent_)
return SEND_PACKET;
// First marker bit seen means that the first frame is sent.
first_frame_sent_ = true;
EXPECT_TRUE(header.extension.hasVideoContentType);
EXPECT_TRUE(videocontenttypehelpers::IsScreenshare(
header.extension.videoContentType));
@ -356,6 +359,9 @@ TEST_F(VideoSendStreamTest, SupportsVideoContentType) {
void PerformTest() override {
EXPECT_TRUE(Wait()) << "Timed out while waiting for single RTP packet.";
}
private:
bool first_frame_sent_;
} test;
RunBaseTest(&test);