OBS/obs-studio
OBS/obs-studio
1
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2024-07-14 15:24:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

libobs/media-io: Use inputs_mutex during close

Browse source 
This code assumed that no one would be racing after we stopped the input
thread, however the obs output thread also races and can free the inputs
during disconnect before we finish closing the video mix.

Instead keep the locks around after stop and use them during close to
avoid races.

Fixes crashes when stopping virtual webcam on linux.

Co-authored-by: Norihiro Kamae <norihiro@nagater.net>
This commit is contained in:
Kurt Kartaltepe 2023-02-28 17:55:25 -08:00 committed by Jim
parent c79cf009e2
commit 36409f01cf
1 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
libobs/media-io/video-io.c
View file

@ -69,8 +69,6 @@ struct video_output {
volatile long skipped_frames;
volatile long total_frames;
bool initialized;
pthread_mutex_t input_mutex;
DARRAY(struct video_input) inputs;
@ -236,7 +234,6 @@ int video_output_open(video_t **video, struct video_output_info *info)
memcpy(&out->info, info, sizeof(struct video_output_info));
out->frame_time =
util_mul_div64(1000000000ULL, info->fps_den, info->fps_num);
out->initialized = false;
if (pthread_mutex_init_recursive(&out->data_mutex) != 0)
goto fail0;
@ -249,7 +246,6 @@ int video_output_open(video_t **video, struct video_output_info *info)
init_cache(out);
out->initialized = true;
*video = out;
return VIDEO_OUTPUT_SUCCESS;
@ -260,7 +256,7 @@ fail2:
fail1:
pthread_mutex_destroy(&out->data_mutex);
fail0:
video_output_close(out);
bfree(out);
return VIDEO_OUTPUT_FAIL;
}
@ -271,6 +267,8 @@ void video_output_close(video_t *video)
video_output_stop(video);
pthread_mutex_lock(&video->input_mutex);
for (size_t i = 0; i < video->inputs.num; i++)
video_input_free(&video->inputs.array[i]);
da_free(video->inputs);
@ -278,6 +276,11 @@ void video_output_close(video_t *video)
for (size_t i = 0; i < video->info.cache_size; i++)
video_frame_free((struct video_frame *)&video->cache[i]);
pthread_mutex_unlock(&video->input_mutex);
os_sem_destroy(video->update_semaphore);
pthread_mutex_destroy(&video->data_mutex);
pthread_mutex_destroy(&video->input_mutex);
bfree(video);
}
@ -535,14 +538,10 @@ void video_output_stop(video_t *video)
if (!video)
return;
if (video->initialized) {
video->initialized = false;
if (!video->stop) {
video->stop = true;
os_sem_post(video->update_semaphore);
pthread_join(video->thread, &thread_ret);
os_sem_destroy(video->update_semaphore);
pthread_mutex_destroy(&video->data_mutex);
pthread_mutex_destroy(&video->input_mutex);
}
}