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

Unified Diff: webrtc/media/engine/fakewebrtcvideoengine.h

Issue 2721333003: Fix race in WebRtcVideoEngine2Tests, improve coverage. (Closed)
Patch Set: s/EXPECT_EQ(false, /EXPECT_FALSE( Created 3 years, 10 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 | « webrtc/media/engine/fakewebrtccall.cc ('k') | webrtc/media/engine/webrtcvideoengine2.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/media/engine/fakewebrtcvideoengine.h
diff --git a/webrtc/media/engine/fakewebrtcvideoengine.h b/webrtc/media/engine/fakewebrtcvideoengine.h
index 2dce2c503fcf67e284ef0d3d84027a6dc7ffd74a..a223406a41ad7e7ae5a3c2caa95971b3b7f88892 100644
--- a/webrtc/media/engine/fakewebrtcvideoengine.h
+++ b/webrtc/media/engine/fakewebrtcvideoengine.h
@@ -199,8 +199,12 @@ class FakeWebRtcVideoEncoderFactory : public WebRtcVideoEncoderFactory {
int64_t start_offset_ms = rtc::TimeMillis();
int64_t wait_time = kEventTimeoutMs;
do {
- if (GetNumCreatedEncoders() >= num_encoders)
+ int num_created_encoders = GetNumCreatedEncoders();
+ if (num_created_encoders == num_encoders) {
return true;
+ } else if (num_created_encoders > num_encoders) {
+ return false;
+ }
wait_time = kEventTimeoutMs - (rtc::TimeMillis() - start_offset_ms);
} while (wait_time > 0 && created_video_encoder_event_.Wait(wait_time));
return false;
« no previous file with comments | « webrtc/media/engine/fakewebrtccall.cc ('k') | webrtc/media/engine/webrtcvideoengine2.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698