Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc
Commits
f0362f18
Commit
f0362f18
authored
Aug 02, 2012
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wasapi: retry if device is invalidated during open (refs #6826)
parent
e351093a
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
3 deletions
+7
-3
modules/audio_output/wasapi.c
modules/audio_output/wasapi.c
+7
-3
No files found.
modules/audio_output/wasapi.c
View file @
f0362f18
...
@@ -479,7 +479,7 @@ static int Open(vlc_object_t *obj)
...
@@ -479,7 +479,7 @@ static int Open(vlc_object_t *obj)
free
(
sys
);
free
(
sys
);
return
VLC_EGENERIC
;
return
VLC_EGENERIC
;
}
}
retry:
/* Get audio device according to policy */
/* Get audio device according to policy */
var_Create
(
aout
,
"audio-device"
,
VLC_VAR_STRING
|
VLC_VAR_HASCHOICE
);
var_Create
(
aout
,
"audio-device"
,
VLC_VAR_STRING
|
VLC_VAR_HASCHOICE
);
...
@@ -546,7 +546,6 @@ static int Open(vlc_object_t *obj)
...
@@ -546,7 +546,6 @@ static int Open(vlc_object_t *obj)
vlc_ToWave
(
&
wf
,
&
format
);
vlc_ToWave
(
&
wf
,
&
format
);
hr
=
IAudioClient_IsFormatSupported
(
sys
->
client
,
AUDCLNT_SHAREMODE_SHARED
,
hr
=
IAudioClient_IsFormatSupported
(
sys
->
client
,
AUDCLNT_SHAREMODE_SHARED
,
&
wf
.
Format
,
&
pwf
);
&
wf
.
Format
,
&
pwf
);
// TODO: deal with (hr == AUDCLNT_E_DEVICE_INVALIDATED) ?
if
(
FAILED
(
hr
))
if
(
FAILED
(
hr
))
{
{
msg_Err
(
aout
,
"cannot negotiate audio format (error 0x%lx)"
,
hr
);
msg_Err
(
aout
,
"cannot negotiate audio format (error 0x%lx)"
,
hr
);
...
@@ -617,8 +616,13 @@ error:
...
@@ -617,8 +616,13 @@ error:
CloseHandle
(
sys
->
done
);
CloseHandle
(
sys
->
done
);
if
(
sys
->
client
!=
NULL
)
if
(
sys
->
client
!=
NULL
)
IAudioClient_Release
(
sys
->
client
);
IAudioClient_Release
(
sys
->
client
);
var_Destroy
(
aout
,
"audio-device"
);
if
(
hr
==
AUDCLNT_E_DEVICE_INVALIDATED
)
{
msg_Warn
(
aout
,
"device invalidated, retrying"
);
goto
retry
;
}
Leave
();
Leave
();
var_Destroy
(
aout
,
"audio-device"
);
free
(
sys
);
free
(
sys
);
return
VLC_EGENERIC
;
return
VLC_EGENERIC
;
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment