OLD | NEW |
1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "remoting/host/desktop_capturer_proxy.h" | 5 #include "remoting/host/desktop_capturer_proxy.h" |
6 | 6 |
7 #include <stddef.h> | 7 #include <stddef.h> |
8 | 8 |
9 #include <utility> | 9 #include <utility> |
10 | 10 |
11 #include "base/bind.h" | 11 #include "base/bind.h" |
12 #include "base/location.h" | 12 #include "base/location.h" |
13 #include "base/macros.h" | 13 #include "base/macros.h" |
| 14 #include "base/memory/ptr_util.h" |
14 #include "base/single_thread_task_runner.h" | 15 #include "base/single_thread_task_runner.h" |
15 #include "base/thread_task_runner_handle.h" | 16 #include "base/thread_task_runner_handle.h" |
16 #include "remoting/proto/control.pb.h" | 17 #include "remoting/proto/control.pb.h" |
17 #include "third_party/webrtc/modules/desktop_capture/desktop_frame.h" | 18 #include "third_party/webrtc/modules/desktop_capture/desktop_frame.h" |
18 #include "third_party/webrtc/modules/desktop_capture/desktop_region.h" | 19 #include "third_party/webrtc/modules/desktop_capture/desktop_region.h" |
19 | 20 |
20 namespace remoting { | 21 namespace remoting { |
21 | 22 |
22 class DesktopCapturerProxy::Core : public webrtc::DesktopCapturer::Callback { | 23 class DesktopCapturerProxy::Core : public webrtc::DesktopCapturer::Callback { |
23 public: | 24 public: |
24 Core(base::WeakPtr<DesktopCapturerProxy> proxy, | 25 Core(base::WeakPtr<DesktopCapturerProxy> proxy, |
25 scoped_refptr<base::SingleThreadTaskRunner> capture_task_runner, | 26 scoped_refptr<base::SingleThreadTaskRunner> capture_task_runner, |
26 scoped_ptr<webrtc::DesktopCapturer> capturer); | 27 std::unique_ptr<webrtc::DesktopCapturer> capturer); |
27 ~Core() override; | 28 ~Core() override; |
28 | 29 |
29 void Start(); | 30 void Start(); |
30 void SetSharedMemoryFactory( | 31 void SetSharedMemoryFactory( |
31 scoped_ptr<webrtc::SharedMemoryFactory> shared_memory_factory); | 32 std::unique_ptr<webrtc::SharedMemoryFactory> shared_memory_factory); |
32 void Capture(const webrtc::DesktopRegion& rect); | 33 void Capture(const webrtc::DesktopRegion& rect); |
33 | 34 |
34 private: | 35 private: |
35 // webrtc::DesktopCapturer::Callback implementation. | 36 // webrtc::DesktopCapturer::Callback implementation. |
36 void OnCaptureCompleted(webrtc::DesktopFrame* frame) override; | 37 void OnCaptureCompleted(webrtc::DesktopFrame* frame) override; |
37 | 38 |
38 base::ThreadChecker thread_checker_; | 39 base::ThreadChecker thread_checker_; |
39 | 40 |
40 base::WeakPtr<DesktopCapturerProxy> proxy_; | 41 base::WeakPtr<DesktopCapturerProxy> proxy_; |
41 scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner_; | 42 scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner_; |
42 scoped_ptr<webrtc::DesktopCapturer> capturer_; | 43 std::unique_ptr<webrtc::DesktopCapturer> capturer_; |
43 | 44 |
44 DISALLOW_COPY_AND_ASSIGN(Core); | 45 DISALLOW_COPY_AND_ASSIGN(Core); |
45 }; | 46 }; |
46 | 47 |
47 DesktopCapturerProxy::Core::Core( | 48 DesktopCapturerProxy::Core::Core( |
48 base::WeakPtr<DesktopCapturerProxy> proxy, | 49 base::WeakPtr<DesktopCapturerProxy> proxy, |
49 scoped_refptr<base::SingleThreadTaskRunner> capture_task_runner, | 50 scoped_refptr<base::SingleThreadTaskRunner> capture_task_runner, |
50 scoped_ptr<webrtc::DesktopCapturer> capturer) | 51 std::unique_ptr<webrtc::DesktopCapturer> capturer) |
51 : proxy_(proxy), | 52 : proxy_(proxy), |
52 caller_task_runner_(base::ThreadTaskRunnerHandle::Get()), | 53 caller_task_runner_(base::ThreadTaskRunnerHandle::Get()), |
53 capturer_(std::move(capturer)) { | 54 capturer_(std::move(capturer)) { |
54 thread_checker_.DetachFromThread(); | 55 thread_checker_.DetachFromThread(); |
55 } | 56 } |
56 | 57 |
57 DesktopCapturerProxy::Core::~Core() { | 58 DesktopCapturerProxy::Core::~Core() { |
58 DCHECK(thread_checker_.CalledOnValidThread()); | 59 DCHECK(thread_checker_.CalledOnValidThread()); |
59 } | 60 } |
60 | 61 |
61 void DesktopCapturerProxy::Core::Start() { | 62 void DesktopCapturerProxy::Core::Start() { |
62 DCHECK(thread_checker_.CalledOnValidThread()); | 63 DCHECK(thread_checker_.CalledOnValidThread()); |
63 capturer_->Start(this); | 64 capturer_->Start(this); |
64 } | 65 } |
65 | 66 |
66 void DesktopCapturerProxy::Core::SetSharedMemoryFactory( | 67 void DesktopCapturerProxy::Core::SetSharedMemoryFactory( |
67 scoped_ptr<webrtc::SharedMemoryFactory> shared_memory_factory) { | 68 std::unique_ptr<webrtc::SharedMemoryFactory> shared_memory_factory) { |
68 DCHECK(thread_checker_.CalledOnValidThread()); | 69 DCHECK(thread_checker_.CalledOnValidThread()); |
69 capturer_->SetSharedMemoryFactory( | 70 capturer_->SetSharedMemoryFactory( |
70 rtc_make_scoped_ptr(shared_memory_factory.release())); | 71 rtc_make_scoped_ptr(shared_memory_factory.release())); |
71 } | 72 } |
72 | 73 |
73 void DesktopCapturerProxy::Core::Capture(const webrtc::DesktopRegion& rect) { | 74 void DesktopCapturerProxy::Core::Capture(const webrtc::DesktopRegion& rect) { |
74 DCHECK(thread_checker_.CalledOnValidThread()); | 75 DCHECK(thread_checker_.CalledOnValidThread()); |
75 capturer_->Capture(rect); | 76 capturer_->Capture(rect); |
76 } | 77 } |
77 | 78 |
78 void DesktopCapturerProxy::Core::OnCaptureCompleted( | 79 void DesktopCapturerProxy::Core::OnCaptureCompleted( |
79 webrtc::DesktopFrame* frame) { | 80 webrtc::DesktopFrame* frame) { |
80 DCHECK(thread_checker_.CalledOnValidThread()); | 81 DCHECK(thread_checker_.CalledOnValidThread()); |
81 | 82 |
82 caller_task_runner_->PostTask( | 83 caller_task_runner_->PostTask( |
83 FROM_HERE, base::Bind(&DesktopCapturerProxy::OnFrameCaptured, proxy_, | 84 FROM_HERE, base::Bind(&DesktopCapturerProxy::OnFrameCaptured, proxy_, |
84 base::Passed(make_scoped_ptr(frame)))); | 85 base::Passed(base::WrapUnique(frame)))); |
85 } | 86 } |
86 | 87 |
87 DesktopCapturerProxy::DesktopCapturerProxy( | 88 DesktopCapturerProxy::DesktopCapturerProxy( |
88 scoped_refptr<base::SingleThreadTaskRunner> capture_task_runner, | 89 scoped_refptr<base::SingleThreadTaskRunner> capture_task_runner, |
89 scoped_ptr<webrtc::DesktopCapturer> capturer) | 90 std::unique_ptr<webrtc::DesktopCapturer> capturer) |
90 : capture_task_runner_(capture_task_runner), weak_factory_(this) { | 91 : capture_task_runner_(capture_task_runner), weak_factory_(this) { |
91 core_.reset(new Core(weak_factory_.GetWeakPtr(), capture_task_runner, | 92 core_.reset(new Core(weak_factory_.GetWeakPtr(), capture_task_runner, |
92 std::move(capturer))); | 93 std::move(capturer))); |
93 } | 94 } |
94 | 95 |
95 DesktopCapturerProxy::~DesktopCapturerProxy() { | 96 DesktopCapturerProxy::~DesktopCapturerProxy() { |
96 capture_task_runner_->DeleteSoon(FROM_HERE, core_.release()); | 97 capture_task_runner_->DeleteSoon(FROM_HERE, core_.release()); |
97 } | 98 } |
98 | 99 |
99 void DesktopCapturerProxy::Start(Callback* callback) { | 100 void DesktopCapturerProxy::Start(Callback* callback) { |
100 DCHECK(thread_checker_.CalledOnValidThread()); | 101 DCHECK(thread_checker_.CalledOnValidThread()); |
101 | 102 |
102 callback_ = callback; | 103 callback_ = callback; |
103 | 104 |
104 capture_task_runner_->PostTask( | 105 capture_task_runner_->PostTask( |
105 FROM_HERE, base::Bind(&Core::Start, base::Unretained(core_.get()))); | 106 FROM_HERE, base::Bind(&Core::Start, base::Unretained(core_.get()))); |
106 } | 107 } |
107 | 108 |
108 void DesktopCapturerProxy::SetSharedMemoryFactory( | 109 void DesktopCapturerProxy::SetSharedMemoryFactory( |
109 rtc::scoped_ptr<webrtc::SharedMemoryFactory> shared_memory_factory) { | 110 rtc::scoped_ptr<webrtc::SharedMemoryFactory> shared_memory_factory) { |
110 DCHECK(thread_checker_.CalledOnValidThread()); | 111 DCHECK(thread_checker_.CalledOnValidThread()); |
111 | 112 |
112 capture_task_runner_->PostTask( | 113 capture_task_runner_->PostTask( |
113 FROM_HERE, | 114 FROM_HERE, |
114 base::Bind( | 115 base::Bind( |
115 &Core::SetSharedMemoryFactory, base::Unretained(core_.get()), | 116 &Core::SetSharedMemoryFactory, base::Unretained(core_.get()), |
116 base::Passed(make_scoped_ptr(shared_memory_factory.release())))); | 117 base::Passed(base::WrapUnique(shared_memory_factory.release())))); |
117 } | 118 } |
118 | 119 |
119 void DesktopCapturerProxy::Capture(const webrtc::DesktopRegion& rect) { | 120 void DesktopCapturerProxy::Capture(const webrtc::DesktopRegion& rect) { |
120 DCHECK(thread_checker_.CalledOnValidThread()); | 121 DCHECK(thread_checker_.CalledOnValidThread()); |
121 | 122 |
122 // Start() must be called before Capture(). | 123 // Start() must be called before Capture(). |
123 DCHECK(callback_); | 124 DCHECK(callback_); |
124 | 125 |
125 capture_task_runner_->PostTask( | 126 capture_task_runner_->PostTask( |
126 FROM_HERE, | 127 FROM_HERE, |
127 base::Bind(&Core::Capture, base::Unretained(core_.get()), rect)); | 128 base::Bind(&Core::Capture, base::Unretained(core_.get()), rect)); |
128 } | 129 } |
129 | 130 |
130 void DesktopCapturerProxy::OnFrameCaptured( | 131 void DesktopCapturerProxy::OnFrameCaptured( |
131 scoped_ptr<webrtc::DesktopFrame> frame) { | 132 std::unique_ptr<webrtc::DesktopFrame> frame) { |
132 DCHECK(thread_checker_.CalledOnValidThread()); | 133 DCHECK(thread_checker_.CalledOnValidThread()); |
133 | 134 |
134 callback_->OnCaptureCompleted(frame.release()); | 135 callback_->OnCaptureCompleted(frame.release()); |
135 } | 136 } |
136 | 137 |
137 } // namespace remoting | 138 } // namespace remoting |
OLD | NEW |