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

Capture: print dev name in FPS status

Browse Source
This commit is contained in:
Martin Pulec
2020-06-09 12:09:06 +02:00
parent 0e4092bd5d
commit 3657dcaa2c
1 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/main.cpp
View File

@@ -204,6 +204,7 @@ struct state_uv {
} }
} }
string capture_device_name;
struct vidcap *capture_device; struct vidcap *capture_device;
struct display *display_device; struct display *display_device;
@@ -414,17 +415,14 @@ static void usage(const char *exec_path, bool full = false)
printf("\n"); printf("\n");
} }
static void print_fps(bool should_print, steady_clock::time_point &t0, int &frames) { static void print_fps(steady_clock::time_point *t0, int *frames, const string &name) {
if (!should_print) { *frames += 1;
return;
}
frames += 1;
steady_clock::time_point t1 = steady_clock::now(); steady_clock::time_point t1 = steady_clock::now();
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) {
float fps = frames / seconds; double fps = *frames / seconds;
LOG(LOG_LEVEL_INFO) << "[capture] " << frames << " frames in " << seconds << " seconds = " << BOLD(fps << " FPS\n"); LOG(LOG_LEVEL_INFO) << "[" << name << "] " << frames << " frames in " << seconds << " seconds = " << BOLD(fps << " FPS\n");
t0 = t1; *t0 = t1;
frames = 0; frames = 0;
} }
} }
@@ -457,7 +455,9 @@ static void *capture_thread(void *arg)
} }
if (tx_frame != NULL) { if (tx_frame != NULL) {
print_fps(should_print_fps, t0, frames); if (should_print_fps) {
print_fps(&t0, &frames, uv->capture_device_name);
}
//tx_frame = vf_get_copy(tx_frame); //tx_frame = vf_get_copy(tx_frame);
bool wait_for_cur_uncompressed_frame; bool wait_for_cur_uncompressed_frame;
shared_ptr<video_frame> frame; shared_ptr<video_frame> frame;
@@ -1397,6 +1397,7 @@ int main(int argc, char *argv[])
} }
if (video_rxtx_mode & MODE_SENDER) { if (video_rxtx_mode & MODE_SENDER) {
uv.capture_device_name = vidcap_params_get_driver(vidcap_params_head);
if (pthread_create if (pthread_create
(&capture_thread_id, NULL, capture_thread, (&capture_thread_id, NULL, capture_thread,
(void *) &uv.root_module) != 0) { (void *) &uv.root_module) != 0) {