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

content/browser/renderer_host/media/audio_input_sync_writer.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 "content/browser/renderer_host/media/audio_input_sync_writer.h"
 
 #include <algorithm>
 
 #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() {}
 
 // TODO(henrika): Combine into one method (including Write).
 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)
   static const base::TimeDelta kLogDelayThreadhold =
       base::TimeDelta::FromMilliseconds(500);
 
   std::ostringstream oss;
   if (last_write_time_.is_null()) {
     // This is the first time Write is called.
     base::TimeDelta interval = base::Time::Now() - creation_time_;
@@ skipping 11 matching lines @@
     MediaStreamManager::SendMessageToNativeLog(oss.str());
 
   last_write_time_ = base::Time::Now();
 #endif
 
   uint8* ptr = static_cast<uint8*>(shared_memory_->memory());
   ptr += current_segment_id_ * shared_memory_segment_size_;
   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() {
   socket_->Close();
 }
 
 bool AudioInputSyncWriter::Init() {
   socket_.reset(new base::CancelableSyncSocket());
   foreign_socket_.reset(new base::CancelableSyncSocket());
   return base::CancelableSyncSocket::CreatePair(socket_.get(),
@@ skipping 17 matching lines @@
     base::ProcessHandle process_handle,
     base::FileDescriptor* foreign_handle) {
   foreign_handle->fd = foreign_socket_->handle();
   foreign_handle->auto_close = false;
   return (foreign_handle->fd != -1);
 }
 
 #endif
 
 }  // namespace content