Allow audio system to handle synchronized low-latency audio I/O

media/audio/audio_output_device_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.

[tommi (sloooow) - chröme, 2012/09/07 09:58:19]

What about adding tests for the new code?

[Chris Rogers, 2012/09/07 20:34:01]

Good idea - will do in next patch-set, for now I'm addressing the other
comments.

 // 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"
 #include "base/sync_socket.h"
@@ skipping 29 matching lines @@
 
 class MockAudioOutputIPC : public AudioOutputIPC {
  public:
   MockAudioOutputIPC() {}
   virtual ~MockAudioOutputIPC() {}
 
   MOCK_METHOD1(AddDelegate, int(AudioOutputIPCDelegate* delegate));
   MOCK_METHOD1(RemoveDelegate, void(int stream_id));
 
   MOCK_METHOD2(CreateStream,
-      void(int stream_id, const AudioParameters& params));
+      void(int stream_id, const AudioParameters& params, int input_channels));
   MOCK_METHOD1(PlayStream, void(int stream_id));
   MOCK_METHOD1(CloseStream, void(int stream_id));
   MOCK_METHOD2(SetVolume, void(int stream_id, double volume));
   MOCK_METHOD1(PauseStream, void(int stream_id));
   MOCK_METHOD1(FlushStream, void(int stream_id));
 };
 
 // Creates a copy of a SyncSocket handle that we can give to AudioOutputDevice.
 // On Windows this means duplicating the pipe handle so that AudioOutputDevice
 // can call CloseHandle() (since ownership has been transferred), but on other
@@ skipping 68 matching lines @@
   scoped_refptr<AudioOutputDevice> audio_device(CreateAudioDevice());
   audio_device->Initialize(default_audio_parameters_, &callback_);
 
   EXPECT_CALL(audio_output_ipc_, AddDelegate(audio_device.get()))
       .WillOnce(Return(1));
   EXPECT_CALL(audio_output_ipc_, RemoveDelegate(1)).WillOnce(Return());
 
   audio_device->Start();
   audio_device->Stop();
 
-  EXPECT_CALL(audio_output_ipc_, CreateStream(_, _));
+  EXPECT_CALL(audio_output_ipc_, CreateStream(_, _, _));
   EXPECT_CALL(audio_output_ipc_, CloseStream(_));
 
   io_loop_.RunAllPending();
 }
 
 // Starts an audio stream, creates a shared memory section + SyncSocket pair
 // that AudioOutputDevice must use for audio data.  It then sends a request for
 // a single audio packet and quits when the packet has been sent.
 TEST_F(AudioOutputDeviceTest, CreateStream) {
   scoped_refptr<AudioOutputDevice> audio_device(CreateAudioDevice());
   audio_device->Initialize(default_audio_parameters_, &callback_);
 
   EXPECT_CALL(audio_output_ipc_, AddDelegate(audio_device.get()))
       .WillOnce(Return(1));
   EXPECT_CALL(audio_output_ipc_, RemoveDelegate(1)).WillOnce(Return());
 
   audio_device->Start();
 
-  EXPECT_CALL(audio_output_ipc_, CreateStream(_, _))
+  EXPECT_CALL(audio_output_ipc_, CreateStream(_, _, _))
       .WillOnce(WithArgs<0>(
           Invoke(this, &AudioOutputDeviceTest::set_stream_id)));
 
 
   EXPECT_EQ(stream_id_, -1);
   io_loop_.RunAllPending();
 
   // OnCreateStream() must have been called and we should have a valid
   // stream id.
   ASSERT_NE(stream_id_, -1);
@@ skipping 52 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.