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

display FPS indicator bg color fix

Browse Source 
Since display FPS indicator has set background color, using something
like "[Decklink display] " caused also the trailing space background to
be colored, which doesn't look nice.
This commit is contained in:
Martin Pulec
2022-11-14 15:23:49 +01:00
parent 91691bcfd5
commit 5433765b41
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main.cpp
View File

@@ -79,6 +79,7 @@
#include <thread> #include <thread>
#include <tuple> #include <tuple>
#include "compat/misc.h"
#include "compat/platform_pipe.h" #include "compat/platform_pipe.h"
#include "control_socket.h" #include "control_socket.h"
#include "debug.h" #include "debug.h"
@@ -438,7 +439,7 @@ static void print_fps(const char *prefix, steady_clock::time_point *t0, int *fra
double seconds = duration_cast<duration<double>>(t1 - *t0).count(); double seconds = duration_cast<duration<double>>(t1 - *t0).count();
if (seconds >= 5.0) { if (seconds >= 5.0) {
double fps = *frames / seconds; double fps = *frames / seconds;
log_msg(LOG_LEVEL_INFO, TERM_BOLD TERM_BG_BLACK TERM_FG_BRIGHT_GREEN "%s" TERM_RESET "%d frames in %g seconds = " TBOLD("%g FPS") "\n", prefix, *frames, seconds, fps); log_msg(LOG_LEVEL_INFO, TERM_BOLD TERM_BG_BLACK TERM_FG_BRIGHT_GREEN "%s " TERM_RESET "%d frames in %g seconds = " TBOLD("%g FPS") "\n", prefix, *frames, seconds, fps);
*t0 = t1; *t0 = t1;
*frames = 0; *frames = 0;
} }
@@ -459,7 +460,10 @@ static void *capture_thread(void *arg)
struct wait_obj *wait_obj = wait_obj_init(); struct wait_obj *wait_obj = wait_obj_init();
steady_clock::time_point t0 = steady_clock::now(); steady_clock::time_point t0 = steady_clock::now();
int frames = 0; int frames = 0;
const char *print_fps_prefix = vidcap_get_fps_print_prefix(uv->capture_device); char *print_fps_prefix = strdupa(vidcap_get_fps_print_prefix(uv->capture_device));
if (print_fps_prefix && print_fps_prefix[strlen(print_fps_prefix) - 1] == ' ') { // trim trailing ' '
print_fps_prefix[strlen(print_fps_prefix) - 1] = '\0';
}
while (!should_exit) { while (!should_exit) {
/* Capture and transmit video... */ /* Capture and transmit video... */