Index: content/browser/renderer_host/media/audio_input_renderer_host.cc |
diff --git a/content/browser/renderer_host/media/audio_input_renderer_host.cc b/content/browser/renderer_host/media/audio_input_renderer_host.cc |
index e5d4f78db9f03603f40dab0ff35695e98a1ddf3e..2dcc56d0918090e456ba0227cae5774e33bd947d 100644 |
--- a/content/browser/renderer_host/media/audio_input_renderer_host.cc |
+++ b/content/browser/renderer_host/media/audio_input_renderer_host.cc |
@@ -17,6 +17,7 @@ |
#include "content/browser/renderer_host/media/audio_input_sync_writer.h" |
#include "content/browser/renderer_host/media/media_stream_manager.h" |
#include "media/audio/audio_manager_base.h" |
+#include "media/base/audio_bus.h" |
namespace content { |
@@ -113,8 +114,7 @@ void AudioInputRendererHost::OnError(media::AudioInputController* controller, |
} |
void AudioInputRendererHost::OnData(media::AudioInputController* controller, |
- const uint8* data, |
- uint32 size) { |
+ const media::AudioBus* data) { |
NOTREACHED() << "Only low-latency mode is supported."; |
} |
@@ -292,8 +292,9 @@ void AudioInputRendererHost::OnCreateStream( |
// Create a new AudioEntry structure. |
scoped_ptr<AudioEntry> entry(new AudioEntry()); |
- const uint32 segment_size = (sizeof(media::AudioInputBufferParameters) + |
- audio_params.GetBytesPerBuffer()); |
+ const uint32 segment_size = |
+ (sizeof(media::AudioInputBufferParameters) + |
+ media::AudioBus::CalculateMemorySize(audio_params)); |
entry->shared_memory_segment_count = config.shared_memory_count; |
// Create the shared memory and share it with the renderer process |
@@ -307,9 +308,8 @@ void AudioInputRendererHost::OnCreateStream( |
return; |
} |
- scoped_ptr<AudioInputSyncWriter> writer( |
- new AudioInputSyncWriter(&entry->shared_memory, |
- entry->shared_memory_segment_count)); |
+ scoped_ptr<AudioInputSyncWriter> writer(new AudioInputSyncWriter( |
+ &entry->shared_memory, entry->shared_memory_segment_count, audio_params)); |
if (!writer->Init()) { |
SendErrorMessage(stream_id, SYNC_WRITER_INIT_FAILED); |