Include default communication devices in audio device enumerations. This removes heuristic that pic…

media/audio/win/audio_low_latency_output_win.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/win/audio_low_latency_output_win.h"
 
 #include <Functiondiscoverykeys_devpkey.h>
 
 #include "base/command_line.h"
 #include "base/logging.h"
@@ skipping 54 matching lines @@
       packet_size_bytes_(0),
       endpoint_buffer_size_frames_(0),
       device_id_(device_id),
       device_role_(device_role),
       share_mode_(GetShareMode()),
       num_written_frames_(0),
       source_(NULL),
       audio_bus_(AudioBus::Create(params)) {
   DCHECK(manager_);
 
+  // The empty string is used to indicate a default device and the
+  // |device_role_| member controls whether that's the default or default
+  // communications device.
+  DCHECK_NE(device_id_, AudioManagerBase::kDefaultDeviceId);
+  DCHECK_NE(device_id_, AudioManagerBase::kCommunicationsDeviceId);
+
   DVLOG(1) << "WASAPIAudioOutputStream::WASAPIAudioOutputStream()";
   DVLOG_IF(1, share_mode_ == AUDCLNT_SHAREMODE_EXCLUSIVE)
        << "Core Audio (WASAPI) EXCLUSIVE MODE is enabled.";
 
   // Load the Avrt DLL if not already loaded. Required to support MMCSS.
   bool avrt_init = avrt::Initialize();
   DCHECK(avrt_init) << "Failed to load the avrt.dll";
 
   // Set up the desired render format specified by the client. We use the
   // WAVE_FORMAT_EXTENSIBLE structure to ensure that multiple channel ordering
@@ skipping 48 matching lines @@
 
   DCHECK(!audio_client_.get());
   DCHECK(!audio_render_client_.get());
 
   // Will be set to true if we ended up opening the default communications
   // device.
   bool communications_device = false;
 
   // Create an IAudioClient interface for the default rendering IMMDevice.
   ScopedComPtr<IAudioClient> audio_client;
-  if (device_id_.empty() ||
-      CoreAudioUtil::DeviceIsDefault(eRender, device_role_, device_id_)) {
+  if (device_id_.empty()) {
     audio_client = CoreAudioUtil::CreateDefaultClient(eRender, device_role_);
     communications_device = (device_role_ == eCommunications);
   } else {
     ScopedComPtr<IMMDevice> device(CoreAudioUtil::CreateDevice(device_id_));
     DLOG_IF(ERROR, !device.get()) << "Failed to open device: " << device_id_;
     if (device.get())
       audio_client = CoreAudioUtil::CreateClient(device.get());
   }
 
   if (!audio_client.get())
@@ skipping 469 matching lines @@
 
     // Ensure that we don't quit the main thread loop immediately next
     // time Start() is called.
     ResetEvent(stop_render_event_.Get());
   }
 
   source_ = NULL;
 }
 
 }  // namespace media