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

Side by Side Diff: remoting/ios/display/gl_display_handler.mm

Issue 2879743002: [CRD iOS] Hook the touch input feedback (Closed)
Patch Set: Fix dependency and race condition Created 3 years, 7 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
« no previous file with comments | « remoting/ios/display/gl_display_handler.h ('k') | remoting/ios/session/remoting_client.mm » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2017 The Chromium Authors. All rights reserved. 1 // Copyright 2017 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 #if !defined(__has_feature) || !__has_feature(objc_arc) 5 #if !defined(__has_feature) || !__has_feature(objc_arc)
6 #error "This file requires ARC support." 6 #error "This file requires ARC support."
7 #endif 7 #endif
8 8
9 #include <array> 9 #include <array>
10 10
11 #import "remoting/ios/display/gl_display_handler.h" 11 #import "remoting/ios/display/gl_display_handler.h"
12 12
13 #import "base/mac/bind_objc_block.h" 13 #import "base/mac/bind_objc_block.h"
14 #import "remoting/client/display/sys_opengl.h" 14 #import "remoting/client/display/sys_opengl.h"
15 #import "remoting/ios/display/gl_demo_screen.h" 15 #import "remoting/ios/display/gl_demo_screen.h"
16 16
17 #include "base/bind.h" 17 #include "base/bind.h"
18 #include "base/macros.h" 18 #include "base/macros.h"
19 #include "base/memory/ptr_util.h" 19 #include "base/memory/ptr_util.h"
20 #include "base/memory/weak_ptr.h" 20 #include "base/memory/weak_ptr.h"
21 #include "remoting/client/chromoting_client_runtime.h" 21 #include "remoting/client/chromoting_client_runtime.h"
22 #include "remoting/client/cursor_shape_stub_proxy.h" 22 #include "remoting/client/cursor_shape_stub_proxy.h"
23 #include "remoting/client/display/gl_canvas.h" 23 #include "remoting/client/display/gl_canvas.h"
24 #include "remoting/client/display/gl_renderer.h" 24 #include "remoting/client/display/gl_renderer.h"
25 #include "remoting/client/display/gl_renderer_delegate.h" 25 #include "remoting/client/display/gl_renderer_delegate.h"
26 #include "remoting/client/dual_buffer_frame_consumer.h" 26 #include "remoting/client/dual_buffer_frame_consumer.h"
27 #include "remoting/client/queued_task_poster.h"
28 #include "remoting/client/software_video_renderer.h" 27 #include "remoting/client/software_video_renderer.h"
28 #include "remoting/client/ui/renderer_proxy.h"
29 29
30 namespace remoting { 30 namespace remoting {
31
32 class ViewMatrix;
33
31 namespace GlDisplayHandler { 34 namespace GlDisplayHandler {
32 35
33 // The core that lives on the display thread. 36 // The core that lives on the display thread.
34 class Core : public protocol::CursorShapeStub, public GlRendererDelegate { 37 class Core : public protocol::CursorShapeStub, public GlRendererDelegate {
35 public: 38 public:
36 Core(); 39 Core();
37 ~Core() override; 40 ~Core() override;
38 41
39 void Initialize(); 42 void Initialize();
40 43
41 void SetHandlerDelegate(id<GlDisplayHandlerDelegate> delegate); 44 void SetHandlerDelegate(id<GlDisplayHandlerDelegate> delegate);
42 45
46 std::unique_ptr<RendererProxy> GrabRendererProxy();
47
43 // CursorShapeStub interface. 48 // CursorShapeStub interface.
44 void SetCursorShape(const protocol::CursorShapeInfo& cursor_shape) override; 49 void SetCursorShape(const protocol::CursorShapeInfo& cursor_shape) override;
45 50
46 // GlRendererDelegate interface. 51 // GlRendererDelegate interface.
47 bool CanRenderFrame() override; 52 bool CanRenderFrame() override;
48 void OnFrameRendered() override; 53 void OnFrameRendered() override;
49 void OnSizeChanged(int width, int height) override; 54 void OnSizeChanged(int width, int height) override;
50 55
51 void OnFrameReceived(std::unique_ptr<webrtc::DesktopFrame> frame, 56 void OnFrameReceived(std::unique_ptr<webrtc::DesktopFrame> frame,
52 const base::Closure& done); 57 const base::Closure& done);
53 void Stop(); 58 void Stop();
54 void SurfaceCreated(GLKView* view); 59 void SurfaceCreated(GLKView* view);
55 void SurfaceChanged(int width, int height); 60 void SurfaceChanged(int width, int height);
56 void SetTransformation(const remoting::ViewMatrix& matrix); 61
57 std::unique_ptr<protocol::FrameConsumer> GrabFrameConsumer(); 62 std::unique_ptr<protocol::FrameConsumer> GrabFrameConsumer();
58 EAGLContext* GetEAGLContext(); 63 EAGLContext* GetEAGLContext();
59 base::WeakPtr<Core> GetWeakPtr(); 64 base::WeakPtr<Core> GetWeakPtr();
60 65
61 private: 66 private:
62 remoting::ChromotingClientRuntime* runtime_; 67 remoting::ChromotingClientRuntime* runtime_;
63 68
69 // Will be std::move'd when GrabRendererProxy() is called.
70 std::unique_ptr<RendererProxy> owned_renderer_proxy_;
71 base::WeakPtr<RendererProxy> renderer_proxy_;
72
64 // Will be std::move'd when GrabFrameConsumer() is called. 73 // Will be std::move'd when GrabFrameConsumer() is called.
65 std::unique_ptr<DualBufferFrameConsumer> owned_frame_consumer_; 74 std::unique_ptr<DualBufferFrameConsumer> owned_frame_consumer_;
66 base::WeakPtr<DualBufferFrameConsumer> frame_consumer_; 75 base::WeakPtr<DualBufferFrameConsumer> frame_consumer_;
67 76
68 // TODO(yuweih): Release references once the surface is destroyed. 77 // TODO(yuweih): Release references once the surface is destroyed.
69 EAGLContext* eagl_context_; 78 EAGLContext* eagl_context_;
70 std::unique_ptr<GlRenderer> renderer_; 79 std::unique_ptr<GlRenderer> renderer_;
71 // GlDemoScreen *demo_screen_; 80 // GlDemoScreen *demo_screen_;
72 id<GlDisplayHandlerDelegate> handler_delegate_; 81 id<GlDisplayHandlerDelegate> handler_delegate_;
73 82
(...skipping 12 matching lines...) Expand all
86 95
87 runtime_->display_task_runner()->PostTask( 96 runtime_->display_task_runner()->PostTask(
88 FROM_HERE, base::Bind(&Core::Initialize, base::Unretained(this))); 97 FROM_HERE, base::Bind(&Core::Initialize, base::Unretained(this)));
89 98
90 // Do not bind GlRenderer::OnFrameReceived. |renderer_| is not ready yet. 99 // Do not bind GlRenderer::OnFrameReceived. |renderer_| is not ready yet.
91 owned_frame_consumer_.reset(new remoting::DualBufferFrameConsumer( 100 owned_frame_consumer_.reset(new remoting::DualBufferFrameConsumer(
92 base::Bind(&Core::OnFrameReceived, weak_ptr_), 101 base::Bind(&Core::OnFrameReceived, weak_ptr_),
93 runtime_->display_task_runner(), 102 runtime_->display_task_runner(),
94 protocol::FrameConsumer::PixelFormat::FORMAT_RGBA)); 103 protocol::FrameConsumer::PixelFormat::FORMAT_RGBA));
95 frame_consumer_ = owned_frame_consumer_->GetWeakPtr(); 104 frame_consumer_ = owned_frame_consumer_->GetWeakPtr();
105
106 owned_renderer_proxy_.reset(
107 new RendererProxy(runtime_->display_task_runner()));
108 renderer_proxy_ = owned_renderer_proxy_->GetWeakPtr();
96 } 109 }
97 110
98 Core::~Core() { 111 Core::~Core() {
99 DCHECK(runtime_->display_task_runner()->BelongsToCurrentThread()); 112 DCHECK(runtime_->display_task_runner()->BelongsToCurrentThread());
100 } 113 }
101 114
102 void Core::Initialize() { 115 void Core::Initialize() {
103 DCHECK(runtime_->display_task_runner()->BelongsToCurrentThread()); 116 DCHECK(runtime_->display_task_runner()->BelongsToCurrentThread());
104 117
105 eagl_context_ = [EAGLContext currentContext]; 118 eagl_context_ = [EAGLContext currentContext];
106 if (!eagl_context_) { 119 if (!eagl_context_) {
107 // TODO(nicholss): For prod code, make sure to check for ES3 support and 120 // TODO(nicholss): For prod code, make sure to check for ES3 support and
108 // fall back to ES2 if needed. 121 // fall back to ES2 if needed.
109 eagl_context_ = 122 eagl_context_ =
110 [[EAGLContext alloc] initWithAPI:kEAGLRenderingAPIOpenGLES3]; 123 [[EAGLContext alloc] initWithAPI:kEAGLRenderingAPIOpenGLES3];
111 [EAGLContext setCurrentContext:eagl_context_]; 124 [EAGLContext setCurrentContext:eagl_context_];
112 } 125 }
113 126
114 renderer_ = remoting::GlRenderer::CreateGlRendererWithDesktop(); 127 renderer_ = remoting::GlRenderer::CreateGlRendererWithDesktop();
115 128
129 renderer_proxy_->Initialize(renderer_->GetWeakPtr());
130
116 // renderer_.RequestCanvasSize(); 131 // renderer_.RequestCanvasSize();
117 132
118 // demo_screen_ = new GlDemoScreen(); 133 // demo_screen_ = new GlDemoScreen();
119 // renderer_->AddDrawable(demo_screen_->GetWeakPtr()); 134 // renderer_->AddDrawable(demo_screen_->GetWeakPtr());
120 renderer_->SetDelegate(weak_ptr_); 135 renderer_->SetDelegate(weak_ptr_);
121 } 136 }
122 137
123 void Core::SetHandlerDelegate(id<GlDisplayHandlerDelegate> delegate) { 138 void Core::SetHandlerDelegate(id<GlDisplayHandlerDelegate> delegate) {
124 DCHECK(runtime_->display_task_runner()->BelongsToCurrentThread()); 139 DCHECK(runtime_->display_task_runner()->BelongsToCurrentThread());
125 handler_delegate_ = delegate; 140 handler_delegate_ = delegate;
126 } 141 }
127 142
143 std::unique_ptr<RendererProxy> Core::GrabRendererProxy() {
144 DCHECK(owned_renderer_proxy_);
145 return std::move(owned_renderer_proxy_);
146 }
147
128 void Core::SetCursorShape(const protocol::CursorShapeInfo& cursor_shape) { 148 void Core::SetCursorShape(const protocol::CursorShapeInfo& cursor_shape) {
129 DCHECK(runtime_->display_task_runner()->BelongsToCurrentThread()); 149 DCHECK(runtime_->display_task_runner()->BelongsToCurrentThread());
130 renderer_->OnCursorShapeChanged(cursor_shape); 150 renderer_->OnCursorShapeChanged(cursor_shape);
131 } 151 }
132 152
133 bool Core::CanRenderFrame() { 153 bool Core::CanRenderFrame() {
134 DCHECK(runtime_->display_task_runner()->BelongsToCurrentThread()); 154 DCHECK(runtime_->display_task_runner()->BelongsToCurrentThread());
135 155
136 return eagl_context_ != nil; 156 return eagl_context_ != nil;
137 } 157 }
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
183 runtime_->network_task_runner()->PostTask( 203 runtime_->network_task_runner()->PostTask(
184 FROM_HERE, base::Bind(&DualBufferFrameConsumer::RequestFullDesktopFrame, 204 FROM_HERE, base::Bind(&DualBufferFrameConsumer::RequestFullDesktopFrame,
185 frame_consumer_)); 205 frame_consumer_));
186 } 206 }
187 207
188 void Core::SurfaceChanged(int width, int height) { 208 void Core::SurfaceChanged(int width, int height) {
189 DCHECK(runtime_->display_task_runner()->BelongsToCurrentThread()); 209 DCHECK(runtime_->display_task_runner()->BelongsToCurrentThread());
190 renderer_->OnSurfaceChanged(width, height); 210 renderer_->OnSurfaceChanged(width, height);
191 } 211 }
192 212
193 void Core::SetTransformation(const remoting::ViewMatrix& matrix) {
194 DCHECK(runtime_->display_task_runner()->BelongsToCurrentThread());
195 renderer_->OnPixelTransformationChanged(matrix.ToMatrixArray());
196 }
197
198 EAGLContext* Core::GetEAGLContext() { 213 EAGLContext* Core::GetEAGLContext() {
199 return eagl_context_; 214 return eagl_context_;
200 } 215 }
201 216
202 base::WeakPtr<remoting::GlDisplayHandler::Core> Core::GetWeakPtr() { 217 base::WeakPtr<remoting::GlDisplayHandler::Core> Core::GetWeakPtr() {
203 return weak_ptr_; 218 return weak_ptr_;
204 } 219 }
205 220
206 } // namespace GlDisplayHandler 221 } // namespace GlDisplayHandler
207 } // namespace remoting 222 } // namespace remoting
208 223
209 @interface GlDisplayHandler () { 224 @interface GlDisplayHandler () {
210 std::unique_ptr<remoting::GlDisplayHandler::Core> _core; 225 std::unique_ptr<remoting::GlDisplayHandler::Core> _core;
211 remoting::ChromotingClientRuntime* _runtime; 226 remoting::ChromotingClientRuntime* _runtime;
212 std::unique_ptr<remoting::QueuedTaskPoster> _uiTaskPoster;
213 } 227 }
214 @end 228 @end
215 229
216 @implementation GlDisplayHandler 230 @implementation GlDisplayHandler
217 231
218 - (id)init { 232 - (id)init {
219 self = [super init]; 233 self = [super init];
220 if (self) { 234 if (self) {
221 _runtime = remoting::ChromotingClientRuntime::GetInstance(); 235 _runtime = remoting::ChromotingClientRuntime::GetInstance();
222 _core.reset(new remoting::GlDisplayHandler::Core()); 236 _core.reset(new remoting::GlDisplayHandler::Core());
223 _uiTaskPoster.reset(
224 new remoting::QueuedTaskPoster(_runtime->display_task_runner()));
225 } 237 }
226 return self; 238 return self;
227 } 239 }
228 240
229 - (void)dealloc { 241 - (void)dealloc {
230 _runtime->display_task_runner()->DeleteSoon(FROM_HERE, _core.release()); 242 _runtime->display_task_runner()->DeleteSoon(FROM_HERE, _core.release());
231 } 243 }
232 244
233 #pragma mark - Public 245 #pragma mark - Public
234 246
235 - (void)stop { 247 - (void)stop {
236 _runtime->display_task_runner()->PostTask( 248 _runtime->display_task_runner()->PostTask(
237 FROM_HERE, 249 FROM_HERE,
238 base::Bind(&remoting::GlDisplayHandler::Core::Stop, _core->GetWeakPtr())); 250 base::Bind(&remoting::GlDisplayHandler::Core::Stop, _core->GetWeakPtr()));
239 } 251 }
240 252
253 - (std::unique_ptr<remoting::RendererProxy>)CreateRendererProxy {
254 return _core->GrabRendererProxy();
255 }
256
241 - (std::unique_ptr<remoting::protocol::VideoRenderer>)CreateVideoRenderer { 257 - (std::unique_ptr<remoting::protocol::VideoRenderer>)CreateVideoRenderer {
242 return base::MakeUnique<remoting::SoftwareVideoRenderer>( 258 return base::MakeUnique<remoting::SoftwareVideoRenderer>(
243 _core->GrabFrameConsumer()); 259 _core->GrabFrameConsumer());
244 } 260 }
245 261
246 - (std::unique_ptr<remoting::protocol::CursorShapeStub>)CreateCursorShapeStub { 262 - (std::unique_ptr<remoting::protocol::CursorShapeStub>)CreateCursorShapeStub {
247 return base::MakeUnique<remoting::CursorShapeStubProxy>( 263 return base::MakeUnique<remoting::CursorShapeStubProxy>(
248 _core->GetWeakPtr(), _runtime->display_task_runner()); 264 _core->GetWeakPtr(), _runtime->display_task_runner());
249 } 265 }
250 266
251 - (EAGLContext*)GetEAGLContext { 267 - (EAGLContext*)GetEAGLContext {
252 return _core->GetEAGLContext(); 268 return _core->GetEAGLContext();
253 } 269 }
254 270
255 - (void)onSurfaceCreated:(GLKView*)view { 271 - (void)onSurfaceCreated:(GLKView*)view {
256 _runtime->display_task_runner()->PostTask( 272 _runtime->display_task_runner()->PostTask(
257 FROM_HERE, base::Bind(&remoting::GlDisplayHandler::Core::SurfaceCreated, 273 FROM_HERE, base::Bind(&remoting::GlDisplayHandler::Core::SurfaceCreated,
258 _core->GetWeakPtr(), view)); 274 _core->GetWeakPtr(), view));
259 } 275 }
260 276
261 - (void)onSurfaceChanged:(const CGRect&)frame { 277 - (void)onSurfaceChanged:(const CGRect&)frame {
262 _runtime->display_task_runner()->PostTask( 278 _runtime->display_task_runner()->PostTask(
263 FROM_HERE, 279 FROM_HERE,
264 base::Bind(&remoting::GlDisplayHandler::Core::SurfaceChanged, 280 base::Bind(&remoting::GlDisplayHandler::Core::SurfaceChanged,
265 _core->GetWeakPtr(), frame.size.width, frame.size.height)); 281 _core->GetWeakPtr(), frame.size.width, frame.size.height));
266 } 282 }
267 283
268 - (void)onPixelTransformationChanged:(const remoting::ViewMatrix&)matrix {
269 _uiTaskPoster->AddTask(
270 base::Bind(&remoting::GlDisplayHandler::Core::SetTransformation,
271 _core->GetWeakPtr(), matrix));
272 }
273
274 #pragma mark - Properties 284 #pragma mark - Properties
275 285
276 - (void)setDelegate:(id<GlDisplayHandlerDelegate>)delegate { 286 - (void)setDelegate:(id<GlDisplayHandlerDelegate>)delegate {
277 _runtime->display_task_runner()->PostTask( 287 _runtime->display_task_runner()->PostTask(
278 FROM_HERE, 288 FROM_HERE,
279 base::Bind(&remoting::GlDisplayHandler::Core::SetHandlerDelegate, 289 base::Bind(&remoting::GlDisplayHandler::Core::SetHandlerDelegate,
280 _core->GetWeakPtr(), delegate)); 290 _core->GetWeakPtr(), delegate));
281 } 291 }
282 292
283 - (id<GlDisplayHandlerDelegate>)delegate { 293 - (id<GlDisplayHandlerDelegate>)delegate {
284 // Implementation is still required for UNAVAILABLE_ATTRIBUTE. 294 // Implementation is still required for UNAVAILABLE_ATTRIBUTE.
285 NOTREACHED(); 295 NOTREACHED();
286 return nil; 296 return nil;
287 } 297 }
288 298
289 @end 299 @end
OLDNEW
« no previous file with comments | « remoting/ios/display/gl_display_handler.h ('k') | remoting/ios/session/remoting_client.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698