Partial revert of disabling low latency audio for remote desktop.

media/audio/win/core_audio_util_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/core_audio_util_win.h"
 
 #include <audioclient.h>
 #include <devicetopology.h>
 #include <functiondiscoverykeys_devpkey.h>
 
@@ skipping 169 matching lines @@
     // issues. See http://crbug.com/378465 for details.
     hr = CoInitializeEx(NULL, COINIT_MULTITHREADED);
     if (SUCCEEDED(hr)) {
       hr = device_enumerator.CreateInstance(__uuidof(MMDeviceEnumerator),
                                             NULL, CLSCTX_INPROC_SERVER);
     }
   }
   return device_enumerator;
 }
 
-static bool IsRemoteSession() {
-  return !!GetSystemMetrics(SM_REMOTESESSION);
-}
-
-static bool IsRemoteDeviceInternal(IMMDevice* device) {
-  DCHECK(IsRemoteSession());
-
-  std::string device_name;
-  HRESULT hr = GetDeviceFriendlyNameInternal(device, &device_name);
-
-  // This method should only be called if IsRemoteSession() is true, so assume
-  // we have a remote audio device if we can't tell.
-  if (FAILED(hr))
-    return true;
-
-  return device_name == "Remote Audio";
-}
-
 static bool IsSupportedInternal() {
   // It is possible to force usage of WaveXxx APIs by using a command line flag.
   const base::CommandLine* cmd_line = base::CommandLine::ForCurrentProcess();
   if (cmd_line->HasSwitch(switches::kForceWaveAudio)) {
     DVLOG(1) << "Forcing usage of Windows WaveXxx APIs";
     return false;
   }
 
   // Microsoft does not plan to make the Core Audio APIs available for use
   // with earlier versions of Windows, including Microsoft Windows Server 2003,
@@ skipping 16 matching lines @@
   // works as well we should be home free.
   ScopedComPtr<IMMDeviceEnumerator> device_enumerator =
       CreateDeviceEnumeratorInternal();
   if (!device_enumerator) {
     LOG(ERROR)
         << "Failed to create Core Audio device enumerator on thread with ID "
         << GetCurrentThreadId();
     return false;
   }
 
-  // Don't use CoreAudio when a remote desktop session with remote audio is
-  // present; several users report only WaveAudio working for them and crash
-  // reports show hangs when calling into the OS for CoreAudio API calls. See
-  // http://crbug.com/422522 and http://crbug.com/180591.
-  //
-  // Note: There's another check in WASAPIAudioOutputStream::Open() for the case
-  // where a remote session is created after Chrome has been started.  Graceful
-  // fallback to WaveOut will occur in this case via AudioOutputResampler.
-  if (!IsRemoteSession())
-    return true;
-
-  ScopedComPtr<IMMDevice> device;
-  HRESULT hr = device_enumerator->GetDefaultAudioEndpoint(eRender, eConsole,
-                                                          device.Receive());
-
-  // Assume remote audio playback if we can't tell.
-  if (FAILED(hr))
-    return false;
-
-  return !IsRemoteDeviceInternal(device.get());
+  return true;
 }
 
 bool CoreAudioUtil::IsSupported() {
   static bool g_is_supported = IsSupportedInternal();
   return g_is_supported;
 }
 
 base::TimeDelta CoreAudioUtil::RefererenceTimeToTimeDelta(REFERENCE_TIME time) {
   // Each unit of reference time is 100 nanoseconds <=> 0.1 microsecond.
   return base::TimeDelta::FromMicroseconds(0.1 * time + 0.5);
@@ skipping 625 matching lines @@
   if (FAILED(render_client->GetBuffer(num_frames_to_fill, &data)))
     return false;
 
   // Using the AUDCLNT_BUFFERFLAGS_SILENT flag eliminates the need to
   // explicitly write silence data to the rendering buffer.
   DVLOG(2) << "filling up " << num_frames_to_fill << " frames with silence";
   return SUCCEEDED(render_client->ReleaseBuffer(num_frames_to_fill,
                                                 AUDCLNT_BUFFERFLAGS_SILENT));
 }
 
-bool CoreAudioUtil::IsRemoteOutputDevice(const std::string& device_id) {
-  DCHECK(IsSupported());
-  if (!IsRemoteSession())
-    return false;
-  ScopedComPtr<IMMDevice> device(device_id.empty()
-                                     ? CreateDefaultDevice(eRender, eConsole)
-                                     : CreateDevice(device_id));
-  // Assume remote audio if we can't tell.
-  return device ? IsRemoteDeviceInternal(device.get()) : true;
-}
-
 }  // namespace media