Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(103)

Unified Diff: webrtc/video/end_to_end_tests.cc

Issue 2639173002: Fix race in EndToEndTest.ReceivesFlexfecAndSendsCorrespondingRtcp. (Closed)
Patch Set: Created 3 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 502851bbcee267c09dfa18fcadc2994097cafee1..54b83e2658195d2e623230088656ec49d0703d04 100644
--- a/webrtc/video/end_to_end_tests.cc
+++ b/webrtc/video/end_to_end_tests.cc
@@ -771,6 +771,7 @@ class FlexfecRenderObserver : public test::EndToEndTest,
EXPECT_EQ(1U, report_blocks.size());
EXPECT_EQ(test::CallTest::kFlexfecSendSsrc,
report_blocks[0].source_ssrc());
+ rtc::CritScope lock(&crit_);
received_flexfec_rtcp_ = true;
}
}
@@ -813,8 +814,8 @@ class FlexfecRenderObserver : public test::EndToEndTest,
// Since several packets can have the same timestamp a multiset is used
// instead of a set.
std::multiset<uint32_t> dropped_timestamps_ GUARDED_BY(crit_);
- bool expect_flexfec_rtcp_;
- bool received_flexfec_rtcp_;
+ const bool expect_flexfec_rtcp_;
+ bool received_flexfec_rtcp_ GUARDED_BY(crit_);
Random random_;
};
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698