fps -> fpsi, store frame meta

This commit is contained in:
Maxim Devaev
2024-03-30 15:35:14 +02:00
parent 580ca68291
commit 14e9d9f7af
8 changed files with 129 additions and 117 deletions

95
src/libs/fpsi.c Normal file
View File

@@ -0,0 +1,95 @@
/*****************************************************************************
# #
# uStreamer - Lightweight and fast MJPEG-HTTP streamer. #
# #
# Copyright (C) 2018-2024 Maxim Devaev <mdevaev@gmail.com> #
# #
# This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #
# the Free Software Foundation, either version 3 of the License, or #
# (at your option) any later version. #
# #
# This program is distributed in the hope that it will be useful, #
# but WITHOUT ANY WARRANTY; without even the implied warranty of #
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
# GNU General Public License for more details. #
# #
# You should have received a copy of the GNU General Public License #
# along with this program. If not, see <https://www.gnu.org/licenses/>. #
# #
*****************************************************************************/
#include "fpsi.h"
#include <pthread.h>
#include "types.h"
#include "tools.h"
#include "threading.h"
#include "logging.h"
#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);
fpsi->name = us_strdup(name);
fpsi->with_meta = with_meta;
US_MUTEX_INIT(fpsi->mutex);
return fpsi;
}
void us_fpsi_destroy(us_fpsi_s *fpsi) {
US_MUTEX_DESTROY(fpsi->mutex);
free(fpsi->name);
free(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) {
US_LOG_PERF_FPS("FPS: %s: %u", fpsi->name, fpsi->accum);
fpsi->current = fpsi->accum;
fpsi->accum = 0;
fpsi->ts = now_sec_ts;
}
++fpsi->accum;
if (frame != NULL) {
assert(fpsi->with_meta);
US_FRAME_COPY_META(frame, &fpsi->meta);
} 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);
}
uint us_fpsi_get(us_fpsi_s *fpsi, us_fpsi_meta_s *meta) {
if (meta != NULL) {
assert(fpsi->with_meta);
} else {
assert(!fpsi->with_meta);
}
US_MUTEX_LOCK(fpsi->mutex);
uint current = fpsi->current;
if (meta != NULL) {
US_FRAME_COPY_META(&fpsi->meta, meta);
}
US_MUTEX_UNLOCK(fpsi->mutex);
return current;
}