Chromium Code Reviews| 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 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 43 stop_(0), | 43 stop_(0), |
| 44 last_captured_timestamp_(0), | 44 last_captured_timestamp_(0), |
| 45 delta_ntp_internal_ms_( | 45 delta_ntp_internal_ms_( |
| 46 Clock::GetRealTimeClock()->CurrentNtpInMilliseconds() - | 46 Clock::GetRealTimeClock()->CurrentNtpInMilliseconds() - |
| 47 TickTime::MillisecondTimestamp()), | 47 TickTime::MillisecondTimestamp()), |
| 48 overuse_detector_(new OveruseFrameDetector(Clock::GetRealTimeClock(), | 48 overuse_detector_(new OveruseFrameDetector(Clock::GetRealTimeClock(), |
| 49 CpuOveruseOptions(), | 49 CpuOveruseOptions(), |
| 50 overuse_observer, | 50 overuse_observer, |
| 51 stats_proxy)), | 51 stats_proxy)), |
| 52 encoding_time_observer_(encoding_time_observer) { | 52 encoding_time_observer_(encoding_time_observer) { |
| 53 LOG(LS_WARNING) << "delta_ntp_internal_ms_ = " << delta_ntp_internal_ms_; | |
|
tommi
2016/01/25 19:20:49
remove?
sprang_webrtc
2016/01/25 19:34:18
Oops! Right-o..
| |
| 53 encoder_thread_.Start(); | 54 encoder_thread_.Start(); |
| 54 encoder_thread_.SetPriority(rtc::kHighPriority); | 55 encoder_thread_.SetPriority(rtc::kHighPriority); |
| 55 module_process_thread_->RegisterModule(overuse_detector_.get()); | 56 module_process_thread_->RegisterModule(overuse_detector_.get()); |
| 56 } | 57 } |
| 57 | 58 |
| 58 VideoCaptureInput::~VideoCaptureInput() { | 59 VideoCaptureInput::~VideoCaptureInput() { |
| 59 module_process_thread_->DeRegisterModule(overuse_detector_.get()); | 60 module_process_thread_->DeRegisterModule(overuse_detector_.get()); |
| 60 | 61 |
| 61 // Stop the thread. | 62 // Stop the thread. |
| 62 rtc::AtomicOps::ReleaseStore(&stop_, 1); | 63 rtc::AtomicOps::ReleaseStore(&stop_, 1); |
| (...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 153 } | 154 } |
| 154 // We're done! | 155 // We're done! |
| 155 if (capture_time != -1) { | 156 if (capture_time != -1) { |
| 156 overuse_detector_->FrameSent(capture_time); | 157 overuse_detector_->FrameSent(capture_time); |
| 157 } | 158 } |
| 158 return true; | 159 return true; |
| 159 } | 160 } |
| 160 | 161 |
| 161 } // namespace internal | 162 } // namespace internal |
| 162 } // namespace webrtc | 163 } // namespace webrtc |
| OLD | NEW |