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

Unified Diff: webrtc/video/video_send_stream_tests.cc

Issue 2745083002: Avoid holding lock while calling stream_resetter_ in MaxPaddingSetTest (Closed)
Patch Set: Created 3 years, 9 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/video_send_stream_tests.cc
diff --git a/webrtc/video/video_send_stream_tests.cc b/webrtc/video/video_send_stream_tests.cc
index 05a4b41d40b1e1ffb51255187976449fef1f1d49..2cd542a3020aa0d15f2868fcbe7e34bbaa68fb31 100644
--- a/webrtc/video/video_send_stream_tests.cc
+++ b/webrtc/video/video_send_stream_tests.cc
@@ -1535,7 +1535,9 @@ class MaxPaddingSetTest : public test::SendTest {
send_stream_config_(nullptr),
packets_sent_(0),
running_without_padding_(test_switch_content_type),
- stream_resetter_(stream_reset_fun) {}
+ stream_resetter_(stream_reset_fun) {
+ RTC_DCHECK(stream_resetter_);
+ }
void OnVideoStreamsCreated(
VideoSendStream* send_stream,
@@ -1598,8 +1600,6 @@ class MaxPaddingSetTest : public test::SendTest {
if (RunningWithoutPadding()) {
ASSERT_TRUE(
content_switch_event_.Wait(test::CallTest::kDefaultTimeoutMs));
- rtc::CritScope lock(&crit_);
- RTC_DCHECK(stream_resetter_);
(*stream_resetter_)(send_stream_config_, encoder_config_);
}
« 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