Move UpdateStreamEncoding value into the BeginUpdateStreamMessage since we...

remoting/base/decoder_zlib.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_zlib.h"
 
 #include "remoting/base/decompressor_zlib.h"
 #include "remoting/base/protocol_util.h"
 
 namespace remoting {
 
 DecoderZlib::DecoderZlib()
     : state_(kWaitingForBeginRect),
       rect_x_(0),
       rect_y_(0),
       rect_width_(0),
       rect_height_(0),
       bytes_per_pixel_(0),
       updated_rects_(NULL),
       row_pos_(0),
       row_y_(0),
       // TODO(hclam): We should use the information from the update stream
       // to determine whether we should reverse the rows or not.
       // But for simplicity we set to be always true.
       reverse_rows_(true) {
+  encoding_ = EncodingZlib;
 }
 
 bool DecoderZlib::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_);
 
   if (static_cast<PixelFormat>(frame->format()) != PixelFormatRgb32) {
     LOG(INFO) << "DecoderZlib only supports RGB32.";
     return false;
   }
 
   partial_decode_done_.reset(partial_decode_done);
   decode_done_.reset(decode_done);
   updated_rects_ = updated_rects;
   frame_ = frame;
 
   // Create the decompressor.
   decompressor_.reset(new DecompressorZlib());
+
+  started_ = true;
   return true;
 }
 
 bool DecoderZlib::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 DecoderZlib::EndDecode() {
   DCHECK_EQ(kWaitingForBeginRect, state_);
+  DCHECK(started_);
+
   decode_done_->Run();
 
   partial_decode_done_.reset();
   decode_done_.reset();
   updated_rects_ = NULL;
   frame_ = NULL;
   decompressor_.reset();
+  started_ = false;
 }
 
 bool DecoderZlib::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 65 matching lines @@
   state_ = kWaitingForBeginRect;
 
   updated_rects_->clear();
   updated_rects_->push_back(gfx::Rect(rect_x_, rect_y_,
                                       rect_width_, rect_height_));
   partial_decode_done_->Run();
   return true;
 }
 
 }  // namespace remoting