Reland: Pass task runners to AudioManager constructor.

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 29 matching lines @@
 static const int kMaximumOutputBufferSize = 8192;
 
 // Default input buffer size.
 static const int kDefaultInputBufferSize = 1024;
 
 #if defined(DLOPEN_PULSEAUDIO)
 static const base::FilePath::CharType kPulseLib[] =
     FILE_PATH_LITERAL("libpulse.so.0");
 #endif
 
-// 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),
+AudioManagerPulse::AudioManagerPulse(
+    scoped_refptr<base::SingleThreadTaskRunner> task_runner,
+    scoped_refptr<base::SingleThreadTaskRunner> worker_task_runner,
+    AudioLogFactory* audio_log_factory)
+    : AudioManagerBase(std::move(task_runner),
+                       std::move(worker_task_runner),
+                       audio_log_factory),
       input_mainloop_(NULL),
       input_context_(NULL),
       devices_(NULL),
       native_input_sample_rate_(0) {
   SetMaxOutputStreamsAllowed(kMaxOutputStreams);
 }
 
 AudioManagerPulse::~AudioManagerPulse() {
   Shutdown();
-
   // The Pulse objects are the last things to be destroyed since Shutdown()
   // needs them.
   DestroyPulse();
 }
 
+bool AudioManagerPulse::Init() {
+  // TODO(alokp): Investigate if InitPulse can happen on the audio thread.
+  // It currently needs to happen on the main thread so that is InitPulse fails,
+  // we can fallback to ALSA implementation. Initializing it on audio thread
+  // would unblock the main thread and make InitPulse consistent with
+  // DestroyPulse which happens on the audio thread.
+  return InitPulse();
+}
+
 // Implementation of AudioManager.
 bool AudioManagerPulse::HasAudioOutputDevices() {
   AudioDeviceNames devices;
   GetAudioOutputDeviceNames(&devices);
   return !devices.empty();
 }
 
 bool AudioManagerPulse::HasAudioInputDevices() {
   AudioDeviceNames devices;
   GetAudioInputDeviceNames(&devices);
@@ skipping 123 matching lines @@
   DCHECK(input_mainloop_);
   DCHECK(input_context_);
   AutoPulseLock auto_lock(input_mainloop_);
   pa_operation* operation = pa_context_get_server_info(
       input_context_, SampleRateInfoCallback, this);
   WaitForOperationCompletion(input_mainloop_, operation);
 
   return native_input_sample_rate_;
 }
 
-bool AudioManagerPulse::Init() {
+bool AudioManagerPulse::InitPulse() {
   DCHECK(!input_mainloop_);
 
 #if defined(DLOPEN_PULSEAUDIO)
   StubPathMap paths;
 
   // Check if the pulse library is avialbale.
   paths[kModulePulse].push_back(kPulseLib);
   if (!InitializeStubs(paths)) {
     VLOG(1) << "Failed on loading the Pulse library and symbols";
     return false;
@@ skipping 101 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