OLD | NEW |
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 24 matching lines...) Expand all Loading... |
35 VideoRenderer* local_renderer, | 35 VideoRenderer* local_renderer, |
36 SendStatisticsProxy* stats_proxy, | 36 SendStatisticsProxy* stats_proxy, |
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_(PlatformThread::CreateThread(EncoderThreadFunction, | 45 encoder_thread_(EncoderThreadFunction, this, "EncoderThread"), |
46 this, | |
47 "EncoderThread")), | |
48 capture_event_(EventWrapper::Create()), | 46 capture_event_(EventWrapper::Create()), |
49 stop_(0), | 47 stop_(0), |
50 last_captured_timestamp_(0), | 48 last_captured_timestamp_(0), |
51 delta_ntp_internal_ms_( | 49 delta_ntp_internal_ms_( |
52 Clock::GetRealTimeClock()->CurrentNtpInMilliseconds() - | 50 Clock::GetRealTimeClock()->CurrentNtpInMilliseconds() - |
53 TickTime::MillisecondTimestamp()), | 51 TickTime::MillisecondTimestamp()), |
54 overuse_detector_(new OveruseFrameDetector(Clock::GetRealTimeClock(), | 52 overuse_detector_(new OveruseFrameDetector(Clock::GetRealTimeClock(), |
55 CpuOveruseOptions(), | 53 CpuOveruseOptions(), |
56 overuse_observer, | 54 overuse_observer, |
57 stats_proxy)), | 55 stats_proxy)), |
58 encoding_time_observer_(encoding_time_observer) { | 56 encoding_time_observer_(encoding_time_observer) { |
59 encoder_thread_->Start(); | 57 encoder_thread_.Start(); |
60 encoder_thread_->SetPriority(kHighPriority); | 58 encoder_thread_.SetPriority(rtc::kHighPriority); |
61 module_process_thread_->RegisterModule(overuse_detector_.get()); | 59 module_process_thread_->RegisterModule(overuse_detector_.get()); |
62 } | 60 } |
63 | 61 |
64 VideoCaptureInput::~VideoCaptureInput() { | 62 VideoCaptureInput::~VideoCaptureInput() { |
65 module_process_thread_->DeRegisterModule(overuse_detector_.get()); | 63 module_process_thread_->DeRegisterModule(overuse_detector_.get()); |
66 | 64 |
67 // Stop the thread. | 65 // Stop the thread. |
68 rtc::AtomicOps::ReleaseStore(&stop_, 1); | 66 rtc::AtomicOps::ReleaseStore(&stop_, 1); |
69 capture_event_->Set(); | 67 capture_event_->Set(); |
70 encoder_thread_->Stop(); | 68 encoder_thread_.Stop(); |
71 } | 69 } |
72 | 70 |
73 void VideoCaptureInput::IncomingCapturedFrame(const VideoFrame& video_frame) { | 71 void VideoCaptureInput::IncomingCapturedFrame(const VideoFrame& video_frame) { |
74 // 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 |
75 // if required. | 73 // if required. |
76 if (local_renderer_) | 74 if (local_renderer_) |
77 local_renderer_->RenderFrame(video_frame, 0); | 75 local_renderer_->RenderFrame(video_frame, 0); |
78 | 76 |
79 stats_proxy_->OnIncomingFrame(video_frame.width(), video_frame.height()); | 77 stats_proxy_->OnIncomingFrame(video_frame.width(), video_frame.height()); |
80 | 78 |
(...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
160 } | 158 } |
161 // We're done! | 159 // We're done! |
162 if (capture_time != -1) { | 160 if (capture_time != -1) { |
163 overuse_detector_->FrameSent(capture_time); | 161 overuse_detector_->FrameSent(capture_time); |
164 } | 162 } |
165 return true; | 163 return true; |
166 } | 164 } |
167 | 165 |
168 } // namespace internal | 166 } // namespace internal |
169 } // namespace webrtc | 167 } // namespace webrtc |
OLD | NEW |