Piping for audio decoding.

remoting/client/chromoting_client.h

Index: remoting/client/chromoting_client.h
diff --git a/remoting/client/chromoting_client.h b/remoting/client/chromoting_client.h
index 377badbf47ff47e7a843d9356c26c8b5439f53fa..9e9112f966d20d3a8bab18a2751de64b2725765d 100644
--- a/remoting/client/chromoting_client.h
+++ b/remoting/client/chromoting_client.h
@@ -15,7 +15,6 @@
 #include "base/time.h"
 #include "remoting/client/client_config.h"
 #include "remoting/client/chromoting_stats.h"
-#include "remoting/protocol/audio_stub.h"
 #include "remoting/protocol/client_stub.h"
 #include "remoting/protocol/clipboard_stub.h"
 #include "remoting/protocol/connection_to_host.h"
@@ -33,15 +32,14 @@ namespace protocol {
 class TransportFactory;
 }  // namespace protocol
 
-class AudioPlayer;
+class AudioDecodeScheduler;
 class ClientUserInterface;
 class RectangleUpdateDecoder;
 
 // TODO(sergeyu): Move VideoStub implementation to RectangleUpdateDecoder.
 class ChromotingClient : public protocol::ConnectionToHost::HostEventCallback,
                          public protocol::ClientStub,
-                         public protocol::VideoStub,
-                         public protocol::AudioStub {
+                         public protocol::VideoStub {
  public:
   // Objects passed in are not owned by this class.
   ChromotingClient(const ClientConfig& config,
@@ -49,7 +47,7 @@ class ChromotingClient : public protocol::ConnectionToHost::HostEventCallback,
                    protocol::ConnectionToHost* connection,
                    ClientUserInterface* user_interface,
                    RectangleUpdateDecoder* rectangle_decoder,
-                   AudioPlayer* audio_player);
+                   AudioDecodeScheduler* audio_decode_scheduler);
 
   virtual ~ChromotingClient();
 
@@ -80,10 +78,6 @@ class ChromotingClient : public protocol::ConnectionToHost::HostEventCallback,
                                   const base::Closure& done) OVERRIDE;
   virtual int GetPendingVideoPackets() OVERRIDE;
 
-  // AudioStub implementation.
-  virtual void ProcessAudioPacket(scoped_ptr<AudioPacket> packet,
-                                  const base::Closure& done) OVERRIDE;
-
  private:
   struct QueuedVideoPacket {
     QueuedVideoPacket(scoped_ptr<VideoPacket> packet,
@@ -113,7 +107,7 @@ class ChromotingClient : public protocol::ConnectionToHost::HostEventCallback,
   protocol::ConnectionToHost* connection_;
   ClientUserInterface* user_interface_;
   RectangleUpdateDecoder* rectangle_decoder_;
-  AudioPlayer* audio_player_;
+  AudioDecodeScheduler* audio_decode_scheduler_;

[Sergey Ulanov, 2012/08/02 20:32:48]

Can we own it here?

[kxing, 2012/08/03 14:51:47]

Done.

 
   // If non-NULL, this is called when the client is done.
   base::Closure client_done_;