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

media/audio/pulse/audio_manager_pulse.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/pulse/audio_manager_pulse.h"
 
 #include "base/command_line.h"
 #include "base/environment.h"
 #include "base/files/file_path.h"
 #include "base/logging.h"
@@ skipping 22 matching lines @@
 using pulse::WaitForOperationCompletion;
 
 // Maximum number of output streams that can be open simultaneously.
 static const int kMaxOutputStreams = 50;
 
 // Define bounds for the output buffer size.
 static const int kMinimumOutputBufferSize = 512;
 static const int kMaximumOutputBufferSize = 8192;
 
 // Default input buffer size.
-static const int kDefaultInputBufferSize = 1024;
+static const int kDefaultInputBufferSize = 512;
 
 static const base::FilePath::CharType kPulseLib[] =
     FILE_PATH_LITERAL("libpulse.so.0");
 
 // static
 AudioManager* AudioManagerPulse::Create(AudioLogFactory* audio_log_factory) {
   scoped_ptr<AudioManagerPulse> ret(new AudioManagerPulse(audio_log_factory));
   if (ret->Init())
     return ret.release();
 
   DVLOG(1) << "PulseAudio is not available on the OS";
   return NULL;
 }
 
 AudioManagerPulse::AudioManagerPulse(AudioLogFactory* audio_log_factory)
     : AudioManagerBase(audio_log_factory),
       input_mainloop_(NULL),
       input_context_(NULL),
       devices_(NULL),
       native_input_sample_rate_(0) {
+  DVLOG(1) << __FUNCTION__;
   SetMaxOutputStreamsAllowed(kMaxOutputStreams);
 }
 
 AudioManagerPulse::~AudioManagerPulse() {
+  DVLOG(1) << __FUNCTION__;
   Shutdown();
 
   // The Pulse objects are the last things to be destroyed since Shutdown()
   // needs them.
   DestroyPulse();
 }
 
 // Implementation of AudioManager.
 bool AudioManagerPulse::HasAudioOutputDevices() {
   AudioDeviceNames devices;
@@ skipping 43 matching lines @@
   GetAudioDeviceNames(true, device_names);
 }
 
 void AudioManagerPulse::GetAudioOutputDeviceNames(
     AudioDeviceNames* device_names) {
   GetAudioDeviceNames(false, device_names);
 }
 
 AudioParameters AudioManagerPulse::GetInputStreamParameters(
     const std::string& device_id) {
+  DVLOG(1) << "AudioManagerPulse::GetInputStreamParameters";
   int user_buffer_size = GetUserBufferSize();
   int buffer_size = user_buffer_size ?
       user_buffer_size : kDefaultInputBufferSize;
 
   // TODO(xians): add support for querying native channel layout for pulse.
   return AudioParameters(
       AudioParameters::AUDIO_PCM_LOW_LATENCY, CHANNEL_LAYOUT_STEREO,
       GetNativeSampleRate(), 16, buffer_size);
 }
 
@@ skipping 20 matching lines @@
 
 AudioInputStream* AudioManagerPulse::MakeLowLatencyInputStream(
     const AudioParameters& params, const std::string& device_id) {
   DCHECK_EQ(AudioParameters::AUDIO_PCM_LOW_LATENCY, params.format());
   return MakeInputStream(params, device_id);
 }
 
 AudioParameters AudioManagerPulse::GetPreferredOutputStreamParameters(
     const std::string& output_device_id,
     const AudioParameters& input_params) {
+  DVLOG(1) << "AudioManagerPulse::GetPreferredOutputStreamParameters";
   // TODO(tommi): Support |output_device_id|.
   VLOG_IF(0, !output_device_id.empty()) << "Not implemented!";
 
   ChannelLayout channel_layout = CHANNEL_LAYOUT_STEREO;
   int buffer_size = kMinimumOutputBufferSize;
   int bits_per_sample = 16;
   int input_channels = 0;
   int sample_rate;
   if (input_params.IsValid()) {
     bits_per_sample = input_params.bits_per_sample();
@@ skipping 155 matching lines @@
 void AudioManagerPulse::SampleRateInfoCallback(pa_context* context,
                                                const pa_server_info* info,
                                                void* user_data) {
   AudioManagerPulse* manager = reinterpret_cast<AudioManagerPulse*>(user_data);
 
   manager->native_input_sample_rate_ = info->sample_spec.rate;
   pa_threaded_mainloop_signal(manager->input_mainloop_, 0);
 }
 
 }  // namespace media