Commit 14beca76 authored by olka's avatar olka Committed by Commit bot

Speculative increase of AudioOutputDevice authorization timeout.

Per discussion in https://bugs.chromium.org/p/chromium/issues/detail?id=615589#c113.

BUG=615589,663546

Review-Url: https://codereview.chromium.org/2569183002
Cr-Commit-Position: refs/heads/master@{#438137}
parent 9a49b977
......@@ -26,17 +26,16 @@ namespace content {
AudioDeviceFactory* AudioDeviceFactory::factory_ = NULL;
namespace {
#if defined(OS_WIN)
#if defined(OS_WIN) || defined(OS_MACOSX)
// 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 = 1000;
#elif defined(OS_MACOSX)
const int64_t kMaxAuthorizationTimeoutMs = 2000;
// There are also cases when authorization takes too long on Mac.
const int64_t kMaxAuthorizationTimeoutMs = 4000;
#else
const int64_t kMaxAuthorizationTimeoutMs = 0; // No timeout.
#endif // defined(OS_WIN)
#endif
scoped_refptr<media::AudioOutputDevice> NewOutputDevice(
int render_frame_id,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment