Switch AudioRenderSink::Callback to use AudioBus.

media/audio/audio_output_device_unittest.cc

 // Copyright (c) 2012 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 <vector>
 
 #include "base/at_exit.h"
 #include "base/message_loop.h"
 #include "base/process_util.h"
 #include "base/shared_memory.h"
@@ skipping 17 matching lines @@
 
 namespace media {
 
 namespace {
 
 class MockRenderCallback : public AudioRendererSink::RenderCallback {
  public:
   MockRenderCallback() {}
   virtual ~MockRenderCallback() {}
 
-  MOCK_METHOD3(Render, int(const std::vector<float*>& audio_data,
-                           int number_of_frames,
-                           int audio_delay_milliseconds));
+  MOCK_METHOD2(Render, int(AudioBus* audio_bus, int audio_delay_milliseconds));
   MOCK_METHOD0(OnRenderError, void());
 };
 
 class MockAudioOutputIPC : public AudioOutputIPC {
  public:
   MockAudioOutputIPC() {}
   virtual ~MockAudioOutputIPC() {}
 
   MOCK_METHOD1(AddDelegate, int(AudioOutputIPCDelegate* delegate));
   MOCK_METHOD1(RemoveDelegate, void(int stream_id));
@@ skipping 29 matching lines @@
 ACTION_P2(SendPendingBytes, socket, pending_bytes) {
   socket->Send(&pending_bytes, sizeof(pending_bytes));
 }
 
 // Used to terminate a loop from a different thread than the loop belongs to.
 // |loop| should be a MessageLoopProxy.
 ACTION_P(QuitLoop, loop) {
   loop->PostTask(FROM_HERE, MessageLoop::QuitClosure());
 }
 
-// Zeros out |number_of_frames| in all channel buffers pointed to by
-// the |audio_data| vector.
-void ZeroAudioData(int number_of_frames,
-                   const std::vector<float*>& audio_data) {
-  std::vector<float*>::const_iterator it = audio_data.begin();
-  for (; it != audio_data.end(); ++it) {
-    float* channel = *it;
-    for (int j = 0; j < number_of_frames; ++j) {
-      channel[j] = 0.0f;
-    }
-  }
-}
-
 }  // namespace.
 
 class AudioOutputDeviceTest : public testing::Test {
  public:
   AudioOutputDeviceTest()
       : default_audio_parameters_(AudioParameters::AUDIO_PCM_LINEAR,
                                   CHANNEL_LAYOUT_STEREO,
                                   48000, 16, 1024),
         stream_id_(-1) {
   }
@@ skipping 102 matching lines @@
       .WillOnce(SendPendingBytes(&browser_socket, memory_size));
 
   // We expect calls to our audio renderer callback, which returns the number
   // of frames written to the memory section.
   // Here's the second place where it gets hacky:  There's no way for us to
   // know (without using a sleep loop!) when the AudioOutputDevice has finished
   // writing the interleaved audio data into the shared memory section.
   // So, for the sake of this test, we consider the call to Render a sign
   // of success and quit the loop.
 
-  // A note on the call to ZeroAudioData():
-  // Valgrind caught a bug in AudioOutputDevice::AudioThreadCallback::Process()
-  // whereby we always interleaved all the frames in the buffer regardless
-  // of how many were actually rendered.  So to keep the benefits of that
-  // test, we explicitly pass 0 in here as the number of frames to
-  // ZeroAudioData().  Other tests might want to pass the requested number
-  // by using WithArgs<1, 0>(Invoke(&ZeroAudioData)) and set the return
-  // value accordingly.
   const int kNumberOfFramesToProcess = 0;
 
-  EXPECT_CALL(callback_, Render(_, _, _))
+  EXPECT_CALL(callback_, Render(_, _))
       .WillOnce(DoAll(
-          WithArgs<0>(Invoke(
-              testing::CreateFunctor(&ZeroAudioData,
-                  kNumberOfFramesToProcess))),
           QuitLoop(io_loop_.message_loop_proxy()),
           Return(kNumberOfFramesToProcess)));
 
   audio_device->OnStreamCreated(duplicated_memory_handle, audio_device_socket,
                                 memory_size);
 
   io_loop_.PostDelayedTask(FROM_HERE, MessageLoop::QuitClosure(),
                            TestTimeouts::action_timeout());
   io_loop_.Run();
 
   // Close the stream sequence.
   EXPECT_CALL(audio_output_ipc_, CloseStream(stream_id_));
 
   audio_device->Stop();
   io_loop_.RunAllPending();
 }
 
 }  // namespace media.