Changing UpdateStreamPacket protobuf definition for chromoting

remoting/host/client_connection.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/host/client_connection.h"
 
 #include "google/protobuf/message.h"
 #include "media/base/data_buffer.h"
 #include "remoting/base/protocol_decoder.h"
 #include "remoting/base/protocol_util.h"
@@ skipping 17 matching lines @@
   DCHECK(loop_);
   DCHECK(decoder_.get());
   DCHECK(handler_);
 }
 
 ClientConnection::~ClientConnection() {
   // TODO(hclam): When we shut down the viewer we may have to close the
   // jingle channel.
 }
 
+// static
+scoped_refptr<media::DataBuffer>
+    ClientConnection::CreateWireFormatDataBuffer(
+        const HostMessage* msg) {
+  // TODO(hclam): Instead of serializing |msg| create an DataBuffer
+  // object that wraps around it.
+  scoped_ptr<const HostMessage> message_deleter(msg);
+  return SerializeAndFrameMessage(*msg);
+}
+
 void ClientConnection::SendInitClientMessage(int width, int height) {
   DCHECK_EQ(loop_, MessageLoop::current());
   DCHECK(!update_stream_size_);
 
   // If we are disconnected then return.
   if (!channel_)
     return;
 
   HostMessage msg;
   msg.mutable_init_client()->set_width(width);
@@ skipping 13 matching lines @@
   msg.mutable_begin_update_stream();
   DCHECK(msg.IsInitialized());
 
   scoped_refptr<DataBuffer> data = SerializeAndFrameMessage(msg);
   DCHECK(!update_stream_size_);
   update_stream_size_ += data->GetDataSize();
   channel_->Write(data);
 }
 
 void ClientConnection::SendUpdateStreamPacketMessage(
-    const UpdateStreamPacketHeader* header,
     scoped_refptr<DataBuffer> data) {
   DCHECK_EQ(loop_, MessageLoop::current());
 
   // If we are disconnected then return.
   if (!channel_)
     return;
 
-  HostMessage msg;
-  msg.mutable_update_stream_packet()->mutable_header()->CopyFrom(*header);
-  // TODO(hclam): This introduce one memory copy. Eliminate it.
-  msg.mutable_update_stream_packet()->set_data(
-      data->GetData(), data->GetDataSize());
-  DCHECK(msg.IsInitialized());
-
-  scoped_refptr<DataBuffer> encoded_data = SerializeAndFrameMessage(msg);
   update_stream_size_ += data->GetDataSize();
-  channel_->Write(encoded_data);
+  channel_->Write(data);
 }
 
 void ClientConnection::SendEndUpdateStreamMessage() {
   DCHECK_EQ(loop_, MessageLoop::current());
 
   // If we are disconnected then return.
   if (!channel_)
     return;
 
   HostMessage msg;
@@ skipping 80 matching lines @@
   DCHECK(decoder_.get());
   ClientMessageList list;
   decoder_->ParseClientMessages(data, &list);
 
   // Then submit the messages to the handler.
   DCHECK(handler_);
   handler_->HandleMessages(this, &list);
 }
 
 }  // namespace remoting