Move audio decoding to protocol layer

remoting/client/chromoting_client.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.
 
 // ChromotingClient is the controller for the Client implementation.
 
 #ifndef REMOTING_CLIENT_CHROMOTING_CLIENT_H_
 #define REMOTING_CLIENT_CHROMOTING_CLIENT_H_
 
 #include <memory>
@@ skipping 19 matching lines @@
 
 namespace remoting {
 
 namespace protocol {
 class CandidateSessionConfig;
 class SessionManager;
 class TransportContext;
 class VideoRenderer;
 }  // namespace protocol
 
-class AudioConsumer;
 class AudioDecodeScheduler;
 class ClientContext;
 class ClientUserInterface;
 class FrameConsumerProxy;
 
 class ChromotingClient : public SignalStrategy::Listener,
                          public protocol::ConnectionToHost::HostEventCallback,
                          public protocol::ClientStub {
  public:
   // |client_context|, |user_interface| and |video_renderer| must outlive the
   // client. |audio_consumer| may be null, in which case audio will not be
   // requested.
   ChromotingClient(ClientContext* client_context,
                    ClientUserInterface* user_interface,
                    protocol::VideoRenderer* video_renderer,
-                   base::WeakPtr<AudioConsumer> audio_consumer);
+                   base::WeakPtr<protocol::AudioStub> audio_consumer);
 
   ~ChromotingClient() override;
 
   void set_protocol_config(
       std::unique_ptr<protocol::CandidateSessionConfig> config);
 
   // Used to set fake/mock objects for tests which use the ChromotingClient.
   void SetConnectionToHostForTests(
       std::unique_ptr<protocol::ConnectionToHost> connection_to_host);
 
@@ skipping 36 matching lines @@
                       const protocol::TransportRoute& route) override;
 
  private:
   // SignalStrategy::StatusObserver interface.
   void OnSignalStrategyStateChange(SignalStrategy::State state) override;
   bool OnSignalStrategyIncomingStanza(const buzz::XmlElement* stanza) override;
 
   // Starts connection once |signal_strategy_| is connected.
   void StartConnection();
 
-  // Called when the connection is authenticated.
-  void OnAuthenticated();
-
   // Called when all channels are connected.
   void OnChannelsConnected();
 
   base::ThreadChecker thread_checker_;
 
+  scoped_refptr<base::SingleThreadTaskRunner> audio_decode_task_runner_;
+
   std::unique_ptr<protocol::CandidateSessionConfig> protocol_config_;
 
   // The following are not owned by this class.
   ClientUserInterface* user_interface_ = nullptr;
   protocol::VideoRenderer* video_renderer_ = nullptr;
+  base::WeakPtr<protocol::AudioStub> audio_consumer_;
   SignalStrategy* signal_strategy_ = nullptr;
 
   std::string host_jid_;
   protocol::ClientAuthenticationConfig client_auth_config_;
   scoped_refptr<protocol::TransportContext> transport_context_;
 
   std::unique_ptr<protocol::SessionManager> session_manager_;
   std::unique_ptr<protocol::ConnectionToHost> connection_;
 
   protocol::MouseInputFilter mouse_input_scaler_;
 
-  std::unique_ptr<AudioDecodeScheduler> audio_decode_scheduler_;
-
   std::string local_capabilities_;
 
   // The set of all capabilities supported by the host.
   std::string host_capabilities_;
 
   // True if |protocol::Capabilities| message has been received.
   bool host_capabilities_received_ = false;
 
   DISALLOW_COPY_AND_ASSIGN(ChromotingClient);
 };
 
 }  // namespace remoting
 
 #endif  // REMOTING_CLIENT_CHROMOTING_CLIENT_H_