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

remoting/base/encoder_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/encoder_zlib.h"
 
 #include "base/logging.h"
 #include "gfx/rect.h"
-#include "media/base/data_buffer.h"
 #include "remoting/base/capture_data.h"
 #include "remoting/base/compressor_zlib.h"
 #include "remoting/base/util.h"
+#include "remoting/proto/video.pb.h"
 
 namespace remoting {
 
 static const int kPacketSize = 1024 * 1024;
 
 EncoderZlib::EncoderZlib() : packet_size_(kPacketSize) {
 }
 
 EncoderZlib::EncoderZlib(int packet_size) : packet_size_(packet_size) {
 }
 
 EncoderZlib::~EncoderZlib() {}
 
 void EncoderZlib::Encode(scoped_refptr<CaptureData> capture_data,
                          bool key_frame,
                          DataAvailableCallback* data_available_callback) {
-  CHECK(capture_data->pixel_format() == PIXEL_FORMAT_RGB32)
+  CHECK(capture_data->pixel_format() == media::VideoFrame::RGB32)
       << "Zlib Encoder only works with RGB32. Got "
       << capture_data->pixel_format();
   capture_data_ = capture_data;
   callback_.reset(data_available_callback);
 
   CompressorZlib compressor;
   const InvalidRects& rects = capture_data->dirty_rects();
   int index = 0;
   for (InvalidRects::const_iterator r = rects.begin();
       r != rects.end(); ++r, ++index) {
@@ skipping 71 matching lines @@
 void EncoderZlib::PrepareUpdateStart(const gfx::Rect& rect,
                                      VideoPacket* packet) {
   packet->set_flags(packet->flags() | VideoPacket::FIRST_PACKET);
   VideoPacketFormat* format = packet->mutable_format();
 
   format->set_x(rect.x());
   format->set_y(rect.y());
   format->set_width(rect.width());
   format->set_height(rect.height());
   format->set_encoding(VideoPacketFormat::ENCODING_ZLIB);
-  format->set_pixel_format(capture_data_->pixel_format());
 }
 
 uint8* EncoderZlib::GetOutputBuffer(VideoPacket* packet, size_t size) {
   packet->mutable_data()->resize(size);
   // TODO(ajwong): Is there a better way to do this at all???
   return const_cast<uint8*>(reinterpret_cast<const uint8*>(
       packet->mutable_data()->data()));
 }
 
 void EncoderZlib::SubmitMessage(VideoPacket* packet, size_t rect_index) {
   callback_->Run(packet);
 }
 
 }  // namespace remoting