Add VideoPacket struct for video packets. Refactor Decode interface to use it.

remoting/base/decoder_row_based.h

 // Copyright (c) 2010 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_BASE_DECODER_ROW_BASED_H_
 #define REMOTING_BASE_DECODER_ROW_BASED_H_
 
 #include "remoting/base/decoder.h"
 
 namespace remoting {
 
 class Decompressor;
 
 class DecoderRowBased : public Decoder {
  public:
   virtual ~DecoderRowBased();
 
   static DecoderRowBased* CreateZlibDecoder();
   static DecoderRowBased* CreateVerbatimDecoder();
 
   // Decoder implementation.
+  virtual bool IsReadyForData();
+  virtual void Initialize(scoped_refptr<media::VideoFrame> frame);
+  virtual DecodeResult DecodePacket(const VideoPacket* packet);
+  virtual void GetUpdatedRects(UpdatedRects* rects);
   virtual void Reset();
-  virtual bool IsReadyForData();
-  virtual void Initialize(scoped_refptr<media::VideoFrame> frame,
-                          const gfx::Rect& clip, int bytes_per_src_pixel);
-  virtual void DecodeBytes(const std::string& encoded_bytes);
-  virtual VideoPacketFormat::Encoding Encoding() { return encoding_; }
+  virtual VideoPacketFormat::Encoding Encoding();
 
   // TODO(hclam): Should make this into the Decoder interface.
   // TODO(ajwong): Before putting into the interface, we should decide if the
   // Host should normalize the coordinate system.
   void set_reverse_rows(bool reverse) { reverse_rows_ = reverse; }
 
  private:
+  enum State {
+    kUninitialized,
+    kReady,
+    kProcessing,
+    kDone,
+    kError,
+  };
+
   DecoderRowBased(Decompressor* decompressor,
                   VideoPacketFormat::Encoding encoding);
 
-  enum State {
-    kUninitialized,
-    kReady,
-    kError,
-  };
+  // Helper method. Called from DecodePacket to updated state of the decoder.
+  void UpdateStateForPacket(const VideoPacket* packet);
 
   // The internal state of the decoder.
   State state_;
 
   // Keeps track of the updating rect.
   gfx::Rect clip_;
 
   // The video frame to write to.
   scoped_refptr<media::VideoFrame> frame_;
 
   // The compression for the input byte stream.
   scoped_ptr<Decompressor> decompressor_;
 
   // The encoding of the incoming stream.
   VideoPacketFormat::Encoding encoding_;
 
-  // Number of bytes per pixel from source stream.
-  int bytes_per_src_pixel_;
-
   // The position in the row that we are updating.
   int row_pos_;
 
   // The current row in the rect that we are updaing.
   int row_y_;
 
   // True if we should decode the image upside down.
   bool reverse_rows_;
 
   DISALLOW_COPY_AND_ASSIGN(DecoderRowBased);
 };
 
 }  // namespace remoting
 
 #endif  // REMOTING_BASE_DECODER_ROW_BASED_H_