starred/obs-studio
1
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2026-09-24 15:30:04 -05:00
Code Issues Packages Projects Releases Wiki Activity

linux-pipewire: Add locks to unsafe pipewire functions

Browse Source 
These functions log that they should be used with the thread lock held,
so lets hold the lock before calling them.

(cherry picked from commit f0697980c3)
This commit is contained in:
Kurt Kartaltepe
2023-10-26 16:24:51 -04:00
committed by Ryan Foster
parent 622d7d8f52
commit 2aaf499e2e
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/linux-pipewire/pipewire.c
+10 -2
View File
@@ -1286,14 +1286,20 @@ obs_pipewire_connect_stream(obs_pipewire *obs_pw, obs_source_t *source,
void obs_pipewire_stream_show(obs_pipewire_stream *obs_pw_stream)
{
if (obs_pw_stream->stream)
if (obs_pw_stream->stream) {
pw_thread_loop_lock(obs_pw_stream->obs_pw->thread_loop);
pw_stream_set_active(obs_pw_stream->stream, true);
pw_thread_loop_unlock(obs_pw_stream->obs_pw->thread_loop);
}
}
void obs_pipewire_stream_hide(obs_pipewire_stream *obs_pw_stream)
{
if (obs_pw_stream->stream)
if (obs_pw_stream->stream) {
pw_thread_loop_lock(obs_pw_stream->obs_pw->thread_loop);
pw_stream_set_active(obs_pw_stream->stream, false);
pw_thread_loop_unlock(obs_pw_stream->obs_pw->thread_loop);
}
}
uint32_t obs_pipewire_stream_get_width(obs_pipewire_stream *obs_pw_stream)
@@ -1433,9 +1439,11 @@ void obs_pipewire_stream_destroy(obs_pipewire_stream *obs_pw_stream)
g_clear_pointer(&obs_pw_stream->texture, gs_texture_destroy);
obs_leave_graphics();
pw_thread_loop_lock(obs_pw_stream->obs_pw->thread_loop);
if (obs_pw_stream->stream)
pw_stream_disconnect(obs_pw_stream->stream);
g_clear_pointer(&obs_pw_stream->stream, pw_stream_destroy);
pw_thread_loop_unlock(obs_pw_stream->obs_pw->thread_loop);
clear_format_info(obs_pw_stream);
bfree(obs_pw_stream);