mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-09-30 07:42:32 +00:00
Code Issues 1 Projects Releases Wiki Activity

wasapi: Call _Start if the client was _Reset

Browse source 
Otherwise we will wait forever in WaitForSingleObject because we forgot
to start the client again after _Stop is called in reset().

https://bugzilla.gnome.org/show_bug.cgi?id=795114
This commit is contained in:
Nirbheek Chauhan 2018-04-10 05:09:42 +05:30
parent 9cd77b1644
commit 0a518c9be1
4 changed files with 34 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
sys/wasapi/gstwasapisink.c
View file

@ -175,6 +175,7 @@ gst_wasapi_sink_init (GstWasapiSink * self)
self->low_latency = DEFAULT_LOW_LATENCY;
self->try_audioclient3 = DEFAULT_AUDIOCLIENT3;
self->event_handle = CreateEvent (NULL, FALSE, FALSE, NULL);
self->client_needs_restart = FALSE;
CoInitialize (NULL);
}
@ -606,6 +607,14 @@ gst_wasapi_sink_write (GstAudioSink * asink, gpointer data, guint length)
gint16 *dst = NULL;
guint pending = length;
GST_OBJECT_LOCK (self);
if (self->client_needs_restart) {
hr = IAudioClient_Start (self->client);
HR_FAILED_AND (hr, IAudioClient::Start, length = 0; goto beach);
self->client_needs_restart = FALSE;
}
GST_OBJECT_UNLOCK (self);
while (pending > 0) {
guint can_frames, have_frames, n_frames, write_len;
@ -661,12 +670,18 @@ gst_wasapi_sink_reset (GstAudioSink * asink)
GstWasapiSink *self = GST_WASAPI_SINK (asink);
HRESULT hr;
GST_INFO_OBJECT (self, "reset called");
if (!self->client)
return;
GST_OBJECT_LOCK (self);
hr = IAudioClient_Stop (self->client);
HR_FAILED_RET (hr, IAudioClient::Stop,);
HR_FAILED_AND (hr, IAudioClient::Stop,);
hr = IAudioClient_Reset (self->client);
HR_FAILED_RET (hr, IAudioClient::Reset,);
HR_FAILED_AND (hr, IAudioClient::Reset,);
self->client_needs_restart = TRUE;
GST_OBJECT_UNLOCK (self);
}

2
sys/wasapi/gstwasapisink.h
View file

@ -45,6 +45,8 @@ struct _GstWasapiSink
IAudioRenderClient *render_client;
HANDLE event_handle;
HANDLE thread_priority_handle;
/* Client was reset, so it needs to be started again */
gboolean client_needs_restart;
/* Actual size of the allocated buffer */
guint buffer_frame_count;

13
sys/wasapi/gstwasapisrc.c
View file

@ -182,6 +182,7 @@ gst_wasapi_src_init (GstWasapiSrc * self)
self->low_latency = DEFAULT_LOW_LATENCY;
self->try_audioclient3 = DEFAULT_AUDIOCLIENT3;
self->event_handle = CreateEvent (NULL, FALSE, FALSE, NULL);
self->client_needs_restart = FALSE;
CoInitialize (NULL);
}
@ -555,6 +556,14 @@ gst_wasapi_src_read (GstAudioSrc * asrc, gpointer data, guint length,
guint wanted = length;
DWORD flags;
GST_OBJECT_LOCK (self);
if (self->client_needs_restart) {
hr = IAudioClient_Start (self->client);
HR_FAILED_AND (hr, IAudioClient::Start, length = 0; goto beach);
self->client_needs_restart = FALSE;
}
GST_OBJECT_UNLOCK (self);
while (wanted > 0) {
guint have_frames, n_frames, want_frames, read_len;
@ -641,11 +650,15 @@ gst_wasapi_src_reset (GstAudioSrc * asrc)
if (!self->client)
return;
GST_OBJECT_LOCK (self);
hr = IAudioClient_Stop (self->client);
HR_FAILED_RET (hr, IAudioClock::Stop,);
hr = IAudioClient_Reset (self->client);
HR_FAILED_RET (hr, IAudioClock::Reset,);
self->client_needs_restart = TRUE;
GST_OBJECT_UNLOCK (self);
}
static GstClockTime

2
sys/wasapi/gstwasapisrc.h
View file

@ -47,6 +47,8 @@ struct _GstWasapiSrc
IAudioCaptureClient *capture_client;
HANDLE event_handle;
HANDLE thread_priority_handle;
/* Client was reset, so it needs to be started again */
gboolean client_needs_restart;
/* Actual size of the allocated buffer */
guint buffer_frame_count;