jp9000
/
obs-studio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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.
master
jp9000 2017-10-27 22:54:29 -07:00
parent a4a8b385c5
commit 2c58185af3
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libobs/obs-internal.h
View File

@ -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);

4
libobs/obs-video.c
View File

@ -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));

2
libobs/obs.c
View File

@ -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;