From 2c58185af3c85f4e594a4c067c9dfe5fa4b5b0a9 Mon Sep 17 00:00:00 2001 From: jp9000 Date: Fri, 27 Oct 2017 22:54:29 -0700 Subject: [PATCH] libobs: Rename obs_video_thread to obs_graphics_thread This is to prevent confusion with video_thread in libobs/media-io/video-io.c, which is used exclusively for video encoding/output. Also prevents confusion in the profiler log data. --- libobs/obs-internal.h | 2 +- libobs/obs-video.c | 4 ++-- libobs/obs.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libobs/obs-internal.h b/libobs/obs-internal.h index aee6a3c38..6363cb4ec 100644 --- a/libobs/obs-internal.h +++ b/libobs/obs-internal.h @@ -394,7 +394,7 @@ struct obs_core { extern struct obs_core *obs; -extern void *obs_video_thread(void *param); +extern void *obs_graphics_thread(void *param); extern gs_effect_t *obs_load_effect(gs_effect_t **effect, const char *file); diff --git a/libobs/obs-video.c b/libobs/obs-video.c index 691ed08b3..acac2628e 100644 --- a/libobs/obs-video.c +++ b/libobs/obs-video.c @@ -585,7 +585,7 @@ static inline void output_frame(void) static const char *tick_sources_name = "tick_sources"; static const char *render_displays_name = "render_displays"; static const char *output_frame_name = "output_frame"; -void *obs_video_thread(void *param) +void *obs_graphics_thread(void *param) { uint64_t last_time = 0; uint64_t interval = video_output_get_frame_time(obs->video.video); @@ -599,7 +599,7 @@ void *obs_video_thread(void *param) const char *video_thread_name = profile_store_name(obs_get_profiler_name_store(), - "obs_video_thread(%g"NBSP"ms)", interval / 1000000.); + "obs_graphics_thread(%g"NBSP"ms)", interval / 1000000.); profile_register_root(video_thread_name, interval); srand((unsigned int)time(NULL)); diff --git a/libobs/obs.c b/libobs/obs.c index dd731bac9..0b5154313 100644 --- a/libobs/obs.c +++ b/libobs/obs.c @@ -385,7 +385,7 @@ static int obs_init_video(struct obs_video_info *ovi) gs_leave_context(); errorcode = pthread_create(&video->video_thread, NULL, - obs_video_thread, obs); + obs_graphics_thread, obs); if (errorcode != 0) return OBS_VIDEO_FAIL;