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

Side by Side Diff: remoting/host/client_session.cc

Issue 15692018: Remove screen capturers from media/video/capture/screen. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 6 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 | Annotate | Revision Log
« no previous file with comments | « remoting/host/chromoting_messages.h ('k') | remoting/host/client_session_unittest.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/client_session.h" 5 #include "remoting/host/client_session.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "base/message_loop_proxy.h" 9 #include "base/message_loop_proxy.h"
10 #include "media/video/capture/screen/screen_capturer.h"
11 #include "remoting/base/capabilities.h" 10 #include "remoting/base/capabilities.h"
12 #include "remoting/codec/audio_encoder.h" 11 #include "remoting/codec/audio_encoder.h"
13 #include "remoting/codec/audio_encoder_opus.h" 12 #include "remoting/codec/audio_encoder_opus.h"
14 #include "remoting/codec/audio_encoder_speex.h" 13 #include "remoting/codec/audio_encoder_speex.h"
15 #include "remoting/codec/audio_encoder_verbatim.h" 14 #include "remoting/codec/audio_encoder_verbatim.h"
16 #include "remoting/codec/video_encoder.h" 15 #include "remoting/codec/video_encoder.h"
17 #include "remoting/codec/video_encoder_verbatim.h" 16 #include "remoting/codec/video_encoder_verbatim.h"
18 #include "remoting/codec/video_encoder_vp8.h" 17 #include "remoting/codec/video_encoder_vp8.h"
19 #include "remoting/host/audio_capturer.h" 18 #include "remoting/host/audio_capturer.h"
20 #include "remoting/host/audio_scheduler.h" 19 #include "remoting/host/audio_scheduler.h"
21 #include "remoting/host/desktop_environment.h" 20 #include "remoting/host/desktop_environment.h"
22 #include "remoting/host/input_injector.h" 21 #include "remoting/host/input_injector.h"
23 #include "remoting/host/screen_controls.h" 22 #include "remoting/host/screen_controls.h"
24 #include "remoting/host/screen_resolution.h" 23 #include "remoting/host/screen_resolution.h"
25 #include "remoting/host/video_scheduler.h" 24 #include "remoting/host/video_scheduler.h"
26 #include "remoting/proto/control.pb.h" 25 #include "remoting/proto/control.pb.h"
27 #include "remoting/proto/event.pb.h" 26 #include "remoting/proto/event.pb.h"
28 #include "remoting/protocol/client_stub.h" 27 #include "remoting/protocol/client_stub.h"
29 #include "remoting/protocol/clipboard_thread_proxy.h" 28 #include "remoting/protocol/clipboard_thread_proxy.h"
30 #include "remoting/protocol/pairing_registry.h" 29 #include "remoting/protocol/pairing_registry.h"
30 #include "third_party/webrtc/modules/desktop_capture/screen_capturer.h"
31 31
32 // Default DPI to assume for old clients that use notifyClientDimensions. 32 // Default DPI to assume for old clients that use notifyClientDimensions.
33 const int kDefaultDPI = 96; 33 const int kDefaultDPI = 96;
34 34
35 namespace remoting { 35 namespace remoting {
36 36
37 ClientSession::ClientSession( 37 ClientSession::ClientSession(
38 EventHandler* event_handler, 38 EventHandler* event_handler,
39 scoped_refptr<base::SingleThreadTaskRunner> audio_task_runner, 39 scoped_refptr<base::SingleThreadTaskRunner> audio_task_runner,
40 scoped_refptr<base::SingleThreadTaskRunner> input_task_runner, 40 scoped_refptr<base::SingleThreadTaskRunner> input_task_runner,
(...skipping 390 matching lines...) Expand 10 before | Expand all | Expand 10 after
431 return scoped_ptr<AudioEncoder>(new AudioEncoderSpeex()); 431 return scoped_ptr<AudioEncoder>(new AudioEncoderSpeex());
432 } else if (audio_config.codec == protocol::ChannelConfig::CODEC_OPUS) { 432 } else if (audio_config.codec == protocol::ChannelConfig::CODEC_OPUS) {
433 return scoped_ptr<AudioEncoder>(new AudioEncoderOpus()); 433 return scoped_ptr<AudioEncoder>(new AudioEncoderOpus());
434 } 434 }
435 435
436 NOTIMPLEMENTED(); 436 NOTIMPLEMENTED();
437 return scoped_ptr<AudioEncoder>(NULL); 437 return scoped_ptr<AudioEncoder>(NULL);
438 } 438 }
439 439
440 } // namespace remoting 440 } // namespace remoting
OLDNEW
« no previous file with comments | « remoting/host/chromoting_messages.h ('k') | remoting/host/client_session_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698