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

trunk/src/media/audio/alsa/alsa_input.cc

 // Copyright 2013 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/alsa/alsa_input.h"
 
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 25 matching lines @@
                         8),
       wrapper_(wrapper),
       buffer_duration_(base::TimeDelta::FromMicroseconds(
           params.frames_per_buffer() * base::Time::kMicrosecondsPerSecond /
           static_cast<float>(params.sample_rate()))),
       callback_(NULL),
       device_handle_(NULL),
       mixer_handle_(NULL),
       mixer_element_handle_(NULL),
       read_callback_behind_schedule_(false),
-      audio_bus_(AudioBus::Create(params)),
-      weak_factory_(this) {
-}
+      weak_factory_(this) {}
 
 AlsaPcmInputStream::~AlsaPcmInputStream() {}
 
 bool AlsaPcmInputStream::Open() {
   if (device_handle_)
     return false;  // Already open.
 
   snd_pcm_format_t pcm_format = alsa_util::BitsToFormat(
       params_.bits_per_sample());
   if (pcm_format == SND_PCM_FORMAT_UNKNOWN) {
@@ skipping 144 matching lines @@
 
   // 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.
   GetAgcVolume(&normalized_volume);
 
   while (num_buffers--) {
     int frames_read = wrapper_->PcmReadi(device_handle_, audio_buffer_.get(),
                                          params_.frames_per_buffer());
     if (frames_read == params_.frames_per_buffer()) {
-      audio_bus_->FromInterleaved(audio_buffer_.get(),
-                                  audio_bus_->frames(),
-                                  params_.bits_per_sample() / 8);
-      callback_->OnData(
-          this, audio_bus_.get(), hardware_delay_bytes, normalized_volume);
+      callback_->OnData(this, audio_buffer_.get(), bytes_per_buffer_,
+                        hardware_delay_bytes, normalized_volume);
     } else {
       LOG(WARNING) << "PcmReadi returning less than expected frames: "
                    << frames_read << " vs. " << params_.frames_per_buffer()
                    << ". Dropping this buffer.";
     }
   }
 
   next_read_time_ += buffer_duration_;
   base::TimeDelta delay = next_read_time_ - base::TimeTicks::Now();
   if (delay < base::TimeDelta()) {
@@ skipping 107 matching lines @@
 
   return static_cast<double>(current_volume);
 }
 
 void AlsaPcmInputStream::HandleError(const char* method, int error) {
   LOG(WARNING) << method << ": " << wrapper_->StrError(error);
   callback_->OnError(this);
 }
 
 }  // namespace media