diff options
author | sergeyu <sergeyu@chromium.org> | 2015-02-13 12:33:28 -0800 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-02-13 20:34:18 +0000 |
commit | 7bc87603f0d16d150a1759b7196c1e65f54f8fd6 (patch) | |
tree | b19033e58e083b49e9aaaea9293a9b1de81114b2 /remoting/host/client_session.h | |
parent | d173a2ebe529d43147c87dafb4d8e2e988728960 (diff) | |
download | chromium_src-7bc87603f0d16d150a1759b7196c1e65f54f8fd6.zip chromium_src-7bc87603f0d16d150a1759b7196c1e65f54f8fd6.tar.gz chromium_src-7bc87603f0d16d150a1759b7196c1e65f54f8fd6.tar.bz2 |
Replace AudioScheduler with AudioPump.
This is similar to the VideoScheduler refactoring. AudioPump now is not
ref-counted, but otherwise works the same as AudioScheduler.
Also simplified AudioCapturer interface.
Review URL: https://codereview.chromium.org/866863004
Cr-Commit-Position: refs/heads/master@{#316277}
Diffstat (limited to 'remoting/host/client_session.h')
-rw-r--r-- | remoting/host/client_session.h | 20 |
1 files changed, 5 insertions, 15 deletions
diff --git a/remoting/host/client_session.h b/remoting/host/client_session.h index e4f79552..a70fd3b 100644 --- a/remoting/host/client_session.h +++ b/remoting/host/client_session.h @@ -35,14 +35,12 @@ class SingleThreadTaskRunner; namespace remoting { -class AudioEncoder; -class AudioScheduler; +class AudioPump; class DesktopEnvironment; class DesktopEnvironmentFactory; class InputInjector; class MouseShapePump; class ScreenControls; -class VideoEncoder; class VideoFramePump; // A ClientSession keeps a reference to a connection to a client, and maintains @@ -153,14 +151,6 @@ class ClientSession // Creates a proxy for sending clipboard events to the client. scoped_ptr<protocol::ClipboardStub> CreateClipboardProxy(); - // Creates an audio encoder for the specified configuration. - static scoped_ptr<AudioEncoder> CreateAudioEncoder( - const protocol::SessionConfig& config); - - // Creates a video encoder for the specified configuration. - static scoped_ptr<VideoEncoder> CreateVideoEncoder( - const protocol::SessionConfig& config); - EventHandler* event_handler_; // The connection to the client. @@ -219,10 +209,10 @@ class ClientSession scoped_refptr<base::SingleThreadTaskRunner> network_task_runner_; scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner_; - // Schedulers for audio and video capture. - // |video_frame_pump_| may be nullptr if the video channel is not required - - // see ResetVideoPipeline(). - scoped_refptr<AudioScheduler> audio_scheduler_; + // Pumps for audio, video and mouse shape. + // |video_frame_pump_| and |mouse_shape_pump_| may be nullptr if the video + // stream is handled by an extension, see ResetVideoPipeline(). + scoped_ptr<AudioPump> audio_pump_; scoped_ptr<VideoFramePump> video_frame_pump_; scoped_ptr<MouseShapePump> mouse_shape_pump_; |