| Index: webrtc/video/video_capture_input.cc
|
| diff --git a/webrtc/video/video_capture_input.cc b/webrtc/video/video_capture_input.cc
|
| index ac05e36c4098b238df0a667bbad1c053b8444dc2..eaacf72a8366731f091c984871957d6d21177995 100644
|
| --- a/webrtc/video/video_capture_input.cc
|
| +++ b/webrtc/video/video_capture_input.cc
|
| @@ -44,7 +44,7 @@ VideoCaptureInput::VideoCaptureInput(
|
| 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 @@ VideoCaptureInput::~VideoCaptureInput() {
|
| module_process_thread_->DeRegisterModule(overuse_detector_.get());
|
|
|
| // Stop the thread.
|
| - rtc::AtomicOps::ReleaseStore(&stop_, 1);
|
| + rtc::AtomicInt::ReleaseStore(&stop_, 1);
|
| capture_event_->Set();
|
| encoder_thread_.Stop();
|
| }
|
| @@ -127,7 +127,7 @@ bool VideoCaptureInput::EncoderProcess() {
|
| static const int kThreadWaitTimeMs = 100;
|
| int64_t capture_time = -1;
|
| if (capture_event_->Wait(kThreadWaitTimeMs) == kEventSignaled) {
|
| - if (rtc::AtomicOps::AcquireLoad(&stop_))
|
| + if (rtc::AtomicInt::AcquireLoad(&stop_))
|
| return false;
|
|
|
| int64_t encode_start_time = -1;
|
|
|