| OLD | NEW | 
|---|
| 1 /* | 1 /* | 
| 2  *  Copyright (c) 2014 The WebRTC project authors. All Rights Reserved. | 2  *  Copyright (c) 2014 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 18 matching lines...) Expand all  Loading... | 
| 29 void CroppingWindowCapturer::Start(DesktopCapturer::Callback* callback) { | 29 void CroppingWindowCapturer::Start(DesktopCapturer::Callback* callback) { | 
| 30   callback_ = callback; | 30   callback_ = callback; | 
| 31   window_capturer_->Start(callback); | 31   window_capturer_->Start(callback); | 
| 32 } | 32 } | 
| 33 | 33 | 
| 34 void CroppingWindowCapturer::SetSharedMemoryFactory( | 34 void CroppingWindowCapturer::SetSharedMemoryFactory( | 
| 35     std::unique_ptr<SharedMemoryFactory> shared_memory_factory) { | 35     std::unique_ptr<SharedMemoryFactory> shared_memory_factory) { | 
| 36   window_capturer_->SetSharedMemoryFactory(std::move(shared_memory_factory)); | 36   window_capturer_->SetSharedMemoryFactory(std::move(shared_memory_factory)); | 
| 37 } | 37 } | 
| 38 | 38 | 
| 39 void CroppingWindowCapturer::Capture(const DesktopRegion& region) { | 39 void CroppingWindowCapturer::CaptureFrame() { | 
| 40   if (ShouldUseScreenCapturer()) { | 40   if (ShouldUseScreenCapturer()) { | 
| 41     if (!screen_capturer_.get()) { | 41     if (!screen_capturer_.get()) { | 
| 42       screen_capturer_.reset(ScreenCapturer::Create(options_)); | 42       screen_capturer_.reset(ScreenCapturer::Create(options_)); | 
| 43       if (excluded_window_) { | 43       if (excluded_window_) { | 
| 44         screen_capturer_->SetExcludedWindow(excluded_window_); | 44         screen_capturer_->SetExcludedWindow(excluded_window_); | 
| 45       } | 45       } | 
| 46       screen_capturer_->Start(this); | 46       screen_capturer_->Start(this); | 
| 47     } | 47     } | 
| 48     screen_capturer_->Capture(region); | 48     screen_capturer_->CaptureFrame(); | 
| 49   } else { | 49   } else { | 
| 50     window_capturer_->Capture(region); | 50     window_capturer_->CaptureFrame(); | 
| 51   } | 51   } | 
| 52 } | 52 } | 
| 53 | 53 | 
| 54 void CroppingWindowCapturer::SetExcludedWindow(WindowId window) { | 54 void CroppingWindowCapturer::SetExcludedWindow(WindowId window) { | 
| 55   excluded_window_ = window; | 55   excluded_window_ = window; | 
| 56   if (screen_capturer_.get()) { | 56   if (screen_capturer_.get()) { | 
| 57     screen_capturer_->SetExcludedWindow(window); | 57     screen_capturer_->SetExcludedWindow(window); | 
| 58   } | 58   } | 
| 59 } | 59 } | 
| 60 | 60 | 
| (...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 103 | 103 | 
| 104 #if !defined(WEBRTC_WIN) | 104 #if !defined(WEBRTC_WIN) | 
| 105 // static | 105 // static | 
| 106 WindowCapturer* | 106 WindowCapturer* | 
| 107 CroppingWindowCapturer::Create(const DesktopCaptureOptions& options) { | 107 CroppingWindowCapturer::Create(const DesktopCaptureOptions& options) { | 
| 108   return WindowCapturer::Create(options); | 108   return WindowCapturer::Create(options); | 
| 109 } | 109 } | 
| 110 #endif | 110 #endif | 
| 111 | 111 | 
| 112 }  // namespace webrtc | 112 }  // namespace webrtc | 
| OLD | NEW | 
|---|