Adding pulseaudio input support to chrome

media/audio/linux/audio_manager_linux.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/linux/audio_manager_linux.h"
 
 #include "base/command_line.h"
 #include "base/environment.h"
 #include "base/logging.h"
 #include "base/nix/xdg_util.h"
 #include "base/process_util.h"
 #include "base/stl_util.h"
 #include "media/audio/audio_output_dispatcher.h"
 #include "media/audio/audio_util.h"
 #include "media/audio/linux/alsa_input.h"
 #include "media/audio/linux/alsa_output.h"
 #include "media/audio/linux/alsa_wrapper.h"
 #if defined(USE_PULSEAUDIO)
+#include "media/audio/pulse/pulse_input.h"
 #include "media/audio/pulse/pulse_output.h"
 #endif
 #if defined(USE_CRAS)
 #include "media/audio/linux/cras_input.h"
 #include "media/audio/linux/cras_output.h"
 #endif
 #include "media/base/limits.h"
 #include "media/base/media_switches.h"
 
 namespace media {
@@ skipping 25 matching lines @@
 }
 
 bool AudioManagerLinux::HasAudioInputDevices() {
   if (UseCras())
     return true;
 
   return HasAnyAlsaAudioDevice(kStreamCapture);
 }
 
 AudioManagerLinux::AudioManagerLinux()
-    : wrapper_(new AlsaWrapper()) {
+    : wrapper_(new AlsaWrapper())
+#if defined(USE_PULSEAUDIO)

[DaleCurtis, 2013/01/30 02:54:30]

Construct in #if block inside constructor?

[no longer working on chromium, 2013/02/12 17:35:59]

This code is removed.

+      ,pulse_(new PulseInputObject())
+#endif
+      {
   SetMaxOutputStreamsAllowed(kMaxOutputStreams);
+#if defined(USE_PULSEAUDIO)
+  DVLOG(1) << "The availability of PulseAudio is " << pulse_->has_pulse();
+#endif
 }
 
 AudioManagerLinux::~AudioManagerLinux() {
   Shutdown();
 }
 
 bool AudioManagerLinux::CanShowAudioInputSettings() {
   scoped_ptr<base::Environment> env(base::Environment::Create());
 
   switch (base::nix::GetDesktopEnvironment(env.get())) {
@@ skipping 36 matching lines @@
 }
 
 void AudioManagerLinux::GetAudioInputDeviceNames(
     media::AudioDeviceNames* device_names) {
   DCHECK(device_names->empty());
   if (UseCras()) {
     GetCrasAudioInputDevices(device_names);
     return;
   }
 
+#if defined(USE_PULSEAUDIO)
+  if (pulse_->has_pulse()) {

[DaleCurtis, 2013/01/30 02:54:30]

Can this be done a la UseCras; i.e. no need for #ifs?

[no longer working on chromium, 2013/02/12 17:35:59]

Removed.

+    pulse_->GetInputDevices(device_names);
+    return;
+  }
+#endif
+
   GetAlsaAudioInputDevices(device_names);
 }
 
 bool AudioManagerLinux::UseCras() {
 #if defined(USE_CRAS)
   if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kUseCras)) {
     return true;
   }
 #endif
   return false;
@@ skipping 166 matching lines @@
 AudioOutputStream* AudioManagerLinux::MakeOutputStream(
     const AudioParameters& params) {
 #if defined(USE_CRAS)
   if (UseCras()) {
     return new CrasOutputStream(params, this);
   }
 #endif
 
 #if defined(USE_PULSEAUDIO)
   if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kUsePulseAudio)) {
-    return new PulseAudioOutputStream(params, this);
+     return new PulseAudioOutputStream(params, this);

[DaleCurtis, 2013/01/30 02:54:30]

Indent is wrong.

[no longer working on chromium, 2013/02/12 17:35:59]

Removed.

   }
 #endif
 
   std::string device_name = AlsaPcmOutputStream::kAutoSelectDevice;
   if (CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kAlsaOutputDevice)) {
     device_name = CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
         switches::kAlsaOutputDevice);
   }
   return new AlsaPcmOutputStream(device_name, params, wrapper_.get(), this);
 }
 
 AudioInputStream* AudioManagerLinux::MakeInputStream(
     const AudioParameters& params, const std::string& device_id) {
 #if defined(USE_CRAS)
   if (UseCras()) {
     return new CrasInputStream(params, this);
   }
 #endif
 
+#if defined(USE_PULSEAUDIO)
+  if (pulse_->has_pulse()) {
+    return new PulseAudioInputStream(this, device_id, params,
+                                     pulse_->mainloop(), pulse_->context());
+  }
+#endif
+
   std::string device_name = (device_id == AudioManagerBase::kDefaultDeviceId) ?
       AlsaPcmInputStream::kAutoSelectDevice : device_id;
   if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kAlsaInputDevice)) {
     device_name = CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
         switches::kAlsaInputDevice);
   }
 
   return new AlsaPcmInputStream(this, device_name, params, wrapper_.get());
 }
 
@@ skipping 13 matching lines @@
     buffer_size = input_params.frames_per_buffer();
 
   // TODO(dalecurtis): This should include bits per channel and channel layout
   // eventually.
   return AudioParameters(
       AudioParameters::AUDIO_PCM_LOW_LATENCY, input_params.channel_layout(),
       input_params.sample_rate(), 16, buffer_size);
 }
 
 }  // namespace media