mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-04-26 06:54:49 +00:00
Code Issues 1 Projects Releases Wiki Activity

wasapi: Call CoIn/Uninitialize() around prepare()

Browse source 
Seems to be required for exclusive mode and also for all
initialization on Windows 7

https://bugzilla.gnome.org/show_bug.cgi?id=795274
This commit is contained in:
Nirbheek Chauhan 2018-04-16 19:35:07 +05:30
parent b476893560
commit ff17a404b3
3 changed files with 9 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
sys/wasapi/gstwasapisink.c
View file

@ -474,6 +474,8 @@ gst_wasapi_sink_prepare (GstAudioSink * asink, GstAudioRingBufferSpec * spec)
guint bpf, rate, devicep_frames; guint bpf, rate, devicep_frames;
HRESULT hr; HRESULT hr;
CoInitialize (NULL);
if (gst_wasapi_sink_can_audioclient3 (self)) { if (gst_wasapi_sink_can_audioclient3 (self)) {
if (!gst_wasapi_util_initialize_audioclient3 (GST_ELEMENT (self), spec, if (!gst_wasapi_util_initialize_audioclient3 (GST_ELEMENT (self), spec,
(IAudioClient3 *) self->client, self->mix_format, self->low_latency, (IAudioClient3 *) self->client, self->mix_format, self->low_latency,
@ -577,9 +579,7 @@ gst_wasapi_sink_unprepare (GstAudioSink * asink)
{ {
GstWasapiSink *self = GST_WASAPI_SINK (asink); GstWasapiSink *self = GST_WASAPI_SINK (asink);
if (self->sharemode == AUDCLNT_SHAREMODE_EXCLUSIVE && CoUninitialize ();
!gst_wasapi_sink_can_audioclient3 (self))
CoUninitialize ();
if (self->thread_priority_handle != NULL) { if (self->thread_priority_handle != NULL) {
gst_wasapi_util_revert_thread_characteristics gst_wasapi_util_revert_thread_characteristics
@ -596,6 +596,8 @@ gst_wasapi_sink_unprepare (GstAudioSink * asink)
self->render_client = NULL; self->render_client = NULL;
} }
CoUninitialize ();
return TRUE; return TRUE;
} }

8
sys/wasapi/gstwasapisrc.c
View file

@ -436,6 +436,8 @@ gst_wasapi_src_prepare (GstAudioSrc * asrc, GstAudioRingBufferSpec * spec)
guint bpf, rate, devicep_frames, buffer_frames; guint bpf, rate, devicep_frames, buffer_frames;
HRESULT hr; HRESULT hr;
CoInitialize (NULL);
if (gst_wasapi_src_can_audioclient3 (self)) { if (gst_wasapi_src_can_audioclient3 (self)) {
if (!gst_wasapi_util_initialize_audioclient3 (GST_ELEMENT (self), spec, if (!gst_wasapi_util_initialize_audioclient3 (GST_ELEMENT (self), spec,
(IAudioClient3 *) self->client, self->mix_format, self->low_latency, (IAudioClient3 *) self->client, self->mix_format, self->low_latency,
@ -517,10 +519,6 @@ gst_wasapi_src_unprepare (GstAudioSrc * asrc)
{ {
GstWasapiSrc *self = GST_WASAPI_SRC (asrc); GstWasapiSrc *self = GST_WASAPI_SRC (asrc);
if (self->sharemode == AUDCLNT_SHAREMODE_EXCLUSIVE &&
!gst_wasapi_src_can_audioclient3 (self))
CoUninitialize ();
if (self->thread_priority_handle != NULL) { if (self->thread_priority_handle != NULL) {
gst_wasapi_util_revert_thread_characteristics gst_wasapi_util_revert_thread_characteristics
(self->thread_priority_handle); (self->thread_priority_handle);
@ -543,6 +541,8 @@ gst_wasapi_src_unprepare (GstAudioSrc * asrc)
self->client_clock_freq = 0; self->client_clock_freq = 0;
CoUninitialize ();
return TRUE; return TRUE;
} }

4
sys/wasapi/gstwasapiutil.c
View file

@ -870,10 +870,6 @@ gst_wasapi_util_initialize_audioclient (GstElement * self,
min_period, &device_period, &device_buffer_duration); min_period, &device_period, &device_buffer_duration);
} }
/* For some reason, we need to call this a second time for exclusive mode */
if (sharemode == AUDCLNT_SHAREMODE_EXCLUSIVE)
CoInitialize (NULL);
stream_flags = AUDCLNT_STREAMFLAGS_EVENTCALLBACK; stream_flags = AUDCLNT_STREAMFLAGS_EVENTCALLBACK;
if (loopback) if (loopback)
stream_flags |= AUDCLNT_STREAMFLAGS_LOOPBACK; stream_flags |= AUDCLNT_STREAMFLAGS_LOOPBACK;