forked/ustreamer
1
0
Fork 0
mirror of https://github.com/pikvm/ustreamer.git synced 2026-07-18 01:31:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

using fps_meta instead of flags

Browse Source
This commit is contained in:
Maxim Devaev
2024-04-01 00:02:04 +03:00
parent b8b67de5cf
commit 074ce86f67
5 changed files with 55 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/libs/fpsi.c
View File

@@ -48,8 +48,14 @@ void us_fpsi_destroy(us_fpsi_s *fpsi) {
free(fpsi);
}
void us_fpsi_bump(us_fpsi_s *fpsi, const us_frame_s *frame, bool noop_accum) {
if (frame != NULL) {
void us_fpsi_frame_to_meta(const us_frame_s *frame, us_fpsi_meta_s *meta) {
meta->width = frame->width;
meta->height = frame->height;
meta->online = frame->online;
}
void us_fpsi_update(us_fpsi_s *fpsi, bool bump, const us_fpsi_meta_s *meta) {
if (meta != NULL) {
assert(fpsi->with_meta);
} else {
assert(!fpsi->with_meta);
@@ -62,16 +68,16 @@ void us_fpsi_bump(us_fpsi_s *fpsi, const us_frame_s *frame, bool noop_accum) {
// Fast mutex-less store method
ull state = (ull)fpsi->accum & 0xFFFF;
if (fpsi->with_meta) {
assert(frame != NULL);
state |= (ull)(frame->width & 0xFFFF) << 16;
state |= (ull)(frame->height & 0xFFFF) << 32;
state |= (ull)(frame->online ? 1 : 0) << 48;
assert(meta != NULL);
state |= (ull)(meta->width & 0xFFFF) << 16;
state |= (ull)(meta->height & 0xFFFF) << 32;
state |= (ull)(meta->online ? 1 : 0) << 48;
}
atomic_store(&fpsi->state, state); // Сначала инфа
atomic_store(&fpsi->state_sec_ts, now_sec_ts); // Потом время, это важно
fpsi->accum = 0;
}
if (!noop_accum) {
if (bump) {
++fpsi->accum;
}
}

3
src/libs/fpsi.h
View File

@@ -46,5 +46,6 @@ typedef struct {
us_fpsi_s *us_fpsi_init(const char *name, bool with_meta);
void us_fpsi_destroy(us_fpsi_s *fpsi);
void us_fpsi_bump(us_fpsi_s *fpsi, const us_frame_s *frame, bool noop_accum);
void us_fpsi_frame_to_meta(const us_frame_s *frame, us_fpsi_meta_s *meta);
void us_fpsi_update(us_fpsi_s *fpsi, bool bump, const us_fpsi_meta_s *meta);
uint us_fpsi_get(us_fpsi_s *fpsi, us_fpsi_meta_s *meta);