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

Side by Side 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 unified diff | Download patch
« webrtc/base/atomicops.h ('K') | « webrtc/video/video_capture_input.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
(...skipping 26 matching lines...) Expand all
37 CpuOveruseObserver* overuse_observer, 37 CpuOveruseObserver* overuse_observer,
38 EncodingTimeObserver* encoding_time_observer) 38 EncodingTimeObserver* encoding_time_observer)
39 : capture_cs_(CriticalSectionWrapper::CreateCriticalSection()), 39 : capture_cs_(CriticalSectionWrapper::CreateCriticalSection()),
40 module_process_thread_(module_process_thread), 40 module_process_thread_(module_process_thread),
41 frame_callback_(frame_callback), 41 frame_callback_(frame_callback),
42 local_renderer_(local_renderer), 42 local_renderer_(local_renderer),
43 stats_proxy_(stats_proxy), 43 stats_proxy_(stats_proxy),
44 incoming_frame_cs_(CriticalSectionWrapper::CreateCriticalSection()), 44 incoming_frame_cs_(CriticalSectionWrapper::CreateCriticalSection()),
45 encoder_thread_(EncoderThreadFunction, this, "EncoderThread"), 45 encoder_thread_(EncoderThreadFunction, this, "EncoderThread"),
46 capture_event_(EventWrapper::Create()), 46 capture_event_(EventWrapper::Create()),
47 stop_({0}), 47 stop_(0),
48 last_captured_timestamp_(0), 48 last_captured_timestamp_(0),
49 delta_ntp_internal_ms_( 49 delta_ntp_internal_ms_(
50 Clock::GetRealTimeClock()->CurrentNtpInMilliseconds() - 50 Clock::GetRealTimeClock()->CurrentNtpInMilliseconds() -
51 TickTime::MillisecondTimestamp()), 51 TickTime::MillisecondTimestamp()),
52 overuse_detector_(new OveruseFrameDetector(Clock::GetRealTimeClock(), 52 overuse_detector_(new OveruseFrameDetector(Clock::GetRealTimeClock(),
53 CpuOveruseOptions(), 53 CpuOveruseOptions(),
54 overuse_observer, 54 overuse_observer,
55 stats_proxy)), 55 stats_proxy)),
56 encoding_time_observer_(encoding_time_observer) { 56 encoding_time_observer_(encoding_time_observer) {
57 encoder_thread_.Start(); 57 encoder_thread_.Start();
58 encoder_thread_.SetPriority(rtc::kHighPriority); 58 encoder_thread_.SetPriority(rtc::kHighPriority);
59 module_process_thread_->RegisterModule(overuse_detector_.get()); 59 module_process_thread_->RegisterModule(overuse_detector_.get());
60 } 60 }
61 61
62 VideoCaptureInput::~VideoCaptureInput() { 62 VideoCaptureInput::~VideoCaptureInput() {
63 module_process_thread_->DeRegisterModule(overuse_detector_.get()); 63 module_process_thread_->DeRegisterModule(overuse_detector_.get());
64 64
65 // Stop the thread. 65 // Stop the thread.
66 rtc::AtomicInt::ReleaseStore(&stop_, 1); 66 rtc::AtomicOps::ReleaseStore(&stop_, 1);
67 capture_event_->Set(); 67 capture_event_->Set();
68 encoder_thread_.Stop(); 68 encoder_thread_.Stop();
69 } 69 }
70 70
71 void VideoCaptureInput::IncomingCapturedFrame(const VideoFrame& video_frame) { 71 void VideoCaptureInput::IncomingCapturedFrame(const VideoFrame& video_frame) {
72 // TODO(pbos): Remove local rendering, it should be handled by the client code 72 // TODO(pbos): Remove local rendering, it should be handled by the client code
73 // if required. 73 // if required.
74 if (local_renderer_) 74 if (local_renderer_)
75 local_renderer_->RenderFrame(video_frame, 0); 75 local_renderer_->RenderFrame(video_frame, 0);
76 76
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
120 } 120 }
121 121
122 bool VideoCaptureInput::EncoderThreadFunction(void* obj) { 122 bool VideoCaptureInput::EncoderThreadFunction(void* obj) {
123 return static_cast<VideoCaptureInput*>(obj)->EncoderProcess(); 123 return static_cast<VideoCaptureInput*>(obj)->EncoderProcess();
124 } 124 }
125 125
126 bool VideoCaptureInput::EncoderProcess() { 126 bool VideoCaptureInput::EncoderProcess() {
127 static const int kThreadWaitTimeMs = 100; 127 static const int kThreadWaitTimeMs = 100;
128 int64_t capture_time = -1; 128 int64_t capture_time = -1;
129 if (capture_event_->Wait(kThreadWaitTimeMs) == kEventSignaled) { 129 if (capture_event_->Wait(kThreadWaitTimeMs) == kEventSignaled) {
130 if (rtc::AtomicInt::AcquireLoad(&stop_)) 130 if (rtc::AtomicOps::AcquireLoad(&stop_))
131 return false; 131 return false;
132 132
133 int64_t encode_start_time = -1; 133 int64_t encode_start_time = -1;
134 VideoFrame deliver_frame; 134 VideoFrame deliver_frame;
135 { 135 {
136 CriticalSectionScoped cs(capture_cs_.get()); 136 CriticalSectionScoped cs(capture_cs_.get());
137 if (!captured_frame_.IsZeroSize()) { 137 if (!captured_frame_.IsZeroSize()) {
138 deliver_frame = captured_frame_; 138 deliver_frame = captured_frame_;
139 captured_frame_.Reset(); 139 captured_frame_.Reset();
140 } 140 }
(...skipping 17 matching lines...) Expand all
158 } 158 }
159 // We're done! 159 // We're done!
160 if (capture_time != -1) { 160 if (capture_time != -1) {
161 overuse_detector_->FrameSent(capture_time); 161 overuse_detector_->FrameSent(capture_time);
162 } 162 }
163 return true; 163 return true;
164 } 164 }
165 165
166 } // namespace internal 166 } // namespace internal
167 } // namespace webrtc 167 } // namespace webrtc
OLDNEW
« 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