Remove video_channel() from Session interface

remoting/protocol/rtp_video_reader.cc

 // Copyright (c) 2011 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/protocol/rtp_video_reader.h"
 
+#include "base/bind.h"
 #include "base/task.h"
+#include "remoting/base/constants.h"
 #include "remoting/proto/video.pb.h"
 #include "remoting/protocol/session.h"
 
 namespace remoting {
 namespace protocol {
 
 namespace {
 const int kMaxPacketsInQueue = 1024;
 const int kReceiverReportsIntervalMs = 1000;
 }  // namespace
 
 RtpVideoReader::PacketsQueueEntry::PacketsQueueEntry()
     : received(false),
       packet(NULL) {
 }
 
 RtpVideoReader::RtpVideoReader()
-    : last_sequence_number_(0),
+    : initialized_(false),
+      last_sequence_number_(0),
       video_stub_(NULL) {
 }
 
 RtpVideoReader::~RtpVideoReader() {
   ResetQueue();
 }
 
-void RtpVideoReader::Init(protocol::Session* session, VideoStub* video_stub) {
-  rtp_reader_.Init(session->video_rtp_channel(),
-                   NewCallback(this, &RtpVideoReader::OnRtpPacket));
-  rtcp_writer_.Init(session->video_rtcp_channel());
+void RtpVideoReader::Init(protocol::Session* session,
+                          VideoStub* video_stub,
+                          const InitializedCallback& callback) {
+  initialized_callback_ = callback;
   video_stub_ = video_stub;
+
+  session->CreateDatagramChannel(
+      kVideoRtpChannelName,
+      base::Bind(&RtpVideoReader::OnChannelReady, base::Unretained(this)));
+  session->CreateDatagramChannel(
+      kVideoRtcpChannelName,
+      base::Bind(&RtpVideoReader::OnChannelReady, base::Unretained(this)));
+}
+
+void RtpVideoReader::OnChannelReady(const std::string& name,
+                                    net::Socket* socket) {
+  if (!socket) {
+    if (!initialized_) {
+      initialized_callback_.Run(false);
+      initialized_ = true;
+    }
+    return;
+  }
+
+  if (name == kVideoRtpChannelName) {
+    DCHECK(!rtp_channel_.get());
+    rtp_channel_.reset(socket);
+    rtp_reader_.Init(socket, NewCallback(this, &RtpVideoReader::OnRtpPacket));
+  } else if (name == kVideoRtcpChannelName) {
+    DCHECK(!rtcp_channel_.get());
+    rtcp_channel_.reset(socket);
+    rtcp_writer_.Init(socket);
+  } else {
+    NOTREACHED();
+  }
+
+  if (rtp_channel_.get() && rtcp_channel_.get()) {
+    DCHECK(!initialized_);
+    initialized_callback_.Run(true);
+    initialized_ = true;

[Wez, 2011/08/04 23:49:52]

Need to set |initialize_| before invoking callback, in case callback tears us
down?

[Sergey Ulanov, 2011/08/09 19:41:10]

Done.

+  }
 }
 
 void RtpVideoReader::ResetQueue() {
   for (PacketsQueue::iterator it = packets_queue_.begin();
        it != packets_queue_.end(); ++it) {
     delete it->packet;
   }
   packets_queue_.assign(kMaxPacketsInQueue, PacketsQueueEntry());
 }
 
@@ skipping 133 matching lines @@
     RtcpReceiverReport report;
     rtp_reader_.GetReceiverReport(&report);
     rtcp_writer_.SendReport(report);
 
     last_receiver_report_ = now;
   }
 }
 
 }  // namespace protocol
 }  // namespace remoting