Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1021)

Unified Diff: content/renderer/media/audio_device_factory.cc

Issue 2116443002: Restricting output device authorization timeout to Windows only. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebasing to the revert Created 4 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | media/audio/audio_output_device.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/media/audio_device_factory.cc
diff --git a/content/renderer/media/audio_device_factory.cc b/content/renderer/media/audio_device_factory.cc
index 64b7697b209caa48dc870d7f04140f832a259459..d1a7842196cb0af2f18c6f22f73c1ba8d9810af6 100644
--- a/content/renderer/media/audio_device_factory.cc
+++ b/content/renderer/media/audio_device_factory.cc
@@ -7,6 +7,7 @@
#include <algorithm>
#include "base/logging.h"
+#include "build/build_config.h"
#include "content/common/content_constants_internal.h"
#include "content/renderer/media/audio_input_message_filter.h"
#include "content/renderer/media/audio_message_filter.h"
@@ -24,7 +25,15 @@ namespace content {
AudioDeviceFactory* AudioDeviceFactory::factory_ = NULL;
namespace {
-const int64_t kMaxAuthorizationTimeoutMs = 4000;
+#if defined(OS_WIN)
+// Due to driver deadlock issues on Windows (http://crbug/422522) there is a
+// chance device authorization response is never received from the browser side.
+// In this case we will time out, to avoid renderer hang forever waiting for
+// device authorization (http://crbug/615589). This will result in "no audio".
+const int64_t kMaxAuthorizationTimeoutMs = 900;
+#else
+const int64_t kMaxAuthorizationTimeoutMs = 0; // No timeout.
+#endif // defined(OS_WIN)
media::AudioLatency::LatencyType GetSourceLatencyType(
AudioDeviceFactory::SourceType source) {
« no previous file with comments | « no previous file | media/audio/audio_output_device.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698