commit 68435f558bce015e90a4c3ed16fce6807c6bdf16
author henrika <henrika@webrtc.org> Mon Apr 09 11:31:45 2018
committer Commit Bot <commit-bot@chromium.org> Mon Apr 09 12:09:29 2018
tree bda083d6c04369d24e1fc83dc195b389ebf619be
parent ae9057831f8487fb4d798fdf34233e1c49cdc306

Ensures that an ADM can be created when rtc_include_pulse_audio is set to false

Bug: webrtc:9127
Change-Id: Ie8f6bb72c1eb4c919671873b15200cdf74bd509e
Reviewed-on: https://webrtc-review.googlesource.com/68600
Commit-Queue: Henrik Andreassson <henrika@webrtc.org>
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#22794}

modules/audio_device/audio_device_impl.cc

diff --git a/modules/audio_device/audio_device_impl.cc b/modules/audio_device/audio_device_impl.cc
index af3724d..521f766 100644
--- a/modules/audio_device/audio_device_impl.cc
+++ b/modules/audio_device/audio_device_impl.cc
@@ -227,24 +227,39 @@
 // END #if defined(WEBRTC_ANDROID)
 
 // Linux ADM implementation.
+// Note that, LINUX_ALSA is always defined by default when WEBRTC_LINUX is
+// defined. LINUX_PULSE depends on the 'rtc_include_pulse_audio' build flag.
+// TODO(bugs.webrtc.org/9127): improve support and make it more clear that
+// PulseAudio is the default selection.
 #elif defined(WEBRTC_LINUX)
-  if ((audio_layer == kLinuxPulseAudio) ||
+#if !defined(LINUX_PULSE)
+  // Build flag 'rtc_include_pulse_audio' is set to false. In this mode:
+  // - kPlatformDefaultAudio => ALSA, and
+  // - kLinuxAlsaAudio => ALSA, and
+  // - kLinuxPulseAudio => Invalid selection.
+  RTC_LOG(WARNING) << "PulseAudio is disabled using build flag.";
+  if ((audio_layer == kLinuxAlsaAudio) ||
       (audio_layer == kPlatformDefaultAudio)) {
-#if defined(LINUX_PULSE)
-    RTC_LOG(INFO) << "Attempting to use Linux PulseAudio APIs...";
-    // Linux PulseAudio implementation.
-    audio_device_.reset(new AudioDeviceLinuxPulse());
-    RTC_LOG(INFO) << "Linux PulseAudio APIs will be utilized";
-#endif
-#if defined(LINUX_PULSE)
-#endif
-  } else if (audio_layer == kLinuxAlsaAudio) {
-#if defined(LINUX_ALSA)
-    // Linux ALSA implementation.
     audio_device_.reset(new AudioDeviceLinuxALSA());
     RTC_LOG(INFO) << "Linux ALSA APIs will be utilized.";
-#endif
   }
+#else
+  // Build flag 'rtc_include_pulse_audio' is set to true (default). In this
+  // mode:
+  // - kPlatformDefaultAudio => PulseAudio, and
+  // - kLinuxPulseAudio => PulseAudio, and
+  // - kLinuxAlsaAudio => ALSA (supported but not default).
+  RTC_LOG(INFO) << "PulseAudio support is enabled.";
+  if ((audio_layer == kLinuxPulseAudio) ||
+      (audio_layer == kPlatformDefaultAudio)) {
+    // Linux PulseAudio implementation is default.
+    audio_device_.reset(new AudioDeviceLinuxPulse());
+    RTC_LOG(INFO) << "Linux PulseAudio APIs will be utilized";
+  } else if (audio_layer == kLinuxAlsaAudio) {
+    audio_device_.reset(new AudioDeviceLinuxALSA());
+    RTC_LOG(WARNING) << "Linux ALSA APIs will be utilized.";
+  }
+#endif  // #if !defined(LINUX_PULSE)
 #endif  // #if defined(WEBRTC_LINUX)
 
 // iOS ADM implementation.