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,
+  MOCK_METHOD3(Render, int(AudioBus* audio_bus,
                            int number_of_frames,
                            int audio_delay_milliseconds));
   MOCK_METHOD0(OnRenderError, void());
 };
 
 class MockAudioOutputIPC : public AudioOutputIPC {
  public:
   MockAudioOutputIPC() {}
   virtual ~MockAudioOutputIPC() {}
 
@@ skipping 33 matching lines @@
 }
 
 // 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;
-    }
-  }
+void ZeroAudioData(int number_of_frames, AudioBus* audio_bus) {

[scherkus (not reviewing), 2012/08/07 23:23:41]

if this was an ACTION_P2() you can get rid of all of the Invoke<> stuff in the
test

[DaleCurtis, 2012/08/08 00:17:58]

Actually, I'm not sure I understand what that ZeroAudioData is for. The comment
states it's being invoked with 0 to let valgrind errors through. So it seems to
do nothing? I confirmed it is indeed passing 0, so maybe just remove instead?

[scherkus (not reviewing), 2012/08/08 00:49:01]

Strange indeed! I'm not sure what's going on here either -- run git blame + ping
the author?

[DaleCurtis, 2012/08/08 01:26:07]

tommi just added this file I think (git blame confirms). tommi?

+  audio_bus->ZeroFrames(number_of_frames);
 }
 
 }  // namespace.
 
 class AudioOutputDeviceTest : public testing::Test {
  public:
   AudioOutputDeviceTest()
       : default_audio_parameters_(AudioParameters::AUDIO_PCM_LINEAR,
                                   CHANNEL_LAYOUT_STEREO,
                                   48000, 16, 1024),
@@ skipping 137 matching lines @@
   io_loop_.Run();
 
   // Close the stream sequence.
   EXPECT_CALL(audio_output_ipc_, CloseStream(stream_id_));
 
   audio_device->Stop();
   io_loop_.RunAllPending();
 }
 
 }  // namespace media.