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

Unified Diff: webrtc/video/video_capture_input.cc

Issue 1505053002: Revert of "Create rtc::AtomicInt POD struct." (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 5 years 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
« webrtc/base/atomicops.h ('K') | « webrtc/video/video_capture_input.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/video/video_capture_input.cc
diff --git a/webrtc/video/video_capture_input.cc b/webrtc/video/video_capture_input.cc
index eaacf72a8366731f091c984871957d6d21177995..ac05e36c4098b238df0a667bbad1c053b8444dc2 100644
--- a/webrtc/video/video_capture_input.cc
+++ b/webrtc/video/video_capture_input.cc
@@ -44,7 +44,7 @@
incoming_frame_cs_(CriticalSectionWrapper::CreateCriticalSection()),
encoder_thread_(EncoderThreadFunction, this, "EncoderThread"),
capture_event_(EventWrapper::Create()),
- stop_({0}),
+ stop_(0),
last_captured_timestamp_(0),
delta_ntp_internal_ms_(
Clock::GetRealTimeClock()->CurrentNtpInMilliseconds() -
@@ -63,7 +63,7 @@
module_process_thread_->DeRegisterModule(overuse_detector_.get());
// Stop the thread.
- rtc::AtomicInt::ReleaseStore(&stop_, 1);
+ rtc::AtomicOps::ReleaseStore(&stop_, 1);
capture_event_->Set();
encoder_thread_.Stop();
}
@@ -127,7 +127,7 @@
static const int kThreadWaitTimeMs = 100;
int64_t capture_time = -1;
if (capture_event_->Wait(kThreadWaitTimeMs) == kEventSignaled) {
- if (rtc::AtomicInt::AcquireLoad(&stop_))
+ if (rtc::AtomicOps::AcquireLoad(&stop_))
return false;
int64_t encode_start_time = -1;
« webrtc/base/atomicops.h ('K') | « webrtc/video/video_capture_input.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698