Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1057)

Unified Diff: media/audio/audio_output_device_unittest.cc

Issue 10832285: Switch OnMoreData() to use AudioBus. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase. Comments. Created 8 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/audio/audio_output_device.cc ('k') | media/audio/audio_output_proxy_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/audio/audio_output_device_unittest.cc
diff --git a/media/audio/audio_output_device_unittest.cc b/media/audio/audio_output_device_unittest.cc
index 14a7a35c223f99564378648ef0d4b15c42458a50..a2aea89a74fcdeadd6f37ef0782b2c4462b2ead6 100644
--- a/media/audio/audio_output_device_unittest.cc
+++ b/media/audio/audio_output_device_unittest.cc
@@ -173,7 +173,7 @@ TEST_F(AudioOutputDeviceTest, CreateStream) {
// than just the audio data, so we must call TotalSharedMemorySizeInBytes()
// to get the actual size needed to fit the audio data plus the extra data.
int memory_size = TotalSharedMemorySizeInBytes(
- default_audio_parameters_.GetBytesPerBuffer());
+ AudioBus::CalculateMemorySize(default_audio_parameters_));
SharedMemory shared_memory;
ASSERT_TRUE(shared_memory.CreateAndMapAnonymous(memory_size));
memset(shared_memory.memory(), 0xff, memory_size);
@@ -215,7 +215,7 @@ TEST_F(AudioOutputDeviceTest, CreateStream) {
Return(kNumberOfFramesToProcess)));
audio_device->OnStreamCreated(duplicated_memory_handle, audio_device_socket,
- memory_size);
+ PacketSizeInBytes(memory_size));
io_loop_.PostDelayedTask(FROM_HERE, MessageLoop::QuitClosure(),
TestTimeouts::action_timeout());
« no previous file with comments | « media/audio/audio_output_device.cc ('k') | media/audio/audio_output_proxy_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698