Reland 15721002: Hook up the device selection to the WebAudio live audio

media/audio/pulse/pulse_unified.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/pulse_unified.h"
 
 #include "base/message_loop.h"
 #include "base/time.h"
 #include "media/audio/audio_manager_base.h"
 #include "media/audio/audio_parameters.h"
@@ skipping 23 matching lines @@
 
   pa_threaded_mainloop_signal(stream->pa_mainloop_, 0);
 }
 
 // static, used by pa_stream_set_read_callback.
 void PulseAudioUnifiedStream::ReadCallback(pa_stream* handle, size_t length,
                                            void* user_data) {
   static_cast<PulseAudioUnifiedStream*>(user_data)->ReadData();
 }
 
-PulseAudioUnifiedStream::PulseAudioUnifiedStream(const AudioParameters& params,
-                                                 AudioManagerBase* manager)
+PulseAudioUnifiedStream::PulseAudioUnifiedStream(
+    const AudioParameters& params,
+    const std::string& input_device_id,
+    AudioManagerBase* manager)
     : params_(params),
+      input_device_id_(input_device_id),
       manager_(manager),
       pa_context_(NULL),
       pa_mainloop_(NULL),
       input_stream_(NULL),
       output_stream_(NULL),
       volume_(1.0f),
       source_callback_(NULL) {
   DCHECK(manager_->GetMessageLoop()->BelongsToCurrentThread());
   CHECK(params_.IsValid());
   input_bus_ = AudioBus::Create(params_);
@@ skipping 13 matching lines @@
   DCHECK(manager_->GetMessageLoop()->BelongsToCurrentThread());
   // Prepare the recording buffers for the callbacks.
   fifo_.reset(new media::SeekableBuffer(
       0, kFifoSizeInPackets * params_.GetBytesPerBuffer()));
   input_data_buffer_.reset(new uint8[params_.GetBytesPerBuffer()]);
 
   if (!pulse::CreateOutputStream(&pa_mainloop_, &pa_context_, &output_stream_,
                                  params_, &StreamNotifyCallback, NULL, this))
     return false;
 
-  // TODO(xians): Add support for non-default device.
   if (!pulse::CreateInputStream(pa_mainloop_, pa_context_, &input_stream_,
-                                params_, AudioManagerBase::kDefaultDeviceId,
+                                params_, input_device_id_,
                                 &StreamNotifyCallback, this))
     return false;
 
   DCHECK(pa_mainloop_);
   DCHECK(pa_context_);
   DCHECK(input_stream_);
   DCHECK(output_stream_);
   return true;
 }
 
@@ skipping 189 matching lines @@
   volume_ = static_cast<float>(volume);
 }
 
 void PulseAudioUnifiedStream::GetVolume(double* volume) {
   DCHECK(manager_->GetMessageLoop()->BelongsToCurrentThread());
 
   *volume = volume_;
 }
 
 }  // namespace media