Cast: Refactoring Cast API's

media/cast/test/end2end_unittest.cc

 // Copyright 2013 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.
 //
 // This test generate synthetic data. For audio it's a sinusoid waveform with
 // frequency kSoundFrequency and different amplitudes. For video it's a pattern
 // that is shifting by one pixel per frame, each pixels neighbors right and down
 // is this pixels value +1, since the pixel value is 8 bit it will wrap
 // frequently within the image. Visually this will create diagonally color bands
 // that moves across the screen
@@ skipping 388 matching lines @@
             task_runner_,
             task_runner_,
             task_runner_,
             task_runner_,
             task_runner_,
             task_runner_,
             GetLoggingConfigWithRawEventsAndStatsEnabled())),
         receiver_to_sender_(cast_environment_),
         sender_to_receiver_(cast_environment_),
         test_receiver_audio_callback_(new TestReceiverAudioCallback()),
-        test_receiver_video_callback_(new TestReceiverVideoCallback()) {
+        test_receiver_video_callback_(new TestReceiverVideoCallback()),
+        audio_initialization_cnt_(0),
+        video_initialization_cnt_(0) {
     testing_clock_->Advance(
         base::TimeDelta::FromMilliseconds(kStartMillisecond));
     cast_environment_->Logging()->AddRawEventSubscriber(&event_subscriber_);
   }
 
   void SetupConfig(transport::AudioCodec audio_codec,
                    int audio_sampling_frequency,
                    // TODO(miu): 3rd arg is meaningless?!?
                    bool external_audio_decoder,
                    int max_number_of_video_buffers_used) {
@@ skipping 60 matching lines @@
                                          audio_receiver_config_,
                                          video_receiver_config_,
                                          &receiver_to_sender_));
     transport_sender_.reset(new transport::CastTransportSenderImpl(
         testing_clock_,
         transport_config_,
         base::Bind(&UpdateCastTransportStatus),
         task_runner_,
         &sender_to_receiver_));
 
-    cast_sender_.reset(CastSender::CreateCastSender(
+    cast_sender_.reset(CastSender::Create(
         cast_environment_,
-        &audio_sender_config_,
-        &video_sender_config_,
-        NULL,
         base::Bind(&End2EndTest::InitializationResult, base::Unretained(this)),
         transport_sender_.get()));
 
+    // Initializing audio and video senders.
+    cast_sender_->InitializeAudio(audio_sender_config_);
+    cast_sender_->InitializeVideo(video_sender_config_, NULL);
+
     receiver_to_sender_.SetPacketReceiver(cast_sender_->packet_receiver());
     sender_to_receiver_.SetPacketReceiver(cast_receiver_->packet_receiver());
 
     frame_input_ = cast_sender_->frame_input();
     frame_receiver_ = cast_receiver_->frame_receiver();
 
     audio_bus_factory_.reset(
         new TestAudioBusFactory(audio_sender_config_.channels,
                                 audio_sender_config_.frequency,
                                 kSoundFrequency,
@@ skipping 27 matching lines @@
 
   void RunTasks(int during_ms) {
     for (int i = 0; i < during_ms; ++i) {
       // Call process the timers every 1 ms.
       testing_clock_->Advance(base::TimeDelta::FromMilliseconds(1));
       task_runner_->RunTasks();
     }
   }
 
   void InitializationResult(CastInitializationStatus result) {
-    EXPECT_EQ(result, STATUS_INITIALIZED);
+    // Result should be STATUS_AUDIO_INITIALIZED or STATUS_VIDEO_INITIALIZED;
+    // each should be called only once.
+    if (result == STATUS_AUDIO_INITIALIZED) {
+      ++audio_initialization_cnt_;
+    } else if (result == STATUS_VIDEO_INITIALIZED) {
+      ++video_initialization_cnt_;
+    } else {
+      ASSERT_TRUE(false);

[Ami GONE FROM CHROMIUM, 2014/02/14 18:23:54]

FAIL()

[mikhal1, 2014/02/18 19:20:43]

Done.

+    }
+    EXPECT_GE(1, audio_initialization_cnt_);
+    EXPECT_GE(1, video_initialization_cnt_);

[Ami GONE FROM CHROMIUM, 2014/02/14 18:23:54]

s/GE/EQ/ here and on the previous line?

[mikhal1, 2014/02/18 19:20:43]

Don't get the comment. Each can be either 0 or 1, depending on the order of the
initialization.
On 2014/02/14 18:23:54, Ami Fischman wrote:

   }
 
   AudioReceiverConfig audio_receiver_config_;
   VideoReceiverConfig video_receiver_config_;
   AudioSenderConfig audio_sender_config_;
   VideoSenderConfig video_sender_config_;
   transport::CastTransportConfig transport_config_;
 
   base::TimeTicks start_time_;
   base::SimpleTestTickClock* testing_clock_;
@@ skipping 11 matching lines @@
 
   scoped_refptr<TestReceiverAudioCallback> test_receiver_audio_callback_;
   scoped_refptr<TestReceiverVideoCallback> test_receiver_video_callback_;
 
   scoped_ptr<TestAudioBusFactory> audio_bus_factory_;
 
   SimpleEventSubscriber event_subscriber_;
   std::vector<FrameEvent> frame_events_;
   std::vector<PacketEvent> packet_events_;
   std::vector<GenericEvent> generic_events_;
+  int audio_initialization_cnt_;
+  int video_initialization_cnt_;
 };
 
 #if defined(OS_WIN)
 #define MAYBE_LoopNoLossPcm16 DISABLED_LoopNoLossPcm16
 #else
 #define MAYBE_LoopNoLossPcm16 LoopNoLossPcm16
 #endif
 // TODO(mikhal): Crashes in win bots (http://crbug.com/329563)
 TEST_F(End2EndTest, MAYBE_LoopNoLossPcm16) {
   SetupConfig(transport::kPcm16, 32000, false, 1);
@@ skipping 697 matching lines @@
   EXPECT_EQ(total_event_count_for_frame, expected_event_count_for_frame);
 }
 
 // TODO(pwestin): Add repeatable packet loss test.
 // TODO(pwestin): Add test for misaligned send get calls.
 // TODO(pwestin): Add more tests that does not resample.
 // TODO(pwestin): Add test when we have starvation for our RunTask.
 
 }  // namespace cast
 }  // namespace media