Revert 277794 "Modifies AudioInputCallback::OnData and use media..."

trunk/src/media/audio/virtual_audio_input_stream.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/virtual_audio_input_stream.h"
 
 #include <algorithm>
 #include <utility>
 
 #include "base/bind.h"
@@ skipping 121 matching lines @@
   DCHECK_LE(0, num_attached_output_streams_);
 }
 
 void VirtualAudioInputStream::PumpAudio(AudioBus* audio_bus) {
   DCHECK(worker_task_runner_->BelongsToCurrentThread());
 
   {
     base::AutoLock scoped_lock(converter_network_lock_);
     mixer_.Convert(audio_bus);
   }
-  callback_->OnData(this, audio_bus, params_.GetBytesPerBuffer(), 1.0);
+  audio_bus->ToInterleaved(params_.frames_per_buffer(),
+                           params_.bits_per_sample() / 8,
+                           buffer_.get());
+  callback_->OnData(this,
+                    buffer_.get(),
+                    params_.GetBytesPerBuffer(),
+                    params_.GetBytesPerBuffer(),
+                    1.0);
 }
 
 void VirtualAudioInputStream::Close() {
   DCHECK(thread_checker_.CalledOnValidThread());
 
   Stop();  // Make sure callback_ is no longer being used.
 
   // If a non-null AfterCloseCallback was provided to the constructor, invoke it
   // here.  The callback is moved to a stack-local first since |this| could be
   // destroyed during Run().
@@ skipping 14 matching lines @@
   return 1.0;
 }
 
 void VirtualAudioInputStream::SetAutomaticGainControl(bool enabled) {}
 
 bool VirtualAudioInputStream::GetAutomaticGainControl() {
   return false;
 }
 
 }  // namespace media