forked/ustreamer
1
0
Fork 0
mirror of https://github.com/pikvm/ustreamer.git synced 2026-03-11 01:53:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

we don't need us_fpsi_reset() anymore

Browse Source
This commit is contained in:
Maxim Devaev
2024-03-30 18:44:40 +02:00
parent a9e0cb49e9
commit 24aca349a3
4 changed files with 15 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/libs/fpsi.c
View File

@@ -31,9 +31,6 @@
#include "frame.h"
static void _fpsi_bump_unsafe(us_fpsi_s *fpsi, const us_frame_s *frame);
us_fpsi_s *us_fpsi_init(const char *name, bool with_meta) {
us_fpsi_s *fpsi;
US_CALLOC(fpsi, 1);
@@ -51,13 +48,8 @@ void us_fpsi_destroy(us_fpsi_s *fpsi) {
void us_fpsi_bump(us_fpsi_s *fpsi, const us_frame_s *frame) {
US_MUTEX_LOCK(fpsi->mutex);
_fpsi_bump_unsafe(fpsi, frame);
US_MUTEX_UNLOCK(fpsi->mutex);
}
static void _fpsi_bump_unsafe(us_fpsi_s *fpsi, const us_frame_s *frame) {
const sll now_sec_ts = us_floor_ms(us_get_now_monotonic());
if (now_sec_ts != fpsi->ts) {
if (fpsi->ts != now_sec_ts) {
US_LOG_PERF_FPS("FPS: %s: %u", fpsi->name, fpsi->accum);
fpsi->current = fpsi->accum;
fpsi->accum = 0;
@@ -70,12 +62,6 @@ static void _fpsi_bump_unsafe(us_fpsi_s *fpsi, const us_frame_s *frame) {
} else {
assert(!fpsi->with_meta);
}
}
void us_fpsi_reset(us_fpsi_s *fpsi, const us_frame_s *frame) {
US_MUTEX_LOCK(fpsi->mutex);
_fpsi_bump_unsafe(fpsi, frame); // Just show the log record
fpsi->accum = 0;
US_MUTEX_UNLOCK(fpsi->mutex);
}
@@ -86,7 +72,8 @@ uint us_fpsi_get(us_fpsi_s *fpsi, us_fpsi_meta_s *meta) {
assert(!fpsi->with_meta);
}
US_MUTEX_LOCK(fpsi->mutex);
uint current = fpsi->current;
const sll now_sec_ts = us_floor_ms(us_get_now_monotonic());
const uint current = (fpsi->ts == now_sec_ts ? fpsi->current : 0);
if (meta != NULL) {
US_FRAME_COPY_META(&fpsi->meta, meta);
}