Cast:Transport: Dividing A/V Initialization pipeline

media/cast/test/end2end_unittest.cc

Index: media/cast/test/end2end_unittest.cc
diff --git a/media/cast/test/end2end_unittest.cc b/media/cast/test/end2end_unittest.cc
index 9c4562a662ad12d43f7072e081be4097dc629c32..70f7c46131702ea2178d32038f2142b228e8352d 100644
--- a/media/cast/test/end2end_unittest.cc
+++ b/media/cast/test/end2end_unittest.cc
@@ -90,7 +90,9 @@ std::string ConvertFromBase16String(const std::string base_16) {
 void OwnThatAudioBus(scoped_ptr<AudioBus> audio_bus) {}
 
 void UpdateCastTransportStatus(transport::CastTransportStatus status) {
-  EXPECT_EQ(status, transport::TRANSPORT_INITIALIZED);
+  bool result = (status == transport::TRANSPORT_AUDIO_INITIALIZED ||
+                 status == transport::TRANSPORT_VIDEO_INITIALIZED);
+  EXPECT_TRUE(result);
 }
 
 // This is wrapped in a struct because it needs to be put into a std::map.
@@ -478,14 +480,14 @@ class End2EndTest : public ::testing::Test {
     video_receiver_config_.use_external_decoder = false;
     video_receiver_config_.codec = video_sender_config_.codec;
 
-    transport_config_.audio_ssrc = audio_sender_config_.sender_ssrc;
-    transport_config_.video_ssrc = video_sender_config_.sender_ssrc;
-    transport_config_.video_codec = video_sender_config_.codec;
-    transport_config_.audio_codec = audio_sender_config_.codec;
-    transport_config_.video_rtp_config = video_sender_config_.rtp_config;
-    transport_config_.audio_rtp_config = audio_sender_config_.rtp_config;
-    transport_config_.audio_frequency = audio_sender_config_.frequency;
-    transport_config_.audio_channels = audio_sender_config_.channels;
+    transport_audio_config_.base.ssrc = audio_sender_config_.sender_ssrc;
+    transport_audio_config_.codec = audio_sender_config_.codec;
+    transport_audio_config_.base.rtp_config = audio_sender_config_.rtp_config;
+    transport_audio_config_.frequency = audio_sender_config_.frequency;
+    transport_audio_config_.channels = audio_sender_config_.channels;
+    transport_video_config_.base.ssrc = video_sender_config_.sender_ssrc;
+    transport_video_config_.codec = video_sender_config_.codec;
+    transport_video_config_.base.rtp_config = video_sender_config_.rtp_config;
   }
 
   void Create() {
@@ -494,13 +496,17 @@ class End2EndTest : public ::testing::Test {
                                          audio_receiver_config_,
                                          video_receiver_config_,
                                          &receiver_to_sender_));
+    net::IPEndPoint dummy_endpoint;
     transport_sender_.reset(new transport::CastTransportSenderImpl(
         NULL,
         testing_clock_sender_,
-        transport_config_,
+        dummy_endpoint,
+        dummy_endpoint,
         base::Bind(&UpdateCastTransportStatus),
         task_runner_,
         &sender_to_receiver_));
+    transport_sender_->InitializeAudio(transport_audio_config_);
+    transport_sender_->InitializeVideo(transport_video_config_);
 
     cast_sender_.reset(CastSender::CreateCastSender(
         cast_environment_sender_,
@@ -565,7 +571,8 @@ class End2EndTest : public ::testing::Test {
   VideoReceiverConfig video_receiver_config_;
   AudioSenderConfig audio_sender_config_;
   VideoSenderConfig video_sender_config_;
-  transport::CastTransportConfig transport_config_;
+  transport::CastTransportAudioConfig transport_audio_config_;
+  transport::CastTransportVideoConfig transport_video_config_;
 
   base::TimeTicks start_time_;
   base::SimpleTestTickClock* testing_clock_sender_;
@@ -974,13 +981,13 @@ TEST_F(End2EndTest, ResetReferenceFrameId) {
 TEST_F(End2EndTest, CryptoVideo) {
   SetupConfig(transport::kPcm16, 32000, false, 1);
 
-  transport_config_.aes_iv_mask =
+  transport_video_config_.base.aes_iv_mask =
       ConvertFromBase16String("1234567890abcdeffedcba0987654321");
-  transport_config_.aes_key =
+  transport_video_config_.base.aes_key =
       ConvertFromBase16String("deadbeefcafeb0b0b0b0cafedeadbeef");
 
-  video_receiver_config_.aes_iv_mask = transport_config_.aes_iv_mask;
-  video_receiver_config_.aes_key = transport_config_.aes_key;
+  video_receiver_config_.aes_iv_mask = transport_video_config_.base.aes_iv_mask;
+  video_receiver_config_.aes_key = transport_video_config_.base.aes_key;
 
   Create();
 
@@ -1011,13 +1018,13 @@ TEST_F(End2EndTest, CryptoVideo) {
 TEST_F(End2EndTest, CryptoAudio) {
   SetupConfig(transport::kPcm16, 32000, false, 1);
 
-  transport_config_.aes_iv_mask =
+  transport_audio_config_.base.aes_iv_mask =
       ConvertFromBase16String("abcdeffedcba12345678900987654321");
-  transport_config_.aes_key =
+  transport_audio_config_.base.aes_key =
       ConvertFromBase16String("deadbeefcafecafedeadbeefb0b0b0b0");
 
-  audio_receiver_config_.aes_iv_mask = transport_config_.aes_iv_mask;
-  audio_receiver_config_.aes_key = transport_config_.aes_key;
+  audio_receiver_config_.aes_iv_mask = transport_audio_config_.base.aes_iv_mask;
+  audio_receiver_config_.aes_key = transport_audio_config_.base.aes_key;
 
   Create();