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

Side by Side Diff: webrtc/modules/desktop_capture/cropping_window_capturer.cc

Issue 1678073003: Cleanup shared memory handling in DesktopCapturer interface. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 4 years, 10 months 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
OLDNEW
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 13 matching lines...) Expand all
24 excluded_window_(kNullWindowId) { 24 excluded_window_(kNullWindowId) {
25 } 25 }
26 26
27 CroppingWindowCapturer::~CroppingWindowCapturer() {} 27 CroppingWindowCapturer::~CroppingWindowCapturer() {}
28 28
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(
35 rtc::scoped_ptr<SharedMemoryFactory> shared_memory_factory) {
36 window_capturer_->SetSharedMemoryFactory(std::move(shared_memory_factory));
37 }
38
34 void CroppingWindowCapturer::Capture(const DesktopRegion& region) { 39 void CroppingWindowCapturer::Capture(const DesktopRegion& region) {
35 if (ShouldUseScreenCapturer()) { 40 if (ShouldUseScreenCapturer()) {
36 if (!screen_capturer_.get()) { 41 if (!screen_capturer_.get()) {
37 screen_capturer_.reset(ScreenCapturer::Create(options_)); 42 screen_capturer_.reset(ScreenCapturer::Create(options_));
38 if (excluded_window_) { 43 if (excluded_window_) {
39 screen_capturer_->SetExcludedWindow(excluded_window_); 44 screen_capturer_->SetExcludedWindow(excluded_window_);
40 } 45 }
41 screen_capturer_->Start(this); 46 screen_capturer_->Start(this);
42 } 47 }
43 screen_capturer_->Capture(region); 48 screen_capturer_->Capture(region);
(...skipping 18 matching lines...) Expand all
62 selected_window_ = id; 67 selected_window_ = id;
63 return true; 68 return true;
64 } 69 }
65 return false; 70 return false;
66 } 71 }
67 72
68 bool CroppingWindowCapturer::BringSelectedWindowToFront() { 73 bool CroppingWindowCapturer::BringSelectedWindowToFront() {
69 return window_capturer_->BringSelectedWindowToFront(); 74 return window_capturer_->BringSelectedWindowToFront();
70 } 75 }
71 76
72 SharedMemory* CroppingWindowCapturer::CreateSharedMemory(size_t size) {
73 return callback_->CreateSharedMemory(size);
74 }
75
76 void CroppingWindowCapturer::OnCaptureCompleted(DesktopFrame* frame) { 77 void CroppingWindowCapturer::OnCaptureCompleted(DesktopFrame* frame) {
77 rtc::scoped_ptr<DesktopFrame> screen_frame(frame); 78 rtc::scoped_ptr<DesktopFrame> screen_frame(frame);
78 79
79 if (!ShouldUseScreenCapturer()) { 80 if (!ShouldUseScreenCapturer()) {
80 LOG(LS_INFO) << "Window no longer on top when ScreenCapturer finishes"; 81 LOG(LS_INFO) << "Window no longer on top when ScreenCapturer finishes";
81 window_capturer_->Capture(DesktopRegion()); 82 window_capturer_->Capture(DesktopRegion());
82 return; 83 return;
83 } 84 }
84 85
85 if (!frame) { 86 if (!frame) {
(...skipping 16 matching lines...) Expand all
102 103
103 #if !defined(WEBRTC_WIN) 104 #if !defined(WEBRTC_WIN)
104 // static 105 // static
105 WindowCapturer* 106 WindowCapturer*
106 CroppingWindowCapturer::Create(const DesktopCaptureOptions& options) { 107 CroppingWindowCapturer::Create(const DesktopCaptureOptions& options) {
107 return WindowCapturer::Create(options); 108 return WindowCapturer::Create(options);
108 } 109 }
109 #endif 110 #endif
110 111
111 } // namespace webrtc 112 } // namespace webrtc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698