Replace AudioScheduler with AudioPump.

remoting/host/client_session.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef REMOTING_HOST_CLIENT_SESSION_H_
 #define REMOTING_HOST_CLIENT_SESSION_H_
 
 #include <string>
 
 #include "base/memory/ref_counted.h"
@@ skipping 17 matching lines @@
 #include "remoting/protocol/input_stub.h"
 #include "remoting/protocol/pairing_registry.h"
 #include "third_party/webrtc/modules/desktop_capture/desktop_geometry.h"
 
 namespace base {
 class SingleThreadTaskRunner;
 }  // namespace base
 
 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
 // per-client state.
 class ClientSession
     : public base::NonThreadSafe,
       public protocol::HostStub,
       public protocol::ConnectionToClient::EventHandler,
       public ClientSessionControl {
  public:
@@ skipping 90 matching lines @@
   bool is_authenticated() { return auth_input_filter_.enabled();  }
 
   const std::string* client_capabilities() const {
     return client_capabilities_.get();
   }
 
  private:
   // 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.
   scoped_ptr<protocol::ConnectionToClient> connection_;
 
   std::string client_jid_;
 
   // Used to create a DesktopEnvironment instance for this session.
   DesktopEnvironmentFactory* desktop_environment_factory_;
 
@@ skipping 38 matching lines @@
   // is reached.
   base::OneShotTimer<ClientSession> max_duration_timer_;
 
   scoped_refptr<base::SingleThreadTaskRunner> audio_task_runner_;
   scoped_refptr<base::SingleThreadTaskRunner> input_task_runner_;
   scoped_refptr<base::SingleThreadTaskRunner> video_capture_task_runner_;
   scoped_refptr<base::SingleThreadTaskRunner> video_encode_task_runner_;
   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_;
 
   // The set of all capabilities supported by the client.
   scoped_ptr<std::string> client_capabilities_;
 
   // The set of all capabilities supported by the host.
   std::string host_capabilities_;
 
   // The set of all capabilities negotiated between client and host.
@@ skipping 22 matching lines @@
   // Used to disable callbacks to |this| once DisconnectSession() has been
   // called.
   base::WeakPtrFactory<ClientSessionControl> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(ClientSession);
 };
 
 }  // namespace remoting
 
 #endif  // REMOTING_HOST_CLIENT_SESSION_H_