Cast:Transport: Dividing A/V Initialization pipeline

chrome/renderer/media/cast_session_delegate.cc

Index: chrome/renderer/media/cast_session_delegate.cc
diff --git a/chrome/renderer/media/cast_session_delegate.cc b/chrome/renderer/media/cast_session_delegate.cc
index faab4f974b33317423bb82a956d3eb0901467aaf..e32fe19cb12c3e82632a9eab00c496f8848b4106 100644
--- a/chrome/renderer/media/cast_session_delegate.cc
+++ b/chrome/renderer/media/cast_session_delegate.cc
@@ -42,7 +42,8 @@ const int kMaxAudioEventEntries = 9000000 / 75;
 CastSessionDelegate::CastSessionDelegate()
     : transport_configured_(false),
       io_message_loop_proxy_(
-          content::RenderThread::Get()->GetIOMessageLoopProxy()) {
+          content::RenderThread::Get()->GetIOMessageLoopProxy()),
+      weak_factory_(this) {
   DCHECK(io_message_loop_proxy_);
 }
 
@@ -98,9 +99,8 @@ void CastSessionDelegate::StartVideo(
   StartSendingInternal();
 }
 
-void CastSessionDelegate::StartUDP(
-    const net::IPEndPoint& local_endpoint,
-    const net::IPEndPoint& remote_endpoint) {
+void CastSessionDelegate::StartUDP(const net::IPEndPoint& local_endpoint,
+                                   const net::IPEndPoint& remote_endpoint) {
   DCHECK(io_message_loop_proxy_->BelongsToCurrentThread());
   transport_configured_ = true;
   local_endpoint_ = local_endpoint;
@@ -137,17 +137,22 @@ void CastSessionDelegate::StartSendingInternal() {
 
   Initialize();
 
-  media::cast::transport::CastTransportConfig config;
+  // Rationale for using unretained: The callback cannot be called after the
+  // destruction of CastTransportSenderIPC, and they both share the same thread.
+  cast_transport_.reset(new CastTransportSenderIPC(
+      local_endpoint_,
+      remote_endpoint_,
+      base::Bind(&CastSessionDelegate::StatusNotificationCB,
+                 base::Unretained(this))));
 
-  // TODO(hubbe): set config.aes_key and config.aes_iv_mask.
-  config.local_endpoint = local_endpoint_;
-  config.receiver_endpoint = remote_endpoint_;
   if (audio_config_) {
-    config.audio_ssrc = audio_config_->sender_ssrc;
-    config.audio_codec = audio_config_->codec;
-    config.audio_rtp_config = audio_config_->rtp_config;
-    config.audio_frequency = audio_config_->frequency;
-    config.audio_channels = audio_config_->channels;
+    media::cast::transport::CastTransportAudioConfig config;
+    config.base.ssrc = audio_config_->sender_ssrc;
+    config.codec = audio_config_->codec;
+    config.base.rtp_config = audio_config_->rtp_config;
+    config.frequency = audio_config_->frequency;
+    config.channels = audio_config_->channels;
+    cast_transport_->InitializeAudio(config);
 
     if (!audio_event_subscriber_.get()) {
       audio_event_subscriber_.reset(new media::cast::EncodingEventSubscriber(
@@ -157,10 +162,11 @@ void CastSessionDelegate::StartSendingInternal() {
     }
   }
   if (video_config_) {
-    config.video_ssrc = video_config_->sender_ssrc;
-    config.video_codec = video_config_->codec;
-    config.video_rtp_config = video_config_->rtp_config;
-
+    media::cast::transport::CastTransportVideoConfig config;
+    config.base.ssrc = video_config_->sender_ssrc;
+    config.codec = video_config_->codec;
+    config.base.rtp_config = video_config_->rtp_config;
+    cast_transport_->InitializeVideo(config);
     if (!video_event_subscriber_.get()) {
       video_event_subscriber_.reset(new media::cast::EncodingEventSubscriber(
           media::cast::VIDEO_EVENT, kMaxVideoEventEntries));
@@ -169,18 +175,13 @@ void CastSessionDelegate::StartSendingInternal() {
     }
   }
 
-  cast_transport_.reset(new CastTransportSenderIPC(
-      config,
-      base::Bind(&CastSessionDelegate::StatusNotificationCB,
-                 base::Unretained(this))));
-
   cast_sender_.reset(CastSender::CreateCastSender(
       cast_environment_,
       audio_config_.get(),
       video_config_.get(),
       NULL,  // GPU.
       base::Bind(&CastSessionDelegate::InitializationResult,
-                 base::Unretained(this)),
+                 weak_factory_.GetWeakPtr()),
       cast_transport_.get()));
   cast_transport_->SetPacketReceiver(cast_sender_->packet_receiver());
 }