Move UpdateStreamEncoding value into the BeginUpdateStreamMessage since we...

remoting/base/decoder.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_H_
 #define REMOTING_BASE_DECODER_H_
 
 #include <vector>
 
 #include "base/task.h"
@@ skipping 19 matching lines @@
 //
 // The decoder will reply with:
 // 1. PartialDecodeDone(VideoFrame, UpdatedRects)
 //    ...
 // 2. DecodeDone(VideoFrame)
 //
 // The format of VideoFrame is a contract between the object that creates the
 // decoder (most likely the renderer) and the decoder.
 class Decoder {
  public:
-
+  Decoder()
+      : encoding_(EncodingInvalid),
+        started_(false) {
+  }
   virtual ~Decoder() {
   }
 
   // Tell the decoder to use |frame| as a target to write the decoded image
   // for the coming update stream.
   // If decode is partially done and |frame| can be read, |partial_decode_done|
   // is called and |update_rects| contains the updated regions.
   // If decode is completed |decode_done| is called.
   // Return true if the decoder can writes output to |frame| and accept
   // the codec format.
@@ skipping 22 matching lines @@
   // these messages.
   virtual bool PartialDecode(HostMessage* message) = 0;
 
   // Notify the decoder that we have received the last update stream packet.
   // If the decoding of the update stream has completed |decode_done_| is
   // called with |frame|.
   // If the update stream is not received fully and this method is called the
   // decoder should also call |decode_done_| as soon as possible.
   virtual void EndDecode() = 0;
 
+  // Return the encoding type that this decoder handles.
+  virtual UpdateStreamEncoding Encoding() { return encoding_; }
+
+  // Return the current state of the decoder: 'true' if we're in the middle
+  // of BeginDecode() / EndDecode().
+  virtual bool IsStarted() { return started_; }
+
  protected:
   // Every decoder will have two internal states because there are three
   // kinds of messages send to PartialDecode().
   //
   // Here's a state diagram:
   //
   //                UpdateStreamBeginRect       UpdateStreamRectData
   //                    ..............              ............
   //                   .              .            .            .
   //                  .                v          .              .
   // kWaitingForBeginRect         kWaitingForRectData            .
   //                  ^                .          ^              .
   //                   .              .            .            .
   //                    ..............              ............
   //                    UpdateStreaEndRect
   enum State {
     // In this state the decoder is waiting for UpdateStreamBeginRect.
     // After receiving UpdateStreaBeginRect, the encoder will transit to
     // to kWaitingForRectData state.
     kWaitingForBeginRect,
 
     // In this state the decoder is waiting for UpdateStreamRectData.
     // The decode remains in this state if UpdateStreamRectData is received.
     // The decoder will transit to kWaitingForBeginRect if UpdateStreamEndRect
     // is received.
     kWaitingForRectData,
   };
+
+  // The encoding that this decoder supports.
+  UpdateStreamEncoding encoding_;
+
+  // Has the decoder been started? I.e., has BeginDecode() been called.
+  bool started_;
 };
 
 }  // namespace remoting
 
 #endif  // REMOTING_BASE_DECODER_H_