| 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 | 
| 11 #include "webrtc/modules/desktop_capture/cropping_window_capturer.h" | 11 #include "webrtc/modules/desktop_capture/cropping_window_capturer.h" | 
| 12 | 12 | 
| 13 #include "webrtc/modules/desktop_capture/cropped_desktop_frame.h" | 13 #include "webrtc/modules/desktop_capture/cropped_desktop_frame.h" | 
| 14 #include "webrtc/system_wrappers/include/logging.h" | 14 #include "webrtc/system_wrappers/include/logging.h" | 
| 15 | 15 | 
| 16 namespace webrtc { | 16 namespace webrtc { | 
| 17 | 17 | 
| 18 CroppingWindowCapturer::CroppingWindowCapturer( | 18 CroppingWindowCapturer::CroppingWindowCapturer( | 
| 19     const DesktopCaptureOptions& options) | 19     const DesktopCaptureOptions& options) | 
| 20     : options_(options), | 20     : options_(options), | 
| 21       callback_(NULL), | 21       callback_(NULL), | 
| 22       window_capturer_(DesktopCapturer::CreateRawWindowCapturer(options)), | 22       window_capturer_(DesktopCapturer::CreateRawWindowCapturer(options)), | 
| 23       selected_window_(kNullWindowId), | 23       selected_window_(kNullWindowId), | 
| 24       excluded_window_(kNullWindowId) { | 24       excluded_window_(kNullWindowId) {} | 
| 25 } |  | 
| 26 | 25 | 
| 27 CroppingWindowCapturer::~CroppingWindowCapturer() {} | 26 CroppingWindowCapturer::~CroppingWindowCapturer() {} | 
| 28 | 27 | 
| 29 void CroppingWindowCapturer::Start(DesktopCapturer::Callback* callback) { | 28 void CroppingWindowCapturer::Start(DesktopCapturer::Callback* callback) { | 
| 30   callback_ = callback; | 29   callback_ = callback; | 
| 31   window_capturer_->Start(callback); | 30   window_capturer_->Start(callback); | 
| 32 } | 31 } | 
| 33 | 32 | 
| 34 void CroppingWindowCapturer::SetSharedMemoryFactory( | 33 void CroppingWindowCapturer::SetSharedMemoryFactory( | 
| 35     std::unique_ptr<SharedMemoryFactory> shared_memory_factory) { | 34     std::unique_ptr<SharedMemoryFactory> shared_memory_factory) { | 
| (...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 96     return; | 95     return; | 
| 97   } | 96   } | 
| 98 | 97 | 
| 99   callback_->OnCaptureResult( | 98   callback_->OnCaptureResult( | 
| 100       Result::SUCCESS, | 99       Result::SUCCESS, | 
| 101       CreateCroppedDesktopFrame(std::move(screen_frame), window_rect)); | 100       CreateCroppedDesktopFrame(std::move(screen_frame), window_rect)); | 
| 102 } | 101 } | 
| 103 | 102 | 
| 104 #if !defined(WEBRTC_WIN) | 103 #if !defined(WEBRTC_WIN) | 
| 105 // static | 104 // static | 
| 106 WindowCapturer* | 105 DesktopCapturer* CroppingWindowCapturer::Create( | 
| 107 CroppingWindowCapturer::Create(const DesktopCaptureOptions& options) { | 106     const DesktopCaptureOptions& options) { | 
| 108   return WindowCapturer::Create(options); | 107   return DesktopCapturer::CreateWindowCapturer(options).release(); | 
| 109 } | 108 } | 
| 110 #endif | 109 #endif | 
| 111 | 110 | 
| 112 }  // namespace webrtc | 111 }  // namespace webrtc | 
| OLD | NEW | 
|---|