scottk/UltraGrid
1
0
Fork 0
mirror of https://github.com/outbackdingo/UltraGrid.git synced 2026-03-21 14:40:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

testcard2: (hot) fix thread wild exit if TTF fails

Browse Source
This commit is contained in:
Martin Pulec
2023-07-21 16:33:48 +02:00
parent b77a4ac669
commit 7e00fdb14f
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/video_capture/testcard2.c
View File

@@ -316,13 +316,14 @@ void * vidcap_testcard2_thread(void *arg)
gettimeofday(&s->last_audio_time, NULL);
#ifdef HAVE_LIBSDL_TTF
#define EXIT_THREAD exit_uv(1); s->should_exit = true; platform_sem_post(&s->semaphore); return NULL;
TTF_Font * font = NULL;
uint32_t *banner = malloc(vc_get_datalen(s->desc.width, BANNER_HEIGHT, RGBA));
if(TTF_Init() == -1)
{
log_msg(LOG_LEVEL_ERROR, MOD_NAME "Unable to initialize SDL_ttf: %s\n",
TTF_GetError());
exit(128);
EXIT_THREAD
}
const char *font_dir = IF_NOT_NULL_ELSE(getenv("UG_FONT_DIR"), DEFAULT_FONT_DIR);
@@ -335,7 +336,7 @@ void * vidcap_testcard2_thread(void *arg)
}
if(!font) {
log_msg(LOG_LEVEL_ERROR, MOD_NAME "Unable to load any usable font (last font tried: %s)!\n", TTF_GetError());
exit(128);
EXIT_THREAD
}
#endif
@@ -498,7 +499,13 @@ static struct video_frame *vidcap_testcard2_grab(void *arg, struct audio_frame *
{
struct testcard_state2 *s = (struct testcard_state2 *)arg;
if (s->should_exit) {
return NULL;
}
platform_sem_wait(&s->semaphore);
if (s->should_exit) {
return NULL;
}
assert(s->data != NULL);
struct video_frame *frame = vf_alloc_desc(s->desc);