Refactoring: CastTransport InitializeAudio/InitializeVideo.

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 451 matching lines @@
 
     test_receiver_audio_callback_->SetExpectedSamplingFrequency(
         audio_receiver_config_.rtp_timebase);
 
     video_sender_config_.sender_ssrc = 3;
     video_sender_config_.receiver_ssrc = 4;
     video_sender_config_.max_playout_delay =
         base::TimeDelta::FromMilliseconds(kTargetPlayoutDelayMs);
     video_sender_config_.rtp_payload_type = RtpPayloadType::VIDEO_VP8;
     video_sender_config_.use_external_encoder = false;
+    video_sender_config_.rtp_timebase = kVideoFrequency;
     video_sender_config_.max_bitrate = 50000;
     video_sender_config_.min_bitrate = 10000;
     video_sender_config_.start_bitrate = 10000;
     video_sender_config_.video_codec_params.max_qp = 30;
     video_sender_config_.video_codec_params.min_qp = 4;
     video_sender_config_.max_frame_rate = 30;
     video_sender_config_.codec = video_codec;
     video_sender_config_.aes_iv_mask =
         ConvertFromBase16String("1234567890abcdeffedcba0987654321");
     video_sender_config_.aes_key =
@@ skipping 405 matching lines @@
 
 namespace {
 
 class TransportClient : public CastTransport::Client {
  public:
   TransportClient(LogEventDispatcher* log_event_dispatcher,
                   End2EndTest* e2e_test)
       : log_event_dispatcher_(log_event_dispatcher), e2e_test_(e2e_test) {}
 
   void OnStatusChanged(media::cast::CastTransportStatus status) final {
-    bool result = (status == TRANSPORT_AUDIO_INITIALIZED ||
-                   status == TRANSPORT_VIDEO_INITIALIZED);
-    EXPECT_TRUE(result);
+    EXPECT_EQ(TRANSPORT_STREAM_INITIALIZED, status);
   };
   void OnLoggingEventsReceived(
       std::unique_ptr<std::vector<FrameEvent>> frame_events,
       std::unique_ptr<std::vector<PacketEvent>> packet_events) final {
     log_event_dispatcher_->DispatchBatchOfEvents(std::move(frame_events),
                                                  std::move(packet_events));
   };
   void ProcessRtpPacket(std::unique_ptr<Packet> packet) final {
     if (e2e_test_)
       e2e_test_->ReceivePacket(std::move(packet));
   };
 
  private:
   LogEventDispatcher* const log_event_dispatcher_;  // Not owned by this class.
   End2EndTest* const e2e_test_;                     // Not owned by this class.
 
   DISALLOW_COPY_AND_ASSIGN(TransportClient);
 };
 
 }  // namespace
 
 void End2EndTest::Create() {
   transport_sender_.reset(new CastTransportImpl(
       testing_clock_sender_, base::TimeDelta::FromMilliseconds(1),
-      base::WrapUnique(
-          new TransportClient(cast_environment_sender_->logger(), nullptr)),
+      base::MakeUnique<TransportClient>(cast_environment_sender_->logger(),
+                                        nullptr),
       base::WrapUnique(sender_to_receiver_), task_runner_sender_));
 
   transport_receiver_.reset(new CastTransportImpl(
       testing_clock_sender_, base::TimeDelta::FromMilliseconds(1),
-      base::WrapUnique(
-          new TransportClient(cast_environment_receiver_->logger(), this)),
+      base::MakeUnique<TransportClient>(cast_environment_receiver_->logger(),
+                                        this),
       base::WrapUnique(receiver_to_sender_), task_runner_sender_));
 
   cast_receiver_ =
       CastReceiver::Create(cast_environment_receiver_, audio_receiver_config_,
                            video_receiver_config_, transport_receiver_.get());
 
   cast_sender_ =
       CastSender::Create(cast_environment_sender_, transport_sender_.get());
 
   // Initializing audio and video senders.
@@ skipping 329 matching lines @@
       EXPECT_EQ(0u, jump);
       jump = i;
     }
   }
   EXPECT_GT(jump, 49u);
   EXPECT_LT(jump, 120u);
 }
 
 }  // namespace cast
 }  // namespace media