fps -> fpsi, store frame meta

src/libs/fpsi.c

@@ -20,41 +20,76 @@
 *****************************************************************************/
 
 
-#include "fps.h"
+#include "fpsi.h"
+
+#include <pthread.h>
 
 #include "types.h"
 #include "tools.h"
+#include "threading.h"
 #include "logging.h"
+#include "frame.h"
 
 
-us_fps_s *us_fps_init(const char *name) {
-	us_fps_s *fps;
-	US_CALLOC(fps, 1);
-	fps->name = us_strdup(name);
-	return fps;
+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_fps_destroy(us_fps_s *fps) {
-	free(fps->name);
-	free(fps);
+void us_fpsi_destroy(us_fpsi_s *fpsi) {
+	US_MUTEX_DESTROY(fpsi->mutex);
+	free(fpsi->name);
+	free(fpsi);
 }
 
-void us_fps_bump(us_fps_s *fps) {
+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 != fps->ts) {
-		US_LOG_PERF_FPS("FPS: %s: %u", fps->name, fps->accum);
-		atomic_store(&fps->current, fps->accum);
-		fps->accum = 0;
-		fps->ts = now_sec_ts;
+	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);
 	}
-	++fps->accum;
 }
 
-void us_fps_reset(us_fps_s *fps) {
-	us_fps_bump(fps); // Just show the log record
-	fps->accum = 0;
+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_fps_get(us_fps_s *fps) {
-	return atomic_load(&fps->current);
+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;
 }

src/libs/fpsi.h

@@ -22,22 +22,30 @@
 
 #pragma once
 
-#include <stdatomic.h>
+#include <pthread.h>
 
 #include "types.h"
+#include "frame.h"
 
 
 typedef struct {
-	char		*name;
-	uint		accum;
-	ldf			ts;
-	atomic_uint	current;
-} us_fps_s;
+	US_FRAME_META_DECLARE;
+} us_fpsi_meta_s;
+
+typedef struct {
+	char			*name;
+	bool			with_meta;
+	uint			accum;
+	ldf				ts;
+	uint			current;
+	us_fpsi_meta_s	meta;
+	pthread_mutex_t	mutex;
+} us_fpsi_s;
 
 
-us_fps_s *us_fps_init(const char *name);
-void us_fps_destroy(us_fps_s *fps);
+us_fpsi_s *us_fpsi_init(const char *name, bool with_meta);
+void us_fpsi_destroy(us_fpsi_s *fpsi);
 
-void us_fps_bump(us_fps_s *fps);
-void us_fps_reset(us_fps_s *fps);
-uint us_fps_get(us_fps_s *fps);
+void us_fpsi_bump(us_fpsi_s *fpsi, const us_frame_s *frame);
+void us_fpsi_reset(us_fpsi_s *fpsi, const us_frame_s *meta);
+uint us_fpsi_get(us_fpsi_s *fpsi, us_fpsi_meta_s *meta);

src/libs/frame.h

@@ -54,30 +54,30 @@ typedef struct {
 
 
 #define US_FRAME_COPY_META(x_src, x_dest) { \
-		x_dest->width = x_src->width; \
-		x_dest->height = x_src->height; \
-		x_dest->format = x_src->format; \
-		x_dest->stride = x_src->stride; \
-		x_dest->online = x_src->online; \
-		x_dest->key = x_src->key; \
-		x_dest->gop = x_src->gop; \
+		(x_dest)->width = (x_src)->width; \
+		(x_dest)->height = (x_src)->height; \
+		(x_dest)->format = (x_src)->format; \
+		(x_dest)->stride = (x_src)->stride; \
+		(x_dest)->online = (x_src)->online; \
+		(x_dest)->key = (x_src)->key; \
+		(x_dest)->gop = (x_src)->gop; \
 		\
-		x_dest->grab_ts = x_src->grab_ts; \
-		x_dest->encode_begin_ts = x_src->encode_begin_ts; \
-		x_dest->encode_end_ts = x_src->encode_end_ts; \
+		(x_dest)->grab_ts = (x_src)->grab_ts; \
+		(x_dest)->encode_begin_ts = (x_src)->encode_begin_ts; \
+		(x_dest)->encode_end_ts = (x_src)->encode_end_ts; \
 	}
 
 #define US_FRAME_COMPARE_GEOMETRY(x_a, x_b) ( \
 		/* Compare the used size and significant meta (no timings) */ \
-		x_a->used == x_b->used \
+		(x_a)->used == (x_b)->used \
 		\
-		&& x_a->width == x_b->width \
-		&& x_a->height == x_b->height \
-		&& x_a->format == x_b->format \
-		&& x_a->stride == x_b->stride \
-		&& x_a->online == x_b->online \
-		&& x_a->key == x_b->key \
-		&& x_a->gop == x_b->gop \
+		&& (x_a)->width == (x_b)->width \
+		&& (x_a)->height == (x_b)->height \
+		&& (x_a)->format == (x_b)->format \
+		&& (x_a)->stride == (x_b)->stride \
+		&& (x_a)->online == (x_b)->online \
+		&& (x_a)->key == (x_b)->key \
+		&& (x_a)->gop == (x_b)->gop \
 	)