Remove video_channel() from Session interface

BUG=None
TEST=Unittests.

Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=96089

Review URL: http://codereview.chromium.org/7508044

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@96301 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 14 insertions, 1 deletions

diff --git a/remoting/protocol/rtp_video_reader.h b/remoting/protocol/rtp_video_reader.h
index 8b0d3bd..e2eaf20e 100644
--- a/remoting/protocol/rtp_video_reader.h
+++ b/remoting/protocol/rtp_video_reader.h
@@ -5,7 +5,9 @@
 #ifndef REMOTING_PROTOCOL_RTP_VIDEO_READER_H_
 #define REMOTING_PROTOCOL_RTP_VIDEO_READER_H_
 
+#include "base/compiler_specific.h"
 #include "base/time.h"
+#include "base/memory/scoped_ptr.h"
 #include "remoting/protocol/rtcp_writer.h"
 #include "remoting/protocol/rtp_reader.h"
 #include "remoting/protocol/video_reader.h"
@@ -13,6 +15,8 @@
 namespace remoting {
 namespace protocol {
 
+class RtcpWriter;
+class RtpReader;
 class Session;
 
 class RtpVideoReader : public VideoReader {
@@ -21,7 +25,9 @@ class RtpVideoReader : public VideoReader {
   virtual ~RtpVideoReader();
 
   // VideoReader interface.
-  virtual void Init(protocol::Session* session, VideoStub* video_stub);
+  virtual void Init(protocol::Session* session,
+                    VideoStub* video_stub,
+                    const InitializedCallback& callback) OVERRIDE;
 
  private:
   friend class RtpVideoReaderTest;
@@ -44,6 +50,8 @@ class RtpVideoReader : public VideoReader {
 
   typedef std::deque<PacketsQueueEntry> PacketsQueue;
 
+  void OnChannelReady(const std::string& name, net::Socket* socket);
+
   void OnRtpPacket(const RtpPacket* rtp_packet);
   void CheckFullPacket(const PacketsQueue::iterator& pos);
   void RebuildVideoPacket(const PacketsQueue::iterator& from,
@@ -56,7 +64,12 @@ class RtpVideoReader : public VideoReader {
   // |kReceiverReportsIntervalMs|.
   void SendReceiverReportIf();
 
+  bool initialized_;
+  InitializedCallback initialized_callback_;
+
+  scoped_ptr<net::Socket> rtp_channel_;
   RtpReader rtp_reader_;
+  scoped_ptr<net::Socket> rtcp_channel_;
   RtcpWriter rtcp_writer_;
 
   PacketsQueue packets_queue_;