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

trunk/src/media/audio/cras/cras_input.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/cras/cras_input.h"
 
 #include <math.h>
 
 #include "base/basictypes.h"
 #include "base/logging.h"
 #include "base/time/time.h"
 #include "media/audio/audio_manager.h"
 #include "media/audio/cras/audio_manager_cras.h"
 
 namespace media {
 
 CrasInputStream::CrasInputStream(const AudioParameters& params,
                                  AudioManagerCras* manager,
                                  const std::string& device_id)
     : audio_manager_(manager),
       bytes_per_frame_(0),
       callback_(NULL),
       client_(NULL),
       params_(params),
       started_(false),
       stream_id_(0),
       stream_direction_(device_id == AudioManagerBase::kLoopbackInputDeviceId ?
                             CRAS_STREAM_POST_MIX_PRE_DSP : CRAS_STREAM_INPUT) {
   DCHECK(audio_manager_);
-  audio_bus_ = AudioBus::Create(params_);
 }
 
 CrasInputStream::~CrasInputStream() {
   DCHECK(!client_);
 }
 
 bool CrasInputStream::Open() {
   if (client_) {
     NOTREACHED() << "CrasInputStream already open";
     return false;  // Already open.
@@ skipping 175 matching lines @@
       latency_usec * params_.sample_rate() / base::Time::kMicrosecondsPerSecond;
   unsigned int bytes_latency =
       static_cast<unsigned int>(frames_latency * bytes_per_frame_);
 
   // Update the AGC volume level once every second. Note that, |volume| is
   // also updated each time SetVolume() is called through IPC by the
   // render-side AGC.
   double normalized_volume = 0.0;
   GetAgcVolume(&normalized_volume);
 
-  audio_bus_->FromInterleaved(buffer,
-                              audio_bus_->frames(),
-                              params_.bits_per_sample() / 8);
   callback_->OnData(this,
-                    audio_bus_.get(),
+                    buffer,
                     frames * bytes_per_frame_,
                     bytes_latency,
                     normalized_volume);
 }
 
 void CrasInputStream::NotifyStreamError(int err) {
   if (callback_)
     callback_->OnError(this);
 }
 
@@ skipping 31 matching lines @@
 
 double CrasInputStream::GetVolumeRatioFromDecibels(double dB) const {
   return pow(10, dB / 20.0);
 }
 
 double CrasInputStream::GetDecibelsFromVolumeRatio(double volume_ratio) const {
   return 20 * log10(volume_ratio);
 }
 
 }  // namespace media