Revert 64672 - Cleanups in the video encoding decoding code. Reenable VP8....

remoting/base/decoder_vp8.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_VP8_H_
 #define REMOTING_BASE_DECODER_VP8_H_
 
 #include "remoting/base/decoder.h"
 
 typedef struct vpx_codec_ctx vpx_codec_ctx_t;
 
 namespace remoting {
 
 class DecoderVp8 : public Decoder {
  public:
   DecoderVp8();
-  virtual ~DecoderVp8();
+  ~DecoderVp8();
 
   // Decoder implementations.
-  virtual void Initialize(scoped_refptr<media::VideoFrame> frame,
-                          const gfx::Rect& clip, int bytes_per_src_pixel);
-
-  virtual void Reset();
-
-  // Feeds more data into the decoder.
-  virtual void DecodeBytes(const std::string& encoded_bytes);
-
-  // Returns true if decoder is ready to accept data via ProcessRectangleData.
-  virtual bool IsReadyForData();
-
-  virtual VideoPacketFormat::Encoding Encoding();
+  virtual bool BeginDecode(scoped_refptr<media::VideoFrame> frame,
+                           UpdatedRects* update_rects,
+                           Task* partial_decode_done,
+                           Task* decode_done);
+  virtual bool PartialDecode(ChromotingHostMessage* message);
+  virtual void EndDecode();
 
  private:
-  enum State {
-    kUninitialized,
-    kReady,
-    kError,
-  };
+  bool HandleBeginRect(ChromotingHostMessage* message);
+  bool HandleRectData(ChromotingHostMessage* message);
+  bool HandleEndRect(ChromotingHostMessage* message);
 
   // The internal state of the decoder.
   State state_;
 
+  // Keeps track of the updating rect.
+  int rect_x_;
+  int rect_y_;
+  int rect_width_;
+  int rect_height_;
+
+  // Tasks to call when decode is done.
+  scoped_ptr<Task> partial_decode_done_;
+  scoped_ptr<Task> decode_done_;
+
   // The video frame to write to.
   scoped_refptr<media::VideoFrame> frame_;
+  UpdatedRects* updated_rects_;
 
   vpx_codec_ctx_t* codec_;
 
   DISALLOW_COPY_AND_ASSIGN(DecoderVp8);
 };
 
 }  // namespace remoting
 
 #endif  // REMOTING_BASE_DECODER_VP8_H_