mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-08 16:35:40 +00:00
Code Issues 1 Projects Releases Wiki Activity

wasapi2src: Fix loopback capture on Windows 10 Anniversary Update

Browse source 
... or older. Work around an OS bug that loopback capture
device doesn't notify event.

Fixes: https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/1738
Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3782>
This commit is contained in:
Seungha Yang 2023-01-24 23:26:50 +09:00 committed by GStreamer Marge Bot
parent 6b04c8ee56
commit 983d78daa5
1 changed files with 23 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
subprojects/gst-plugins-bad/sys/wasapi2/gstwasapi2ringbuffer.cpp
View file

@ -713,7 +713,10 @@ gst_wasapi2_ring_buffer_io_callback (GstWasapi2RingBuffer * self)
} }
if (self->running) { if (self->running) {
if (gst_wasapi2_result (hr)) { if (gst_wasapi2_result (hr) &&
/* In case of normal loopback capture, this method is called from
* silence feeding thread. Don't schedule again in that case */
self->device_class != GST_WASAPI2_CLIENT_DEVICE_CLASS_LOOPBACK_CAPTURE) {
hr = MFPutWaitingWorkItem (self->event_handle, 0, self->callback_result, hr = MFPutWaitingWorkItem (self->event_handle, 0, self->callback_result,
&self->callback_key); &self->callback_key);
@ -761,17 +764,16 @@ gst_wasapi2_ring_buffer_fill_loopback_silence (GstWasapi2RingBuffer * self)
if (!gst_wasapi2_result (hr)) if (!gst_wasapi2_result (hr))
return hr; return hr;
if (padding_frames >= self->buffer_size) { if (padding_frames >= self->loopback_buffer_size) {
GST_INFO_OBJECT (self, GST_INFO_OBJECT (self,
"Padding size %d is larger than or equal to buffer size %d", "Padding size %d is larger than or equal to buffer size %d",
padding_frames, self->buffer_size); padding_frames, self->loopback_buffer_size);
return S_OK; return S_OK;
} }
can_write = self->buffer_size - padding_frames; can_write = self->loopback_buffer_size - padding_frames;
GST_TRACE_OBJECT (self, GST_TRACE_OBJECT (self, "Writing %d silent frames", can_write);
"Writing %d silent frames offset at %" G_GUINT64_FORMAT, can_write);
hr = render_client->GetBuffer (can_write, &data); hr = render_client->GetBuffer (can_write, &data);
if (!gst_wasapi2_result (hr)) if (!gst_wasapi2_result (hr))
@ -797,6 +799,12 @@ gst_wasapi2_ring_buffer_loopback_callback (GstWasapi2RingBuffer * self)
hr = gst_wasapi2_ring_buffer_fill_loopback_silence (self); hr = gst_wasapi2_ring_buffer_fill_loopback_silence (self);
/* On Windows versions prior to Windows 10, a pull-mode capture client will
* not receive any events when a stream is initialized with event-driven
* buffering */
if (gst_wasapi2_result (hr))
hr = gst_wasapi2_ring_buffer_io_callback (self);
if (self->running) { if (self->running) {
if (gst_wasapi2_result (hr)) { if (gst_wasapi2_result (hr)) {
hr = MFPutWaitingWorkItem (self->loopback_event_handle, 0, hr = MFPutWaitingWorkItem (self->loopback_event_handle, 0,
@ -1229,13 +1237,15 @@ gst_wasapi2_ring_buffer_start_internal (GstWasapi2RingBuffer * self)
goto error; goto error;
} }
hr = MFPutWaitingWorkItem (self->event_handle, 0, self->callback_result, if (self->device_class != GST_WASAPI2_CLIENT_DEVICE_CLASS_LOOPBACK_CAPTURE) {
&self->callback_key); hr = MFPutWaitingWorkItem (self->event_handle, 0, self->callback_result,
if (!gst_wasapi2_result (hr)) { &self->callback_key);
GST_ERROR_OBJECT (self, "Failed to put waiting item"); if (!gst_wasapi2_result (hr)) {
client_handle->Stop (); GST_ERROR_OBJECT (self, "Failed to put waiting item");
self->running = FALSE; client_handle->Stop ();
goto error; self->running = FALSE;
goto error;
}
} }
return TRUE; return TRUE;