Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(278)

Unified Diff: remoting/host/session_manager.cc

Issue 4476003: Add VideoPacket struct for video packets. Refactor Decode interface to use it. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: merged Created 10 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « remoting/host/capturer_mac.cc ('k') | remoting/host/session_manager_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/host/session_manager.cc
diff --git a/remoting/host/session_manager.cc b/remoting/host/session_manager.cc
index b5c3a3115c3fef5116981bff3c7d1b7ac2653805..ebd10614544c4641b3943b1d69751b8b2c479513 100644
--- a/remoting/host/session_manager.cc
+++ b/remoting/host/session_manager.cc
@@ -12,6 +12,7 @@
#include "remoting/base/capture_data.h"
#include "remoting/base/tracer.h"
#include "remoting/proto/control.pb.h"
+#include "remoting/proto/video.pb.h"
#include "remoting/protocol/client_stub.h"
#include "remoting/protocol/connection_to_client.h"
#include "remoting/protocol/message_decoder.h"
@@ -256,15 +257,7 @@ void SessionManager::DoGetInitInfo(
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));
@@ -350,19 +343,6 @@ void SessionManager::DoSendVideoPacket(VideoPacket* 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.
- protocol::NotifyResolutionRequest* message =
- new protocol::NotifyResolutionRequest();
- message->set_width(width);
- message->set_height(height);
- connection->client_stub()->NotifyResolution(message,
- NewDeleteMessageTask(message));
-}
-
void SessionManager::DoAddClient(scoped_refptr<ConnectionToClient> connection) {
DCHECK_EQ(network_loop_, MessageLoop::current());
« no previous file with comments | « remoting/host/capturer_mac.cc ('k') | remoting/host/session_manager_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698