Moved video stub implementation to RectangleUpdateDecoder.

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 <list>
@@ skipping 20 matching lines @@
 namespace protocol {
 class TransportFactory;
 }  // namespace protocol
 
 class AudioDecodeScheduler;
 class AudioPlayer;
 class ClientContext;
 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::ClientStub {
  public:
   // Objects passed in are not owned by this class.
   ChromotingClient(const ClientConfig& config,
                    ClientContext* client_context,
                    protocol::ConnectionToHost* connection,
                    ClientUserInterface* user_interface,
                    RectangleUpdateDecoder* rectangle_decoder,
                    scoped_ptr<AudioPlayer> audio_player);
 
   virtual ~ChromotingClient();
@@ skipping 13 matching lines @@
   // CursorShapeStub implementation for receiving cursor shape updates.
   virtual void SetCursorShape(const protocol::CursorShapeInfo& cursor_shape)
       OVERRIDE;
 
   // ConnectionToHost::HostEventCallback implementation.
   virtual void OnConnectionState(
       protocol::ConnectionToHost::State state,
       protocol::ErrorCode error) OVERRIDE;
   virtual void OnConnectionReady(bool ready) OVERRIDE;
 
-  // VideoStub implementation.
-  virtual void ProcessVideoPacket(scoped_ptr<VideoPacket> packet,
-                                  const base::Closure& done) OVERRIDE;
-  virtual int GetPendingVideoPackets() OVERRIDE;
-
  private:
-  struct QueuedVideoPacket {
-    QueuedVideoPacket(scoped_ptr<VideoPacket> packet,
-                      const base::Closure& done);
-    ~QueuedVideoPacket();
-    VideoPacket* packet;
-    base::Closure done;
-  };
-
   // Initializes connection.
   void Initialize();
 
-  // If a packet is not being processed, dispatches a single message from the
-  // |received_packets_| queue.
-  void DispatchPacket();
-
-  // Callback method when a VideoPacket is processed.
-  // If |last_packet| is true then |decode_start| contains the timestamp when
-  // the packet will start to be processed.
-  void OnPacketDone(bool last_packet, base::Time decode_start);
-
   void OnDisconnected(const base::Closure& shutdown_task);
 
   // The following are not owned by this class.
   ClientConfig config_;
   scoped_refptr<base::SingleThreadTaskRunner> task_runner_;
   protocol::ConnectionToHost* connection_;
   ClientUserInterface* user_interface_;
   // TODO(kxing): Make ChromotingClient own RectangleUpdateDecoder.
   RectangleUpdateDecoder* rectangle_decoder_;
 
   scoped_ptr<AudioDecodeScheduler> audio_decode_scheduler_;
 
   // If non-NULL, this is called when the client is done.
   base::Closure client_done_;
 
-  // Contains all video packets that have been received, but have not yet been
-  // processed.
-  //
-  // Used to serialize sending of messages to the client.
-  std::list<QueuedVideoPacket> received_packets_;
-
-  // True if a message is being processed. Can be used to determine if it is
-  // safe to dispatch another message.
-  bool packet_being_processed_;
-
   // Record the statistics of the connection.
   ChromotingStats stats_;
 
-  // Keep track of the last sequence number bounced back from the host.
-  int64 last_sequence_number_;
-
   // WeakPtr used to avoid tasks accessing the client after it is deleted.
   base::WeakPtrFactory<ChromotingClient> weak_factory_;
   base::WeakPtr<ChromotingClient> weak_ptr_;
 
   DISALLOW_COPY_AND_ASSIGN(ChromotingClient);
 };
 
 }  // namespace remoting
 
 #endif  // REMOTING_CLIENT_CHROMOTING_CLIENT_H_