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

trunk/src/media/audio/mac/audio_input_mac.cc

Index: trunk/src/media/audio/mac/audio_input_mac.cc
===================================================================
--- trunk/src/media/audio/mac/audio_input_mac.cc	(revision 277811)
+++ trunk/src/media/audio/mac/audio_input_mac.cc	(working copy)
@@ -10,19 +10,16 @@
 #include "base/logging.h"
 #include "base/mac/mac_logging.h"
 #include "media/audio/mac/audio_manager_mac.h"
-#include "media/base/audio_bus.h"
 
 namespace media {
 
 PCMQueueInAudioInputStream::PCMQueueInAudioInputStream(
-    AudioManagerMac* manager,
-    const AudioParameters& params)
+    AudioManagerMac* manager, const AudioParameters& params)
     : manager_(manager),
       callback_(NULL),
       audio_queue_(NULL),
       buffer_size_bytes_(0),
-      started_(false),
-      audio_bus_(media::AudioBus::Create(params)) {
+      started_(false) {
   // We must have a manager.
   DCHECK(manager_);
   // A frame is one sample across all channels. In interleaved audio the per
@@ -218,11 +215,11 @@
     if (elapsed < kMinDelay)
       base::PlatformThread::Sleep(kMinDelay - elapsed);
 
-    uint8* audio_data = reinterpret_cast<uint8*>(audio_buffer->mAudioData);
-    audio_bus_->FromInterleaved(
-        audio_data, audio_bus_->frames(), format_.mBitsPerChannel / 8);
-    callback_->OnData(
-        this, audio_bus_.get(), audio_buffer->mAudioDataByteSize, 0.0);
+    callback_->OnData(this,
+                      reinterpret_cast<const uint8*>(audio_buffer->mAudioData),
+                      audio_buffer->mAudioDataByteSize,
+                      audio_buffer->mAudioDataByteSize,
+                      0.0);
 
     last_fill_ = base::TimeTicks::Now();
   }