Changing UpdateStreamPacket protobuf definition for chromoting

remoting/host/session_manager.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/session_manager.h"
 
 #include <algorithm>
 
 #include "base/logging.h"
 #include "base/scoped_ptr.h"
@@ skipping 304 matching lines @@
   }
   DCHECK_NE(new_rate, -1.0);
 
   // Then set the rate.
   capture_loop_->PostTask(
       FROM_HERE,
       NewRunnableMethod(this, &SessionManager::DoSetRate, new_rate));
   ScheduleNextRateControl();
 }
 
-void SessionManager::DoSendUpdate(const UpdateStreamPacketHeader* header,
-                                  const scoped_refptr<media::DataBuffer> data,
+void SessionManager::DoSendUpdate(HostMessage* message,
                                   Encoder::EncodingState state) {
-  // Take ownership of header.
-  scoped_ptr<const UpdateStreamPacketHeader> header_owner(header);
   DCHECK_EQ(network_loop_, MessageLoop::current());
 
+  // Create a data buffer in wire format from |message|.
+  scoped_refptr<media::DataBuffer> data =
+      ClientConnection::CreateWireFormatDataBuffer(message);
+
   for (ClientConnectionList::const_iterator i = clients_.begin();
-       i < clients_.end();
-       ++i) {
+       i < clients_.end(); ++i) {
+    // TODO(hclam): Merge BeginUpdateStreamMessage into |message|.
     if (state & Encoder::EncodingStarting) {
       (*i)->SendBeginUpdateStreamMessage();
     }
 
-    (*i)->SendUpdateStreamPacketMessage(header, data);
+    (*i)->SendUpdateStreamPacketMessage(data);
 
-    if (state & Encoder::EncodingEnded) {
+    // TODO(hclam): Merge EndUpdateStreamMessage into |message|.
+    if (state & Encoder::EncodingEnded)
       (*i)->SendEndUpdateStreamMessage();
-    }
   }
 }
 
 void SessionManager::DoSendInit(scoped_refptr<ClientConnection> client,
                                 int width, int height) {
   DCHECK_EQ(network_loop_, MessageLoop::current());
 
   // Sends the client init information.
   client->SendInitClientMessage(width, height);
 }
@@ skipping 29 matching lines @@
     scoped_refptr<Capturer::CaptureData> capture_data) {
   DCHECK_EQ(encode_loop_, MessageLoop::current());
 
   // TODO(hclam): Enable |force_refresh| if a new client was
   // added.
   encoder_->Encode(capture_data, false,
                    NewCallback(this, &SessionManager::EncodeDataAvailableTask));
 }
 
 void SessionManager::EncodeDataAvailableTask(
-    const UpdateStreamPacketHeader *header,
-    const scoped_refptr<media::DataBuffer>& data,
-    Encoder::EncodingState state) {
+    HostMessage* message, Encoder::EncodingState state) {
   DCHECK_EQ(encode_loop_, MessageLoop::current());
 
   // Before a new encode task starts, notify clients a new update
   // stream is coming.
   // Notify this will keep a reference to the DataBuffer in the
   // task. The ownership will eventually pass to the ClientConnections.
   network_loop_->PostTask(
       FROM_HERE,
-      NewRunnableMethod(this,
-                        &SessionManager::DoSendUpdate,
-                        header,
-                        data,
-                        state));
+      NewRunnableMethod(this, &SessionManager::DoSendUpdate, message, state));
 
   if (state & Encoder::EncodingEnded) {
     capture_loop_->PostTask(
         FROM_HERE, NewRunnableMethod(this, &SessionManager::DoFinishEncode));
   }
 }
 
 }  // namespace remoting