Move UpdateStreamEncoding value into the BeginUpdateStreamMessage since we...

remoting/base/decoder_verbatim.cc

 // 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.
 
 #include "remoting/base/decoder_verbatim.h"
 
 #include "remoting/base/protocol_util.h"
 
 namespace remoting {
 
 DecoderVerbatim::DecoderVerbatim()
     : state_(kWaitingForBeginRect),
       rect_x_(0),
       rect_y_(0),
       rect_width_(0),
       rect_height_(0),
       bytes_per_pixel_(0),
       updated_rects_(NULL),
       reverse_rows_(true) {
+  encoding_ = EncodingNone;
 }
 
 bool DecoderVerbatim::BeginDecode(scoped_refptr<media::VideoFrame> frame,
                                   UpdatedRects* updated_rects,
                                   Task* partial_decode_done,
                                   Task* decode_done) {
   DCHECK(!partial_decode_done_.get());
   DCHECK(!decode_done_.get());
   DCHECK(!updated_rects_);
   DCHECK_EQ(kWaitingForBeginRect, state_);
+  DCHECK(!started_);
 
   partial_decode_done_.reset(partial_decode_done);
   decode_done_.reset(decode_done);
   updated_rects_ = updated_rects;
 
   // TODO(hclam): Check if we can accept the color format of the video frame
   // and the codec.
   frame_ = frame;
+
+  started_ = true;
   return true;
 }
 
 bool DecoderVerbatim::PartialDecode(HostMessage* message) {
   scoped_ptr<HostMessage> msg_deleter(message);
   DCHECK(message->has_update_stream_packet());
+  DCHECK(started_);
 
   bool ret = true;
   if (message->update_stream_packet().has_begin_rect())
     ret = HandleBeginRect(message);
   if (ret && message->update_stream_packet().has_rect_data())
     ret = HandleRectData(message);
   if (ret && message->update_stream_packet().has_end_rect())
     ret = HandleEndRect(message);
   return ret;
 }
 
 void DecoderVerbatim::EndDecode() {
   DCHECK_EQ(kWaitingForBeginRect, state_);
+  DCHECK(started_);
+
   decode_done_->Run();
 
   partial_decode_done_.reset();
   decode_done_.reset();
   frame_ = NULL;
   updated_rects_ = NULL;
+  started_ = false;
 }
 
 bool DecoderVerbatim::HandleBeginRect(HostMessage* message) {
   DCHECK_EQ(kWaitingForBeginRect, state_);
   state_ = kWaitingForRectData;
 
   rect_width_ = message->update_stream_packet().begin_rect().width();
   rect_height_ = message->update_stream_packet().begin_rect().height();
   rect_x_ = message->update_stream_packet().begin_rect().x();
   rect_y_ = message->update_stream_packet().begin_rect().y();
@@ skipping 45 matching lines @@
   return true;
 }
 
 bool DecoderVerbatim::HandleEndRect(HostMessage* message) {
   DCHECK_EQ(kWaitingForRectData, state_);
   state_ = kWaitingForBeginRect;
   return true;
 }
 
 }  // namespace remoting