summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2015-10-20 00:17:54 +0200
committerwm4 <wm4@nowhere>2015-10-20 00:25:34 +0200
commite157d005ba9817f36c68df95f9e4a2f050eb5c60 (patch)
tree9b7d3681b01a904562be9aef9b98aeba09e21b7c
parent251107076b26e87f49385f7e82293d17ba27a9cf (diff)
downloadmpv-e157d005ba9817f36c68df95f9e4a2f050eb5c60.tar.bz2
mpv-e157d005ba9817f36c68df95f9e4a2f050eb5c60.tar.xz
ao_coreaudio: raise timeout for change-physical-format
Reportedly fixes operation with "USB connected Parasound ZDAC v.2". (OSX and USB audio sure is not nice at all.) This might be perceived as hang by some users, so it's quite possible that this will have to be adjusted again somehow. Fixes #2409.
-rw-r--r--audio/out/ao_coreaudio_utils.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/audio/out/ao_coreaudio_utils.c b/audio/out/ao_coreaudio_utils.c
index 7d14b3f75c..6b60b63b05 100644
--- a/audio/out/ao_coreaudio_utils.c
+++ b/audio/out/ao_coreaudio_utils.c
@@ -523,7 +523,7 @@ bool ca_change_physical_format_sync(struct ao *ao, AudioStreamID stream,
/* The AudioStreamSetProperty is not only asynchronous,
* it is also not Atomic, in its behaviour. */
- struct timespec timeout = mp_rel_time_to_timespec(0.5);
+ struct timespec timeout = mp_rel_time_to_timespec(2.0);
AudioStreamBasicDescription actual_format = {0};
while (1) {
err = CA_GET(stream, kAudioStreamPropertyPhysicalFormat, &actual_format);