Let default device in PulseAudio be the system default device

media/audio/pulse/pulse_output.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/pulse/pulse_output.h"
 
 #include <pulse/pulseaudio.h>
 #include <stdint.h>
 
 #include "base/single_thread_task_runner.h"
 #include "media/audio/audio_manager_base.h"
 #include "media/audio/pulse/pulse_util.h"
 
 namespace media {
 
 using pulse::AutoPulseLock;
 using pulse::WaitForOperationCompletion;
 
+// Helper function to avoid code spam and string bloat.
+// Return true if |expression| is true, otherwise return false and print
+// |message|.
+inline bool LogOnFailure(bool expression, const char* message) {
+  do {

[tommi (sloooow) - chröme, 2016/03/19 13:44:17]

Since this is now a function and not a macro, the do/while trick isn't needed.
The variable name 'expression' doesn't represent an expression anymore.
The function basically always returns the value of |expression|, so technically
the caller is providing the return value that it then checks.
What remains is basically the same thing that can be accomplished by calling
DLOG_IF().

[rchtara, 2016/03/22 16:45:49]

Done.

+    if (!(expression)) {
+      DLOG(ERROR) << message;
+      return false;
+    }
+  } while (0);
+  return true;
+}
+
 // static, pa_stream_notify_cb
 void PulseAudioOutputStream::StreamNotifyCallback(pa_stream* s, void* p_this) {
   PulseAudioOutputStream* stream = static_cast<PulseAudioOutputStream*>(p_this);
 
   // Forward unexpected failures to the AudioSourceCallback if available.  All
   // these variables are only modified under pa_threaded_mainloop_lock() so this
   // should be thread safe.
   if (s && stream->source_callback_ &&
       pa_stream_get_state(s) == PA_STREAM_FAILED) {
     stream->source_callback_->OnError(stream);
@@ skipping 25 matching lines @@
 }
 
 PulseAudioOutputStream::~PulseAudioOutputStream() {
   // All internal structures should already have been freed in Close(), which
   // calls AudioManagerBase::ReleaseOutputStream() which deletes this object.
   DCHECK(!pa_stream_);
   DCHECK(!pa_context_);
   DCHECK(!pa_mainloop_);
 }
 
+bool PulseAudioOutputStream::InitializeMainloopAndContext() {
+  DCHECK(!pa_mainloop_);
+  DCHECK(!pa_context_);
+  DCHECK(thread_checker_.CalledOnValidThread());
+  pa_mainloop_ = pa_threaded_mainloop_new();
+  if (!LogOnFailure(pa_mainloop_, "Failed to create PulseAudio main loop.")) {

[tommi (sloooow) - chröme, 2016/03/19 13:44:17]

It's a little misleading to check the return value of LogOnFailure.  It reads as
LogOnFailure having failed, but kind of the opposite just happened.  Instead of
having LogOnFailure at all, I would just write this out as:

if (!pa_mainloop_) {
  DLOG(ERROR) << "Failed to create PulseAudio main loop.";
  return false;
}

Same below.  As is, the error string is present in official shipping builds,
that don't include DLOG code, so it's just bloat.

[rchtara, 2016/03/22 16:45:49]

Done.

+    return false;
+  }
+
+  pa_mainloop_api* pa_mainloop_api = pa_threaded_mainloop_get_api(pa_mainloop_);
+  std::string app_name = AudioManager::GetGlobalAppName();
+  pa_context_ = pa_context_new(
+      pa_mainloop_api, app_name.empty() ? "Chromium" : app_name.c_str());
+  if (!LogOnFailure(pa_context_, "Failed to create PulseAudio context.")) {
+    return false;
+  }
+
+  // A state callback must be set before calling pa_threaded_mainloop_lock() or
+  // pa_threaded_mainloop_wait() calls may lead to dead lock.
+  pa_context_set_state_callback(pa_context_, &pulse::ContextStateCallback,
+                                pa_mainloop_);
+  {
+    // Lock the main loop while setting up the context.  Failure to do so may
+    // lead to crashes as the PulseAudio thread tries to run before things are
+    // ready.
+    AutoPulseLock auto_lock(pa_mainloop_);
+
+    if (!LogOnFailure(pa_threaded_mainloop_start(pa_mainloop_) == 0,
+                      "Failed to start PulseAudio main loop.")) {
+      return false;
+    }
+
+    if (!LogOnFailure(pa_context_connect(pa_context_, NULL,
+                                         PA_CONTEXT_NOAUTOSPAWN, NULL) == 0,
+                      "Failed to connect PulseAudio context.")) {
+      return false;
+    }
+
+    // Wait until |pa_context_| is ready.  pa_threaded_mainloop_wait() must be
+    // called after pa_context_get_state() in case the context is already ready,
+    // otherwise pa_threaded_mainloop_wait() will hang indefinitely.
+    while (true) {
+      pa_context_state_t context_state = pa_context_get_state(pa_context_);
+      if (!LogOnFailure(PA_CONTEXT_IS_GOOD(context_state),
+                        "Invalid PulseAudio context state.")) {
+        return false;
+      }
+
+      if (context_state == PA_CONTEXT_READY)
+        break;
+      pa_threaded_mainloop_wait(pa_mainloop_);
+    }
+  }
+
+  return true;
+}
+
+// static, used by pa_context_get_server_info.
+void PulseAudioOutputStream::GetSystemDefaultOutputDeviceCallback(
+    pa_context* context,
+    const pa_server_info* info,
+    void* user_data) {
+  media::PulseAudioOutputStream* stream =
+      static_cast<media::PulseAudioOutputStream*>(user_data);
+  stream->default_system_device_name_ = info->default_sink_name;
+  pa_threaded_mainloop_signal(stream->pa_mainloop_, 0);
+}
+
+void PulseAudioOutputStream::GetSystemDefaultOutputDevice() {
+  DCHECK(pa_mainloop_);
+  DCHECK(pa_context_);
+  pa_operation* operation = pa_context_get_server_info(
+      pa_context_, PulseAudioOutputStream::GetSystemDefaultOutputDeviceCallback,
+      this);
+  WaitForOperationCompletion(pa_mainloop_, operation);
+}
+
 bool PulseAudioOutputStream::Open() {
-  DCHECK(thread_checker_.CalledOnValidThread());
+  if (!InitializeMainloopAndContext()) {
+    return false;
+  }
+
+  AutoPulseLock auto_lock(pa_mainloop_);
+
+  std::string device_name_to_use = device_id_;
+  if (device_id_ == AudioManagerBase::kDefaultDeviceId) {
+    GetSystemDefaultOutputDevice();
+    device_name_to_use = default_system_device_name_;
+  }
+
   return pulse::CreateOutputStream(
-      &pa_mainloop_, &pa_context_, &pa_stream_, params_, device_id_,
+      pa_mainloop_, pa_context_, &pa_stream_, params_, device_name_to_use,
       AudioManager::GetGlobalAppName(), &StreamNotifyCallback,
       &StreamRequestCallback, this);
 }
 
 void PulseAudioOutputStream::Reset() {
   if (!pa_mainloop_) {
     DCHECK(!pa_stream_);
     DCHECK(!pa_context_);
     return;
   }
@@ skipping 151 matching lines @@
   volume_ = static_cast<float>(volume);
 }
 
 void PulseAudioOutputStream::GetVolume(double* volume) {
   DCHECK(thread_checker_.CalledOnValidThread());
 
   *volume = volume_;
 }
 
 }  // namespace media