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

Side by Side Diff: remoting/host/win/session_desktop_environment.cc

Issue 1673723002: Use IpcVideoFrameCapturer on network thread instead of capturer thread. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.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
« no previous file with comments | « remoting/host/win/session_desktop_environment.h ('k') | remoting/test/protocol_perftest.cc » ('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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/win/session_desktop_environment.h" 5 #include "remoting/host/win/session_desktop_environment.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/single_thread_task_runner.h" 10 #include "base/single_thread_task_runner.h"
(...skipping 11 matching lines...) Expand all
22 DCHECK(caller_task_runner()->BelongsToCurrentThread()); 22 DCHECK(caller_task_runner()->BelongsToCurrentThread());
23 23
24 return make_scoped_ptr(new SessionInputInjectorWin( 24 return make_scoped_ptr(new SessionInputInjectorWin(
25 input_task_runner(), 25 input_task_runner(),
26 InputInjector::Create(input_task_runner(), ui_task_runner()), 26 InputInjector::Create(input_task_runner(), ui_task_runner()),
27 ui_task_runner(), inject_sas_)); 27 ui_task_runner(), inject_sas_));
28 } 28 }
29 29
30 SessionDesktopEnvironment::SessionDesktopEnvironment( 30 SessionDesktopEnvironment::SessionDesktopEnvironment(
31 scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner, 31 scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner,
32 scoped_refptr<base::SingleThreadTaskRunner> video_capture_task_runner,
32 scoped_refptr<base::SingleThreadTaskRunner> input_task_runner, 33 scoped_refptr<base::SingleThreadTaskRunner> input_task_runner,
33 scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner, 34 scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner,
34 const base::Closure& inject_sas, 35 const base::Closure& inject_sas,
35 bool supports_touch_events) 36 bool supports_touch_events)
36 : Me2MeDesktopEnvironment(caller_task_runner, 37 : Me2MeDesktopEnvironment(caller_task_runner,
38 video_capture_task_runner,
37 input_task_runner, 39 input_task_runner,
38 ui_task_runner, 40 ui_task_runner,
39 supports_touch_events), 41 supports_touch_events),
40 inject_sas_(inject_sas) { 42 inject_sas_(inject_sas) {}
41 }
42 43
43 SessionDesktopEnvironmentFactory::SessionDesktopEnvironmentFactory( 44 SessionDesktopEnvironmentFactory::SessionDesktopEnvironmentFactory(
44 scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner, 45 scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner,
46 scoped_refptr<base::SingleThreadTaskRunner> video_capture_task_runner,
45 scoped_refptr<base::SingleThreadTaskRunner> input_task_runner, 47 scoped_refptr<base::SingleThreadTaskRunner> input_task_runner,
46 scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner, 48 scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner,
47 const base::Closure& inject_sas) 49 const base::Closure& inject_sas)
48 : Me2MeDesktopEnvironmentFactory(caller_task_runner, 50 : Me2MeDesktopEnvironmentFactory(caller_task_runner,
51 video_capture_task_runner,
49 input_task_runner, 52 input_task_runner,
50 ui_task_runner), 53 ui_task_runner),
51 inject_sas_(inject_sas) { 54 inject_sas_(inject_sas) {
52 DCHECK(caller_task_runner->BelongsToCurrentThread()); 55 DCHECK(caller_task_runner->BelongsToCurrentThread());
53 } 56 }
54 57
55 SessionDesktopEnvironmentFactory::~SessionDesktopEnvironmentFactory() { 58 SessionDesktopEnvironmentFactory::~SessionDesktopEnvironmentFactory() {}
56 }
57 59
58 scoped_ptr<DesktopEnvironment> SessionDesktopEnvironmentFactory::Create( 60 scoped_ptr<DesktopEnvironment> SessionDesktopEnvironmentFactory::Create(
59 base::WeakPtr<ClientSessionControl> client_session_control) { 61 base::WeakPtr<ClientSessionControl> client_session_control) {
60 DCHECK(caller_task_runner()->BelongsToCurrentThread()); 62 DCHECK(caller_task_runner()->BelongsToCurrentThread());
61 63
62 scoped_ptr<SessionDesktopEnvironment> desktop_environment( 64 scoped_ptr<SessionDesktopEnvironment> desktop_environment(
63 new SessionDesktopEnvironment(caller_task_runner(), input_task_runner(), 65 new SessionDesktopEnvironment(caller_task_runner(),
64 ui_task_runner(), inject_sas_, 66 video_capture_task_runner(),
65 supports_touch_events())); 67 input_task_runner(), ui_task_runner(),
68 inject_sas_, supports_touch_events()));
66 if (!desktop_environment->InitializeSecurity(client_session_control, 69 if (!desktop_environment->InitializeSecurity(client_session_control,
67 curtain_enabled())) { 70 curtain_enabled())) {
68 return nullptr; 71 return nullptr;
69 } 72 }
70 73
71 return std::move(desktop_environment); 74 return std::move(desktop_environment);
72 } 75 }
73 76
74 } // namespace remoting 77 } // namespace remoting
OLDNEW
« no previous file with comments | « remoting/host/win/session_desktop_environment.h ('k') | remoting/test/protocol_perftest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698