Modifies AudioInputCallback::OnData and use media::AudioBus instead of plain byte vector

content/browser/renderer_host/media/audio_input_sync_writer.cc

Index: content/browser/renderer_host/media/audio_input_sync_writer.cc
diff --git a/content/browser/renderer_host/media/audio_input_sync_writer.cc b/content/browser/renderer_host/media/audio_input_sync_writer.cc
index 99b91b7b9f6b8fcf2e19c2df0504f593c16b2d21..7d2369f9438129f2742c2f9f0999ae7a59b81621 100644
--- a/content/browser/renderer_host/media/audio_input_sync_writer.cc
+++ b/content/browser/renderer_host/media/audio_input_sync_writer.cc
@@ -8,20 +8,29 @@
 
 #include "base/memory/shared_memory.h"
 #include "content/browser/renderer_host/media/media_stream_manager.h"
+#include "media/base/audio_bus.h"
+
+using media::AudioBus;
 
 namespace content {
 
-AudioInputSyncWriter::AudioInputSyncWriter(
-    base::SharedMemory* shared_memory,
-    int shared_memory_segment_count)
+AudioInputSyncWriter::AudioInputSyncWriter(base::SharedMemory* shared_memory,
+                                           int shared_memory_segment_count,
+                                           const media::AudioParameters& params)
     : shared_memory_(shared_memory),
       shared_memory_segment_count_(shared_memory_segment_count),
       current_segment_id_(0),
-      creation_time_(base::Time::Now()) {
+      creation_time_(base::Time::Now()),
+      params_(params),
+      audio_bus_memory_size_(AudioBus::CalculateMemorySize(params)) {
+  DVLOG(1) << __FUNCTION__;

[DaleCurtis, 2014/06/04 17:39:17]

Please drop these DVLOGs before submission.

   DCHECK_GT(shared_memory_segment_count, 0);
   DCHECK_EQ(shared_memory->requested_size() % shared_memory_segment_count, 0u);
   shared_memory_segment_size_ =
       shared_memory->requested_size() / shared_memory_segment_count;
+  DVLOG(1) << "SharedMemory::requested_size: "
+           << shared_memory->requested_size();
+  DVLOG(1) << "shared_memory_segment_count: " << shared_memory_segment_count;
 }
 
 AudioInputSyncWriter::~AudioInputSyncWriter() {}
@@ -31,8 +40,7 @@ void AudioInputSyncWriter::UpdateRecordedBytes(uint32 bytes) {
   socket_->Send(&bytes, sizeof(bytes));
 }
 
-uint32 AudioInputSyncWriter::Write(const void* data,
-                                   uint32 size,
+uint32 AudioInputSyncWriter::Write(const media::AudioBus* data,
                                    double volume,
                                    bool key_pressed) {
 #if !defined(OS_ANDROID)
@@ -64,14 +72,20 @@ uint32 AudioInputSyncWriter::Write(const void* data,
   media::AudioInputBuffer* buffer =
       reinterpret_cast<media::AudioInputBuffer*>(ptr);
   buffer->params.volume = volume;
-  buffer->params.size = size;
+  buffer->params.size = audio_bus_memory_size_;
   buffer->params.key_pressed = key_pressed;
-  memcpy(buffer->audio, data, size);
+
+  // Create audio bus wrapping existing block of shared memory and fill it up
+  // with data provided from the native capture audio layer. These operations
+  // copies data from the audio bus source to allocated shared memory.
+  scoped_ptr<media::AudioBus> audio_bus =

[DaleCurtis, 2014/06/04 17:39:17]

I'd just pre-create all these busses based on the segment size during
construction, that way you're not repeatedly reallocating these objects. You can
transfer the AudioBus objects via release() into a ScopedVector.

+      media::AudioBus::WrapMemory(params_, buffer->audio);
+  data->CopyTo(audio_bus.get());
 
   if (++current_segment_id_ >= shared_memory_segment_count_)
     current_segment_id_ = 0;
 
-  return size;
+  return params_.GetBytesPerBuffer();
 }
 
 void AudioInputSyncWriter::Close() {