1 files changed, 42 insertions, 24 deletions

diff --git a/media/cast/audio_sender/audio_sender_unittest.cc b/media/cast/audio_sender/audio_sender_unittest.cc
index 9ab6bb549b..5b632bf025 100644
--- a/media/cast/audio_sender/audio_sender_unittest.cc
+++ b/media/cast/audio_sender/audio_sender_unittest.cc
@@ -3,12 +3,15 @@
 // found in the LICENSE file.
 
 #include "base/bind.h"
+#include "base/bind_helpers.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/test/simple_test_tick_clock.h"
+#include "media/base/media.h"
 #include "media/cast/audio_sender/audio_sender.h"
 #include "media/cast/cast_config.h"
 #include "media/cast/cast_environment.h"
 #include "media/cast/pacing/mock_paced_packet_sender.h"
+#include "media/cast/test/audio_utility.h"
 #include "media/cast/test/fake_task_runner.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ -18,14 +21,12 @@ namespace cast {
 static const int64 kStartMillisecond = GG_INT64_C(12345678900000);
 
 using testing::_;
-
-static void RelaseFrame(const PcmAudioFrame* frame) {
-  delete frame;
-}
+using testing::AtLeast;
 
 class AudioSenderTest : public ::testing::Test {
  protected:
   AudioSenderTest() {
+    InitializeMediaLibraryForTesting();
     testing_clock_.Advance(
         base::TimeDelta::FromMilliseconds(kStartMillisecond));
   }
@@ -33,17 +34,17 @@ class AudioSenderTest : public ::testing::Test {
   virtual void SetUp() {
     task_runner_ = new test::FakeTaskRunner(&testing_clock_);
     cast_environment_ = new CastEnvironment(&testing_clock_, task_runner_,
-        task_runner_, task_runner_, task_runner_, task_runner_);
-    AudioSenderConfig audio_config;
-    audio_config.codec = kOpus;
-    audio_config.use_external_encoder = false;
-    audio_config.frequency = 48000;
-    audio_config.channels = 2;
-    audio_config.bitrate = 64000;
-    audio_config.rtp_payload_type = 127;
+        task_runner_, task_runner_, task_runner_, task_runner_,
+        GetDefaultCastLoggingConfig());
+    audio_config_.codec = kOpus;
+    audio_config_.use_external_encoder = false;
+    audio_config_.frequency = kDefaultAudioSamplingRate;
+    audio_config_.channels = 2;
+    audio_config_.bitrate = kDefaultAudioEncoderBitrate;
+    audio_config_.rtp_payload_type = 127;
 
     audio_sender_.reset(
-        new AudioSender(cast_environment_, audio_config, &mock_transport_));
+        new AudioSender(cast_environment_, audio_config_, &mock_transport_));
   }
 
   virtual ~AudioSenderTest() {}
@@ -53,26 +54,43 @@ class AudioSenderTest : public ::testing::Test {
   scoped_refptr<test::FakeTaskRunner> task_runner_;
   scoped_ptr<AudioSender> audio_sender_;
   scoped_refptr<CastEnvironment> cast_environment_;
+  AudioSenderConfig audio_config_;
 };
 
 TEST_F(AudioSenderTest, Encode20ms) {
-  EXPECT_CALL(mock_transport_, SendPackets(_)).Times(1);
-
-  PcmAudioFrame* audio_frame = new PcmAudioFrame();
-  audio_frame->channels = 2;
-  audio_frame->frequency = 48000;
-  audio_frame->samples.insert(audio_frame->samples.begin(), 480 * 2 * 2, 123);
-
-  base::TimeTicks recorded_time;
-  audio_sender_->InsertRawAudioFrame(audio_frame, recorded_time,
-      base::Bind(&RelaseFrame, audio_frame));
-
+  EXPECT_CALL(mock_transport_, SendPackets(_)).Times(AtLeast(1));
+
+  const base::TimeDelta kDuration = base::TimeDelta::FromMilliseconds(20);
+  scoped_ptr<AudioBus> bus(TestAudioBusFactory(
+      audio_config_.channels, audio_config_.frequency,
+      TestAudioBusFactory::kMiddleANoteFreq, 0.5f).NextAudioBus(kDuration));
+
+  base::TimeTicks recorded_time = base::TimeTicks::Now();
+  audio_sender_->InsertAudio(
+      bus.get(), recorded_time,
+      base::Bind(base::IgnoreResult(&scoped_ptr<AudioBus>::release),
+                 base::Unretained(&bus)));
   task_runner_->RunTasks();
+
+  EXPECT_TRUE(!bus) << "AudioBus wasn't released after use.";
 }
 
 TEST_F(AudioSenderTest, RtcpTimer) {
+  EXPECT_CALL(mock_transport_, SendPackets(_)).Times(AtLeast(1));
   EXPECT_CALL(mock_transport_, SendRtcpPacket(_)).Times(1);
 
+  const base::TimeDelta kDuration = base::TimeDelta::FromMilliseconds(20);
+  scoped_ptr<AudioBus> bus(TestAudioBusFactory(
+      audio_config_.channels, audio_config_.frequency,
+      TestAudioBusFactory::kMiddleANoteFreq, 0.5f).NextAudioBus(kDuration));
+
+  base::TimeTicks recorded_time = base::TimeTicks::Now();
+  audio_sender_->InsertAudio(
+      bus.get(), recorded_time,
+      base::Bind(base::IgnoreResult(&scoped_ptr<AudioBus>::release),
+                 base::Unretained(&bus)));
+  task_runner_->RunTasks();
+
   // Make sure that we send at least one RTCP packet.
   base::TimeDelta max_rtcp_timeout =
       base::TimeDelta::FromMilliseconds(1 + kDefaultRtcpIntervalMs * 3 / 2);