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

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

Issue 2879743002: [CRD iOS] Hook the touch input feedback (Closed)
Patch Set: Rebase 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
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> CreateRendererProxy();
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 base::WeakPtr<RendererProxy> renderer_proxy_;
70
64 // Will be std::move'd when GrabFrameConsumer() is called. 71 // Will be std::move'd when GrabFrameConsumer() is called.
65 std::unique_ptr<DualBufferFrameConsumer> owned_frame_consumer_; 72 std::unique_ptr<DualBufferFrameConsumer> owned_frame_consumer_;
66 base::WeakPtr<DualBufferFrameConsumer> frame_consumer_; 73 base::WeakPtr<DualBufferFrameConsumer> frame_consumer_;
67 74
68 // TODO(yuweih): Release references once the surface is destroyed. 75 // TODO(yuweih): Release references once the surface is destroyed.
69 EAGLContext* eagl_context_; 76 EAGLContext* eagl_context_;
70 std::unique_ptr<GlRenderer> renderer_; 77 std::unique_ptr<GlRenderer> renderer_;
71 // GlDemoScreen *demo_screen_; 78 // GlDemoScreen *demo_screen_;
72 id<GlDisplayHandlerDelegate> handler_delegate_; 79 id<GlDisplayHandlerDelegate> handler_delegate_;
73 80
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
106 if (!eagl_context_) { 113 if (!eagl_context_) {
107 // TODO(nicholss): For prod code, make sure to check for ES3 support and 114 // TODO(nicholss): For prod code, make sure to check for ES3 support and
108 // fall back to ES2 if needed. 115 // fall back to ES2 if needed.
109 eagl_context_ = 116 eagl_context_ =
110 [[EAGLContext alloc] initWithAPI:kEAGLRenderingAPIOpenGLES3]; 117 [[EAGLContext alloc] initWithAPI:kEAGLRenderingAPIOpenGLES3];
111 [EAGLContext setCurrentContext:eagl_context_]; 118 [EAGLContext setCurrentContext:eagl_context_];
112 } 119 }
113 120
114 renderer_ = remoting::GlRenderer::CreateGlRendererWithDesktop(); 121 renderer_ = remoting::GlRenderer::CreateGlRendererWithDesktop();
115 122
123 if (renderer_proxy_) {
124 renderer_proxy_->Initialize(renderer_->GetWeakPtr());
125 }
126
116 // renderer_.RequestCanvasSize(); 127 // renderer_.RequestCanvasSize();
117 128
118 // demo_screen_ = new GlDemoScreen(); 129 // demo_screen_ = new GlDemoScreen();
119 // renderer_->AddDrawable(demo_screen_->GetWeakPtr()); 130 // renderer_->AddDrawable(demo_screen_->GetWeakPtr());
120 renderer_->SetDelegate(weak_ptr_); 131 renderer_->SetDelegate(weak_ptr_);
121 } 132 }
122 133
123 void Core::SetHandlerDelegate(id<GlDisplayHandlerDelegate> delegate) { 134 void Core::SetHandlerDelegate(id<GlDisplayHandlerDelegate> delegate) {
124 DCHECK(runtime_->display_task_runner()->BelongsToCurrentThread()); 135 DCHECK(runtime_->display_task_runner()->BelongsToCurrentThread());
125 handler_delegate_ = delegate; 136 handler_delegate_ = delegate;
126 } 137 }
127 138
139 std::unique_ptr<RendererProxy> Core::CreateRendererProxy() {
140 DCHECK(!renderer_proxy_ && !renderer_);
141 RendererProxy* proxy = new RendererProxy(runtime_->display_task_runner());
142 renderer_proxy_ = proxy->GetWeakPtr();
143 return base::WrapUnique(proxy);
144 }
145
128 void Core::SetCursorShape(const protocol::CursorShapeInfo& cursor_shape) { 146 void Core::SetCursorShape(const protocol::CursorShapeInfo& cursor_shape) {
129 DCHECK(runtime_->display_task_runner()->BelongsToCurrentThread()); 147 DCHECK(runtime_->display_task_runner()->BelongsToCurrentThread());
130 renderer_->OnCursorShapeChanged(cursor_shape); 148 renderer_->OnCursorShapeChanged(cursor_shape);
131 } 149 }
132 150
133 bool Core::CanRenderFrame() { 151 bool Core::CanRenderFrame() {
134 DCHECK(runtime_->display_task_runner()->BelongsToCurrentThread()); 152 DCHECK(runtime_->display_task_runner()->BelongsToCurrentThread());
135 153
136 return eagl_context_ != nil; 154 return eagl_context_ != nil;
137 } 155 }
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
183 runtime_->network_task_runner()->PostTask( 201 runtime_->network_task_runner()->PostTask(
184 FROM_HERE, base::Bind(&DualBufferFrameConsumer::RequestFullDesktopFrame, 202 FROM_HERE, base::Bind(&DualBufferFrameConsumer::RequestFullDesktopFrame,
185 frame_consumer_)); 203 frame_consumer_));
186 } 204 }
187 205
188 void Core::SurfaceChanged(int width, int height) { 206 void Core::SurfaceChanged(int width, int height) {
189 DCHECK(runtime_->display_task_runner()->BelongsToCurrentThread()); 207 DCHECK(runtime_->display_task_runner()->BelongsToCurrentThread());
190 renderer_->OnSurfaceChanged(width, height); 208 renderer_->OnSurfaceChanged(width, height);
191 } 209 }
192 210
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() { 211 EAGLContext* Core::GetEAGLContext() {
199 return eagl_context_; 212 return eagl_context_;
200 } 213 }
201 214
202 base::WeakPtr<remoting::GlDisplayHandler::Core> Core::GetWeakPtr() { 215 base::WeakPtr<remoting::GlDisplayHandler::Core> Core::GetWeakPtr() {
203 return weak_ptr_; 216 return weak_ptr_;
204 } 217 }
205 218
206 } // namespace GlDisplayHandler 219 } // namespace GlDisplayHandler
207 } // namespace remoting 220 } // namespace remoting
208 221
209 @interface GlDisplayHandler () { 222 @interface GlDisplayHandler () {
210 std::unique_ptr<remoting::GlDisplayHandler::Core> _core; 223 std::unique_ptr<remoting::GlDisplayHandler::Core> _core;
211 remoting::ChromotingClientRuntime* _runtime; 224 remoting::ChromotingClientRuntime* _runtime;
212 std::unique_ptr<remoting::QueuedTaskPoster> _uiTaskPoster;
213 } 225 }
214 @end 226 @end
215 227
216 @implementation GlDisplayHandler 228 @implementation GlDisplayHandler
217 229
218 - (id)init { 230 - (id)init {
219 self = [super init]; 231 self = [super init];
220 if (self) { 232 if (self) {
221 _runtime = remoting::ChromotingClientRuntime::GetInstance(); 233 _runtime = remoting::ChromotingClientRuntime::GetInstance();
222 _core.reset(new remoting::GlDisplayHandler::Core()); 234 _core.reset(new remoting::GlDisplayHandler::Core());
223 _uiTaskPoster.reset(
224 new remoting::QueuedTaskPoster(_runtime->display_task_runner()));
225 } 235 }
226 return self; 236 return self;
227 } 237 }
228 238
229 - (void)dealloc { 239 - (void)dealloc {
230 _runtime->display_task_runner()->DeleteSoon(FROM_HERE, _core.release()); 240 _runtime->display_task_runner()->DeleteSoon(FROM_HERE, _core.release());
231 } 241 }
232 242
233 #pragma mark - Public 243 #pragma mark - Public
234 244
235 - (void)stop { 245 - (void)stop {
236 _runtime->display_task_runner()->PostTask( 246 _runtime->display_task_runner()->PostTask(
237 FROM_HERE, 247 FROM_HERE,
238 base::Bind(&remoting::GlDisplayHandler::Core::Stop, _core->GetWeakPtr())); 248 base::Bind(&remoting::GlDisplayHandler::Core::Stop, _core->GetWeakPtr()));
239 } 249 }
240 250
251 - (std::unique_ptr<remoting::RendererProxy>)CreateRendererProxy {
252 return _core->CreateRendererProxy();
253 }
254
241 - (std::unique_ptr<remoting::protocol::VideoRenderer>)CreateVideoRenderer { 255 - (std::unique_ptr<remoting::protocol::VideoRenderer>)CreateVideoRenderer {
242 return base::MakeUnique<remoting::SoftwareVideoRenderer>( 256 return base::MakeUnique<remoting::SoftwareVideoRenderer>(
243 _core->GrabFrameConsumer()); 257 _core->GrabFrameConsumer());
244 } 258 }
245 259
246 - (std::unique_ptr<remoting::protocol::CursorShapeStub>)CreateCursorShapeStub { 260 - (std::unique_ptr<remoting::protocol::CursorShapeStub>)CreateCursorShapeStub {
247 return base::MakeUnique<remoting::CursorShapeStubProxy>( 261 return base::MakeUnique<remoting::CursorShapeStubProxy>(
248 _core->GetWeakPtr(), _runtime->display_task_runner()); 262 _core->GetWeakPtr(), _runtime->display_task_runner());
249 } 263 }
250 264
251 - (EAGLContext*)GetEAGLContext { 265 - (EAGLContext*)GetEAGLContext {
252 return _core->GetEAGLContext(); 266 return _core->GetEAGLContext();
253 } 267 }
254 268
255 - (void)onSurfaceCreated:(GLKView*)view { 269 - (void)onSurfaceCreated:(GLKView*)view {
256 _runtime->display_task_runner()->PostTask( 270 _runtime->display_task_runner()->PostTask(
257 FROM_HERE, base::Bind(&remoting::GlDisplayHandler::Core::SurfaceCreated, 271 FROM_HERE, base::Bind(&remoting::GlDisplayHandler::Core::SurfaceCreated,
258 _core->GetWeakPtr(), view)); 272 _core->GetWeakPtr(), view));
259 } 273 }
260 274
261 - (void)onSurfaceChanged:(const CGRect&)frame { 275 - (void)onSurfaceChanged:(const CGRect&)frame {
262 _runtime->display_task_runner()->PostTask( 276 _runtime->display_task_runner()->PostTask(
263 FROM_HERE, 277 FROM_HERE,
264 base::Bind(&remoting::GlDisplayHandler::Core::SurfaceChanged, 278 base::Bind(&remoting::GlDisplayHandler::Core::SurfaceChanged,
265 _core->GetWeakPtr(), frame.size.width, frame.size.height)); 279 _core->GetWeakPtr(), frame.size.width, frame.size.height));
266 } 280 }
267 281
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 282 #pragma mark - Properties
275 283
276 - (void)setDelegate:(id<GlDisplayHandlerDelegate>)delegate { 284 - (void)setDelegate:(id<GlDisplayHandlerDelegate>)delegate {
277 _runtime->display_task_runner()->PostTask( 285 _runtime->display_task_runner()->PostTask(
278 FROM_HERE, 286 FROM_HERE,
279 base::Bind(&remoting::GlDisplayHandler::Core::SetHandlerDelegate, 287 base::Bind(&remoting::GlDisplayHandler::Core::SetHandlerDelegate,
280 _core->GetWeakPtr(), delegate)); 288 _core->GetWeakPtr(), delegate));
281 } 289 }
282 290
283 - (id<GlDisplayHandlerDelegate>)delegate { 291 - (id<GlDisplayHandlerDelegate>)delegate {
284 // Implementation is still required for UNAVAILABLE_ATTRIBUTE. 292 // Implementation is still required for UNAVAILABLE_ATTRIBUTE.
285 NOTREACHED(); 293 NOTREACHED();
286 return nil; 294 return nil;
287 } 295 }
288 296
289 @end 297 @end
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698