OLD | NEW |
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/basic_desktop_environment.h" | 5 #include "remoting/host/basic_desktop_environment.h" |
6 | 6 |
7 #include "base/logging.h" | 7 #include "base/logging.h" |
8 #include "remoting/capturer/video_frame_capturer.h" | 8 #include "media/video/capture/screen/screen_capturer.h" |
9 #include "remoting/host/audio_capturer.h" | 9 #include "remoting/host/audio_capturer.h" |
10 #include "remoting/host/event_executor.h" | 10 #include "remoting/host/event_executor.h" |
11 | 11 |
12 namespace remoting { | 12 namespace remoting { |
13 | 13 |
14 BasicDesktopEnvironment::BasicDesktopEnvironment() { | 14 BasicDesktopEnvironment::BasicDesktopEnvironment() { |
15 } | 15 } |
16 | 16 |
17 BasicDesktopEnvironment::~BasicDesktopEnvironment() { | 17 BasicDesktopEnvironment::~BasicDesktopEnvironment() { |
18 DCHECK(CalledOnValidThread()); | 18 DCHECK(CalledOnValidThread()); |
19 } | 19 } |
20 | 20 |
21 scoped_ptr<AudioCapturer> BasicDesktopEnvironment::CreateAudioCapturer( | 21 scoped_ptr<AudioCapturer> BasicDesktopEnvironment::CreateAudioCapturer( |
22 scoped_refptr<base::SingleThreadTaskRunner> audio_task_runner) { | 22 scoped_refptr<base::SingleThreadTaskRunner> audio_task_runner) { |
23 DCHECK(CalledOnValidThread()); | 23 DCHECK(CalledOnValidThread()); |
24 | 24 |
25 return AudioCapturer::Create(); | 25 return AudioCapturer::Create(); |
26 } | 26 } |
27 | 27 |
28 scoped_ptr<EventExecutor> BasicDesktopEnvironment::CreateEventExecutor( | 28 scoped_ptr<EventExecutor> BasicDesktopEnvironment::CreateEventExecutor( |
29 scoped_refptr<base::SingleThreadTaskRunner> input_task_runner, | 29 scoped_refptr<base::SingleThreadTaskRunner> input_task_runner, |
30 scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner) { | 30 scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner) { |
31 DCHECK(CalledOnValidThread()); | 31 DCHECK(CalledOnValidThread()); |
32 | 32 |
33 return EventExecutor::Create(input_task_runner, ui_task_runner); | 33 return EventExecutor::Create(input_task_runner, ui_task_runner); |
34 } | 34 } |
35 | 35 |
36 scoped_ptr<VideoFrameCapturer> BasicDesktopEnvironment::CreateVideoCapturer( | 36 scoped_ptr<media::ScreenCapturer> BasicDesktopEnvironment::CreateVideoCapturer( |
37 scoped_refptr<base::SingleThreadTaskRunner> capture_task_runner, | 37 scoped_refptr<base::SingleThreadTaskRunner> capture_task_runner, |
38 scoped_refptr<base::SingleThreadTaskRunner> encode_task_runner) { | 38 scoped_refptr<base::SingleThreadTaskRunner> encode_task_runner) { |
39 DCHECK(CalledOnValidThread()); | 39 DCHECK(CalledOnValidThread()); |
40 | 40 |
41 return VideoFrameCapturer::Create(); | 41 return media::ScreenCapturer::Create(); |
42 } | 42 } |
43 | 43 |
44 BasicDesktopEnvironmentFactory::BasicDesktopEnvironmentFactory() { | 44 BasicDesktopEnvironmentFactory::BasicDesktopEnvironmentFactory() { |
45 } | 45 } |
46 | 46 |
47 BasicDesktopEnvironmentFactory::~BasicDesktopEnvironmentFactory() { | 47 BasicDesktopEnvironmentFactory::~BasicDesktopEnvironmentFactory() { |
48 } | 48 } |
49 | 49 |
50 scoped_ptr<DesktopEnvironment> BasicDesktopEnvironmentFactory::Create( | 50 scoped_ptr<DesktopEnvironment> BasicDesktopEnvironmentFactory::Create( |
51 const std::string& client_jid, | 51 const std::string& client_jid, |
52 const base::Closure& disconnect_callback) { | 52 const base::Closure& disconnect_callback) { |
53 return scoped_ptr<DesktopEnvironment>(new BasicDesktopEnvironment()); | 53 return scoped_ptr<DesktopEnvironment>(new BasicDesktopEnvironment()); |
54 } | 54 } |
55 | 55 |
56 bool BasicDesktopEnvironmentFactory::SupportsAudioCapture() const { | 56 bool BasicDesktopEnvironmentFactory::SupportsAudioCapture() const { |
57 return AudioCapturer::IsSupported(); | 57 return AudioCapturer::IsSupported(); |
58 } | 58 } |
59 | 59 |
60 } // namespace remoting | 60 } // namespace remoting |
OLD | NEW |