From a9df6da9128989b39296f49f24fa0ce52ba25967 Mon Sep 17 00:00:00 2001
From: Devaev Maxim <mdevaev@gmail.com>
Date: Thu, 4 Oct 2018 19:43:58 +0300
Subject: [PATCH] improved fps counters

---
 src/http.c   | 34 +++++++++++++++++++---------------
 src/http.h   |  4 ++--
 src/stream.c | 16 ++++++++--------
 src/stream.h |  2 +-
 4 files changed, 30 insertions(+), 26 deletions(-)

diff --git a/src/http.c b/src/http.c
index 659d112..1b6e089 100644
--- a/src/http.c
+++ b/src/http.c
@@ -174,12 +174,12 @@ static void _http_callback_ping(struct evhttp_request *request, void *v_server)
 	assert(evbuffer_add_printf(buf,
 		"{\"stream\": {\"resolution\":"
 		" {\"width\": %u, \"height\": %u},"
-		" \"cps\": %u, \"eps\": %u,"
+		" \"captured_fps\": %u, \"queued_fps\": %u,"
 		" \"online\": %s, \"clients\": %u}}",
 		(server->fake_width ? server->fake_width : server->run->exposed->width),
 		(server->fake_height ? server->fake_height : server->run->exposed->height),
-		server->run->exposed->cps, // Captured per second
-		server->run->exposed->eps, // Exposed per second (server)
+		server->run->exposed->captured_fps,
+		server->run->exposed->queued_fps,
 		(server->run->exposed->online ? "true" : "false"),
 		server->run->stream_clients_count
 	));
@@ -390,6 +390,10 @@ static void _http_queue_send_stream(struct http_server_t *server, const bool upd
 	struct stream_client_t *client;
 	struct evhttp_connection *conn;
 	struct bufferevent *buf_event;
+	long long now;
+	bool queued = false;
+	static unsigned queued_fps = 0;
+	static long long queued_fps_second = 0;
 
 	for (client = server->run->stream_clients; client != NULL; client = client->next) {
 		conn = evhttp_request_get_connection(client->request);
@@ -398,17 +402,24 @@ static void _http_queue_send_stream(struct http_server_t *server, const bool upd
 			bufferevent_setcb(buf_event, NULL, _http_callback_stream_write, _http_callback_stream_error, (void *)client);
 			bufferevent_enable(buf_event, EV_READ|EV_WRITE);
 			client->need_first_frame = false;
+			queued = true;
 		}
 	}
+
+	if (queued) {
+		if ((now = floor_ms(get_now_monotonic())) != queued_fps_second) {
+			server->run->exposed->queued_fps = queued_fps;
+			queued_fps = 0;
+			queued_fps_second = now;
+		}
+		queued_fps += 1;
+	}
 }
 
 static void _http_exposed_refresh(UNUSED int fd, UNUSED short what, void *v_server) {
 	struct http_server_t *server = (struct http_server_t *)v_server;
 	bool updated = false;
 	bool queue_send = false;
-	long long now;
-	static unsigned eps = 0;
-	static long long eps_second = 0;
 
 #define LOCK_STREAM \
 	A_PTHREAD_M_LOCK(&server->run->stream->mutex);
@@ -434,13 +445,6 @@ static void _http_exposed_refresh(UNUSED int fd, UNUSED short what, void *v_serv
 	}
 
 	if (queue_send) {
-		if ((now = floor_ms(get_now_monotonic())) != eps_second) {
-			server->run->exposed->eps = eps;
-			eps = 0;
-			eps_second = now;
-		}
-		eps += 1;
-
 		if (server->drop_same_frames) {
 			// Хром всегда показывает не новый пришедший фрейм, а предыдущий.
 			// При updated == false нужно еще один раз послать предыдущий фрейм
@@ -467,7 +471,7 @@ static bool _expose_new_picture(struct http_server_t *server) {
 #	define EXPOSED(_next) server->run->exposed->_next
 
 	assert(STREAM(picture.size) > 0);
-	EXPOSED(cps) = STREAM(cps);
+	EXPOSED(captured_fps) = STREAM(captured_fps);
 	EXPOSED(expose_begin_time) = get_now_monotonic();
 
 #	define MEM_STREAM_TO_EXPOSED \
@@ -550,7 +554,7 @@ static bool _expose_blank_picture(struct http_server_t *server) {
 
 		EXPOSED(width) = BLANK_JPG_WIDTH;
 		EXPOSED(height) = BLANK_JPG_HEIGHT;
-		EXPOSED(cps) = 0;
+		EXPOSED(captured_fps) = 0;
 		EXPOSED(online) = false;
 		goto updated;
 	}
diff --git a/src/http.h b/src/http.h
index 8414f6c..f05682e 100644
--- a/src/http.h
+++ b/src/http.h
@@ -42,8 +42,8 @@ struct exposed_t {
 	struct picture_t	picture;
 	unsigned			width;
 	unsigned			height;
-	unsigned			cps; // Captured per second
-	unsigned			eps; // Exposed per second
+	unsigned			captured_fps;
+	unsigned			queued_fps;
 	bool				online;
 	unsigned			dropped;
 	long double			expose_begin_time;
diff --git a/src/stream.c b/src/stream.c
index 6efbe46..40bc680 100644
--- a/src/stream.c
+++ b/src/stream.c
@@ -85,8 +85,8 @@ void stream_loop(struct stream_t *stream) {
 		unsigned frames_count = 0;
 		long double grab_after = 0;
 		unsigned fluency_passed = 0;
-		unsigned cps = 0; // Captured per second
-		long long cps_second = 0;
+		unsigned captured_fps = 0;
+		long long captured_fps_second = 0;
 
 		LOG_DEBUG("Allocation memory for stream picture ...");
 		A_CALLOC(stream->picture.data, stream->dev->run->max_picture_size);
@@ -197,13 +197,13 @@ void stream_loop(struct stream_t *stream) {
 						}
 						fluency_passed = 0;
 
-						if (now_second != cps_second) {
-							LOG_PERF("Oldest worker complete, CPS = %u", cps);
-							stream->cps = cps;
-							cps = 0;
-							cps_second = now_second;
+						if (now_second != captured_fps_second) {
+							LOG_PERF("Oldest worker complete, Captured-FPS = %u", captured_fps);
+							stream->captured_fps = captured_fps;
+							captured_fps = 0;
+							captured_fps_second = now_second;
 						}
-						cps += 1;
+						captured_fps += 1;
 
 						long double fluency_delay = _stream_get_fluency_delay(stream->dev, &pool);
 
diff --git a/src/stream.h b/src/stream.h
index 94fc53a..0768ec3 100644
--- a/src/stream.h
+++ b/src/stream.h
@@ -86,7 +86,7 @@ struct stream_t {
 	struct picture_t	picture;
 	unsigned			width;
 	unsigned			height;
-	unsigned			cps; // Captured per second
+	unsigned			captured_fps;
 	bool				updated;
 	pthread_mutex_t		mutex;
 	struct device_t		*dev;