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

media/audio/win/wavein_input_win.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 "media/audio/win/wavein_input_win.h"
 
 #pragma comment(lib, "winmm.lib")
 
 #include "base/logging.h"
 #include "media/audio/audio_io.h"
 #include "media/audio/win/audio_manager_win.h"
 #include "media/audio/win/device_enumeration_win.h"
+#include "media/base/audio_bus.h"
 
 namespace media {
 
 // Our sound buffers are allocated once and kept in a linked list using the
 // the WAVEHDR::dwUser variable. The last buffer points to the first buffer.
 static WAVEHDR* GetNextBuffer(WAVEHDR* current) {
   return reinterpret_cast<WAVEHDR*>(current->dwUser);
 }
 
 PCMWaveInAudioInputStream::PCMWaveInAudioInputStream(
-    AudioManagerWin* manager, const AudioParameters& params, int num_buffers,
+    AudioManagerWin* manager,
+    const AudioParameters& params,
+    int num_buffers,
     const std::string& device_id)
     : state_(kStateEmpty),
       manager_(manager),
       device_id_(device_id),
       wavein_(NULL),
       callback_(NULL),
       num_buffers_(num_buffers),
       buffer_(NULL),
-      channels_(params.channels()) {
+      channels_(params.channels()),
+      audio_bus_(media::AudioBus::Create(params)) {
   DCHECK_GT(num_buffers_, 0);
   format_.wFormatTag = WAVE_FORMAT_PCM;
   format_.nChannels = params.channels() > 2 ? 2 : params.channels();
   format_.nSamplesPerSec = params.sample_rate();
   format_.wBitsPerSample = params.bits_per_sample();
   format_.cbSize = 0;
   format_.nBlockAlign = (format_.nChannels * format_.wBitsPerSample) / 8;
   format_.nAvgBytesPerSec = format_.nBlockAlign * format_.nSamplesPerSec;
   buffer_size_ = params.frames_per_buffer() * format_.nBlockAlign;
   // If we don't have a packet size we use 100ms.
@@ skipping 240 matching lines @@
   if (msg == WIM_DATA) {
     // The WIM_DATA message is sent when waveform-audio data is present in
     // the input buffer and the buffer is being returned to the application.
     // The message can be sent when the buffer is full or after the
     // waveInReset function is called.
     if (obj->callback_) {
       // TODO(henrika): the |volume| parameter is always set to zero since
       // there is currently no support for controlling the microphone volume
       // level.
       WAVEHDR* buffer = reinterpret_cast<WAVEHDR*>(param1);
-      obj->callback_->OnData(obj,
-                             reinterpret_cast<const uint8*>(buffer->lpData),
-                             buffer->dwBytesRecorded,
-                             buffer->dwBytesRecorded,
-                             0.0);
+      obj->audio_bus_->FromInterleaved(reinterpret_cast<uint8*>(buffer->lpData),
+                                       obj->audio_bus_->frames(),
+                                       obj->format_.wBitsPerSample / 8);
+      obj->callback_->OnData(
+          obj, obj->audio_bus_.get(), buffer->dwBytesRecorded, 0.0);
 
       // Queue the finished buffer back with the audio driver. Since we are
       // reusing the same buffers we can get away without calling
       // waveInPrepareHeader.
       obj->QueueNextPacket(buffer);
     } else {
       // Main thread has called Stop() and set |callback_| to NULL and is
       // now waiting to issue waveInReset which will kill this thread.
       // We should not call AudioSourceCallback code anymore.
       ::SetEvent(obj->stopped_event_);
     }
   } else if (msg == WIM_CLOSE) {
     // Intentionaly no-op for now.
   } else if (msg == WIM_OPEN) {
     // Intentionaly no-op for now.
   }
 }
 
 }  // namespace media