[Cast] Clean-up: Merge AudioReceiverConfig+VideoReceiverConfig-->FrameReceiverConfig.

media/cast/audio_receiver/audio_receiver_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.
 
 #include <deque>
 #include <utility>
 
 #include "base/bind.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/test/simple_test_tick_clock.h"
 #include "media/cast/audio_receiver/audio_receiver.h"
 #include "media/cast/cast_defines.h"
 #include "media/cast/cast_environment.h"
 #include "media/cast/logging/simple_event_subscriber.h"
 #include "media/cast/rtcp/test_rtcp_packet_builder.h"
 #include "media/cast/test/fake_single_thread_task_runner.h"
+#include "media/cast/test/utility/default_config.h"
 #include "media/cast/transport/pacing/mock_paced_packet_sender.h"
 #include "testing/gmock/include/gmock/gmock.h"
 
 using ::testing::_;
 
 namespace media {
 namespace cast {
 
 namespace {
 
@@ skipping 31 matching lines @@
 
   DISALLOW_COPY_AND_ASSIGN(FakeAudioClient);
 };
 
 }  // namespace
 
 class AudioReceiverTest : public ::testing::Test {
  protected:
   AudioReceiverTest() {
     // Configure the audio receiver to use PCM16.
-    audio_config_.rtp_payload_type = 127;
+    audio_config_ = GetDefaultAudioReceiverConfig();
+    audio_config_.rtp_max_delay_ms = kPlayoutDelayMillis;
     audio_config_.frequency = 16000;
     audio_config_.channels = 1;
-    audio_config_.codec = transport::kPcm16;
-    audio_config_.use_external_decoder = true;
-    audio_config_.feedback_ssrc = 1234;
-    audio_config_.incoming_ssrc = 5678;
-    audio_config_.rtp_max_delay_ms = kPlayoutDelayMillis;
+    audio_config_.codec.audio = transport::kPcm16;
     testing_clock_ = new base::SimpleTestTickClock();
     testing_clock_->Advance(base::TimeTicks::Now() - base::TimeTicks());
     start_time_ = testing_clock_->NowTicks();
     task_runner_ = new test::FakeSingleThreadTaskRunner(testing_clock_);
 
     cast_environment_ = new CastEnvironment(
         scoped_ptr<base::TickClock>(testing_clock_).Pass(),
         task_runner_,
         task_runner_,
         task_runner_);
@@ skipping 27 matching lines @@
     uint32 ntp_seconds;
     uint32 ntp_fraction;
     ConvertTimeTicksToNtp(now, &ntp_seconds, &ntp_fraction);
     TestRtcpPacketBuilder rtcp_packet;
     rtcp_packet.AddSrWithNtp(audio_config_.incoming_ssrc,
                              ntp_seconds, ntp_fraction,
                              static_cast<uint32>(rtp_timestamp));
     receiver_->IncomingPacket(rtcp_packet.GetPacket().Pass());
   }
 
-  AudioReceiverConfig audio_config_;
+  FrameReceiverConfig audio_config_;
   std::vector<uint8> payload_;
   RtpCastHeader rtp_header_;
   base::SimpleTestTickClock* testing_clock_;  // Owned by CastEnvironment.
   base::TimeTicks start_time_;
   transport::MockPacedPacketSender mock_transport_;
   scoped_refptr<test::FakeSingleThreadTaskRunner> task_runner_;
   scoped_refptr<CastEnvironment> cast_environment_;
   FakeAudioClient fake_audio_client_;
 
   // Important for the AudioReceiver to be declared last, since its dependencies
@@ skipping 38 matching lines @@
   EXPECT_EQ(rtp_header_.frame_id, frame_events.begin()->frame_id);
   EXPECT_EQ(rtp_header_.rtp_timestamp, frame_events.begin()->rtp_timestamp);
 
   cast_environment_->Logging()->RemoveRawEventSubscriber(&event_subscriber);
 }
 
 TEST_F(AudioReceiverTest, ReceivesFramesSkippingWhenAppropriate) {
   EXPECT_CALL(mock_transport_, SendRtcpPacket(_, _))
       .WillRepeatedly(testing::Return(true));
 
-  const uint32 rtp_advance_per_frame = audio_config_.frequency / 100;
+  const uint32 rtp_advance_per_frame =
+      audio_config_.frequency / audio_config_.max_frame_rate;
   const base::TimeDelta time_advance_per_frame =
-      base::TimeDelta::FromMilliseconds(10);
+      base::TimeDelta::FromSeconds(1) / audio_config_.max_frame_rate;
 
   FeedLipSyncInfoIntoReceiver();
   task_runner_->RunTasks();
   const base::TimeTicks first_frame_capture_time = testing_clock_->NowTicks();
 
   // Enqueue a request for an audio frame.
   const FrameEncodedCallback frame_encoded_callback =
       base::Bind(&FakeAudioClient::DeliverEncodedAudioFrame,
                  base::Unretained(&fake_audio_client_));
   receiver_->GetEncodedAudioFrame(frame_encoded_callback);
@@ skipping 57 matching lines @@
 
   // Move forward to the playout time of an unreceived Frame 5.  Expect no
   // additional frames were emitted.
   testing_clock_->Advance(3 * time_advance_per_frame);
   task_runner_->RunTasks();
   EXPECT_EQ(3, fake_audio_client_.number_times_called());
 }
 
 }  // namespace cast
 }  // namespace media