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

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"
 #include "base/stl_util-inl.h"
 #include "remoting/base/capture_data.h"
 #include "remoting/base/tracer.h"
+#include "remoting/proto/video.pb.h"
 #include "remoting/protocol/connection_to_client.h"
 #include "remoting/protocol/message_decoder.h"
 
 using remoting::protocol::ConnectionToClient;
 
 namespace remoting {
 
 // By default we capture 20 times a second. This number is obtained by
 // experiment to provide good latency.
 static const double kDefaultCaptureRate = 20.0;
@@ skipping 222 matching lines @@
   if (rate_ > 0)
     DoCapture();
 }
 
 void SessionManager::DoGetInitInfo(
     scoped_refptr<ConnectionToClient> connection) {
   DCHECK_EQ(capture_loop_, MessageLoop::current());
 
   ScopedTracer tracer("init");
 
-  // Sends the init message to the connection.
-  network_loop_->PostTask(
-      FROM_HERE,
-      NewTracedMethod(this, &SessionManager::DoSendInit, connection,
-                        capturer()->width(), capturer()->height()));
-
-  // And then add the connection to the list so it can receive update stream.
-  // It is important we do so in such order or the connection will receive
-  // update stream before init message.
+  // Add the client to the list so it can receive update stream.
   network_loop_->PostTask(
       FROM_HERE,
       NewTracedMethod(this, &SessionManager::DoAddClient, connection));
 }
 
 // Network thread --------------------------------------------------------------
 
 void SessionManager::DoStartRateControl() {
   DCHECK_EQ(network_loop_, MessageLoop::current());
 
@@ skipping 65 matching lines @@
 
   for (ConnectionToClientList::const_iterator i = connections_.begin();
        i < connections_.end(); ++i) {
     (*i)->SendVideoPacket(*packet);
   }
   delete packet;
 
   TraceContext::tracer()->PrintString("DoSendUpdate done");
 }
 
-void SessionManager::DoSendInit(scoped_refptr<ConnectionToClient> connection,
-                                int width, int height) {
-  DCHECK_EQ(network_loop_, MessageLoop::current());
-
-  // Sends the connection init information.
-  connection->SendInitClientMessage(width, height);
-}
-
 void SessionManager::DoAddClient(scoped_refptr<ConnectionToClient> connection) {
   DCHECK_EQ(network_loop_, MessageLoop::current());
 
   // TODO(hclam): Force a full frame for next encode.
   connections_.push_back(connection);
 }
 
 void SessionManager::DoRemoveClient(
     scoped_refptr<ConnectionToClient> connection) {
   DCHECK_EQ(network_loop_, MessageLoop::current());
@@ skipping 48 matching lines @@
       FROM_HERE,
       NewTracedMethod(this, &SessionManager::DoSendVideoPacket, packet));
 
   if (last) {
     capture_loop_->PostTask(
         FROM_HERE, NewTracedMethod(this, &SessionManager::DoFinishEncode));
   }
 }
 
 }  // namespace remoting