Bump version: 0.12 → 0.13

.bumpversion.cfg

@@ -1,7 +1,7 @@
 [bumpversion]
 commit = True
 tag = True
-current_version = 0.12
+current_version = 0.13
 parse = (?P<major>\d+)\.(?P<minor>\d+)(\.(?P<patch>\d+)(\-(?P<release>[a-z]+))?)?
 serialize = 
 	{major}.{minor}

PKGBUILD

@@ -3,7 +3,7 @@
 
 
 pkgname=ustreamer
-pkgver=0.12
+pkgver=0.13
 pkgrel=1
 pkgdesc="Lightweight and fast MJPG-HTTP streamer"
 url="https://github.com/pi-kvm/ustreamer"

src/config.h

@@ -21,4 +21,4 @@
 
 #pragma once
 
-#define VERSION "0.12"
+#define VERSION "0.13"

src/http.c

@@ -22,7 +22,6 @@
 #include <stdlib.h>
 #include <stdbool.h>
 #include <string.h>
-#include <time.h>
 #include <assert.h>
 
 #include <event2/event.h>
@@ -188,7 +187,6 @@ static void _http_callback_ping(struct evhttp_request *request, void *v_server)
 static void _http_callback_snapshot(struct evhttp_request *request, void *v_exposed) {
 	struct exposed_t *exposed = (struct exposed_t *)v_exposed;
 	struct evbuffer *buf;
-	struct timespec x_timestamp_spec;
 	char x_timestamp_buf[64];
 
 	PROCESS_HEAD_REQUEST;
@@ -196,17 +194,11 @@ static void _http_callback_snapshot(struct evhttp_request *request, void *v_expo
 	assert((buf = evbuffer_new()));
 	assert(!evbuffer_add(buf, (const void *)exposed->picture.data, exposed->picture.size));
 
-	assert(!clock_gettime(CLOCK_REALTIME, &x_timestamp_spec));
-	sprintf(
-		x_timestamp_buf, "%u.%06u",
-		(unsigned)x_timestamp_spec.tv_sec,
-		(unsigned)(x_timestamp_spec.tv_nsec / 1000) // TODO: round?
-	);
-
 	ADD_HEADER("Access-Control-Allow-Origin:", "*");
 	ADD_HEADER("Cache-Control", "no-store, no-cache, must-revalidate, pre-check=0, post-check=0, max-age=0");
 	ADD_HEADER("Pragma", "no-cache");
 	ADD_HEADER("Expires", "Mon, 3 Jan 2000 12:34:56 GMT");
+	sprintf(x_timestamp_buf, "%.06Lf", now_real_ms());
 	ADD_HEADER("X-Timestamp", x_timestamp_buf);
 	ADD_HEADER("Content-Type", "image/jpeg");
 
@@ -227,6 +219,8 @@ static void _http_callback_stream(struct evhttp_request *request, void *v_server
 	struct evhttp_connection *conn;
 	struct bufferevent *buf_event;
 	struct stream_client_t *client;
+	char *client_addr;
+	unsigned short client_port;
 
 	PROCESS_HEAD_REQUEST;
 
@@ -247,6 +241,13 @@ static void _http_callback_stream(struct evhttp_request *request, void *v_server
 			client->prev = last;
 			last->next = client;
 		}
+		server->run->stream_clients_count += 1;
+
+		evhttp_connection_get_peer(conn, &client_addr, &client_port);
+		LOG_INFO(
+			"HTTP: Registered the new stream client: [%s]:%u; clients now: %u",
+			client_addr, client_port, server->run->stream_clients_count
+		);
 
 		buf_event = evhttp_connection_get_bufferevent(conn);
 		bufferevent_setcb(buf_event, NULL, NULL, _http_callback_stream_error, (void *)client);
@@ -264,10 +265,8 @@ static void _http_callback_stream(struct evhttp_request *request, void *v_server
 static void _http_callback_stream_write(struct bufferevent *buf_event, void *v_client) {
 	struct stream_client_t *client = (struct stream_client_t *)v_client;
 	struct evbuffer *buf;
-	struct timespec x_timestamp_spec;
 
 	assert((buf = evbuffer_new()));
-	assert(!clock_gettime(CLOCK_REALTIME, &x_timestamp_spec));
 
 	if (client->need_initial) {
 		assert(evbuffer_add_printf(buf,
@@ -287,11 +286,10 @@ static void _http_callback_stream_write(struct bufferevent *buf_event, void *v_c
 	assert(evbuffer_add_printf(buf,
 		"Content-Type: image/jpeg" RN
 		"Content-Length: %lu" RN
-		"X-Timestamp: %u.%06u" RN
+		"X-Timestamp: %.06Lf" RN
 		RN,
 		client->server->run->exposed->picture.size * sizeof(*client->server->run->exposed->picture.data),
-		(unsigned)x_timestamp_spec.tv_sec,
+		now_real_ms()
-		(unsigned)(x_timestamp_spec.tv_nsec / 1000) // TODO: round?
 	));
 	assert(!evbuffer_add(buf,
 		(void *)client->server->run->exposed->picture.data,
@@ -312,8 +310,19 @@ static void _http_callback_stream_write(struct bufferevent *buf_event, void *v_c
 static void _http_callback_stream_error(UNUSED struct bufferevent *buf_event, UNUSED short what, void *v_client) {
 	struct stream_client_t *client = (struct stream_client_t *)v_client;
 	struct evhttp_connection *conn;
+	char *client_addr = "???";
+	unsigned short client_port = 0;
+
+	client->server->run->stream_clients_count -= 1;
 
 	conn = evhttp_request_get_connection(client->request);
+	if (conn != NULL) {
+		evhttp_connection_get_peer(conn, &client_addr, &client_port);
+	}
+	LOG_INFO(
+		"HTTP: Disconnected the stream client: [%s]:%u; clients now: %u",
+		client_addr, client_port, client->server->run->stream_clients_count
+	);
 	if (conn != NULL) {
 		evhttp_connection_free(conn);
 	}
@@ -397,7 +406,7 @@ static bool _expose_new_picture(struct http_server_t *server) {
 			&& !memcmp(MEM_STREAM_TO_EXPOSED)
 		) {
 			LOG_PERF("HTTP: dropped same frame number %u", server->run->exposed->dropped);
-			++server->run->exposed->dropped;
+			server->run->exposed->dropped += 1;
 			return false; // Not updated
 		}
 	}
@@ -441,7 +450,7 @@ static bool _expose_blank_picture(struct http_server_t *server) {
 
 	if (server->run->exposed->dropped < server->run->drop_same_frames_blank) {
 		LOG_PERF("HTTP: dropped same frame (BLANK) number %u", server->run->exposed->dropped);
-		++server->run->exposed->dropped;
+		server->run->exposed->dropped += 1;
 		return false; // Not updated
 	}
 

src/http.h

@@ -54,6 +54,7 @@ struct http_server_runtime_t {
 	struct stream_t			*stream;
 	struct exposed_t		*exposed;
 	struct stream_client_t	*stream_clients;
+	unsigned				stream_clients_count;
 	unsigned				drop_same_frames_blank;
 };
 

src/jpeg/encoder.c

@@ -137,7 +137,7 @@ static void _jpeg_write_scanlines_yuyv(struct jpeg_compress_struct *jpeg,
 	while (jpeg->next_scanline < height) {
 		unsigned char *ptr = line_buffer;
 
-		for (unsigned x = 0; x < width; x++) {
+		for (unsigned x = 0; x < width; ++x) {
 			int y = (!z ? data[0] << 8 : data[2] << 8);
 			int u = data[1] - 128;
 			int v = data[3] - 128;
@@ -171,7 +171,7 @@ static void _jpeg_write_scanlines_uyvy(struct jpeg_compress_struct *jpeg,
 	while(jpeg->next_scanline < height) {
 		unsigned char *ptr = line_buffer;
 
-		for(unsigned x = 0; x < width; x++) {
+		for(unsigned x = 0; x < width; ++x) {
 			int y = (!z ? data[1] << 8 : data[3] << 8);
 			int u = data[0] - 128;
 			int v = data[2] - 128;
@@ -204,7 +204,7 @@ static void _jpeg_write_scanlines_rgb565(struct jpeg_compress_struct *jpeg,
 	while(jpeg->next_scanline < height) {
 		unsigned char *ptr = line_buffer;
 
-		for(unsigned x = 0; x < width; x++) {
+		for(unsigned x = 0; x < width; ++x) {
 			unsigned int two_byte = (data[1] << 8) + data[0];
 
 			*(ptr++) = data[1] & 248;

src/logging.h

@@ -71,7 +71,7 @@ pthread_mutex_t log_mutex;
 
 #define LOG_ERROR(_x_msg, ...) { \
 		LOGGING_LOCK; \
-		printf("-- ERROR [%.03Lf tid=%ld] -- " _x_msg "\n", now_ms_ld(), syscall(SYS_gettid), ##__VA_ARGS__); \
+		printf("-- ERROR [%.03Lf tid=%ld] -- " _x_msg "\n", now_monotonic_ms(), syscall(SYS_gettid), ##__VA_ARGS__); \
 		LOGGING_UNLOCK; \
 	}
 
@@ -79,24 +79,24 @@ pthread_mutex_t log_mutex;
 		char _buf[1024] = ""; \
 		strerror_r(errno, _buf, 1024); \
 		LOGGING_LOCK; \
-		printf("-- ERROR [%.03Lf tid=%ld] -- " _x_msg ": %s\n", now_ms_ld(), syscall(SYS_gettid), ##__VA_ARGS__, _buf); \
+		printf("-- ERROR [%.03Lf tid=%ld] -- " _x_msg ": %s\n", now_monotonic_ms(), syscall(SYS_gettid), ##__VA_ARGS__, _buf); \
 		LOGGING_UNLOCK; \
 	}
 
 #define LOG_INFO(_x_msg, ...) { \
 		LOGGING_LOCK; \
-		printf("-- INFO  [%.03Lf tid=%ld] -- " _x_msg "\n", now_ms_ld(), syscall(SYS_gettid), ##__VA_ARGS__); \
+		printf("-- INFO  [%.03Lf tid=%ld] -- " _x_msg "\n", now_monotonic_ms(), syscall(SYS_gettid), ##__VA_ARGS__); \
 		LOGGING_UNLOCK; \
 	}
 
 #define LOG_INFO_NOLOCK(_x_msg, ...) { \
-		printf("-- INFO  [%.03Lf tid=%ld] -- " _x_msg "\n", now_ms_ld(), syscall(SYS_gettid), ##__VA_ARGS__); \
+		printf("-- INFO  [%.03Lf tid=%ld] -- " _x_msg "\n", now_monotonic_ms(), syscall(SYS_gettid), ##__VA_ARGS__); \
 	}
 
 #define LOG_PERF(_x_msg, ...) { \
 		if (log_level >= LOG_LEVEL_PERF) { \
 			LOGGING_LOCK; \
-			printf("-- PERF  [%.03Lf tid=%ld] -- " _x_msg "\n", now_ms_ld(), syscall(SYS_gettid), ##__VA_ARGS__); \
+			printf("-- PERF  [%.03Lf tid=%ld] -- " _x_msg "\n", now_monotonic_ms(), syscall(SYS_gettid), ##__VA_ARGS__); \
 			LOGGING_UNLOCK; \
 		} \
 	}
@@ -104,7 +104,7 @@ pthread_mutex_t log_mutex;
 #define LOG_VERBOSE(_x_msg, ...) { \
 		if (log_level >= LOG_LEVEL_VERBOSE) { \
 			LOGGING_LOCK; \
-			printf("-- VERB  [%.03Lf tid=%ld] -- " _x_msg "\n", now_ms_ld(), syscall(SYS_gettid), ##__VA_ARGS__); \
+			printf("-- VERB  [%.03Lf tid=%ld] -- " _x_msg "\n", now_monotonic_ms(), syscall(SYS_gettid), ##__VA_ARGS__); \
 			LOGGING_UNLOCK; \
 		} \
 	}
@@ -112,7 +112,7 @@ pthread_mutex_t log_mutex;
 #define LOG_DEBUG(_x_msg, ...) { \
 		if (log_level >= LOG_LEVEL_DEBUG) { \
 			LOGGING_LOCK; \
-			printf("-- DEBUG [%.03Lf tid=%ld] -- " _x_msg "\n", now_ms_ld(), syscall(SYS_gettid), ##__VA_ARGS__); \
+			printf("-- DEBUG [%.03Lf tid=%ld] -- " _x_msg "\n", now_monotonic_ms(), syscall(SYS_gettid), ##__VA_ARGS__); \
 			LOGGING_UNLOCK; \
 		} \
 	}

src/omx/formatters.h

@@ -35,7 +35,7 @@
 
 #define LOG_OMX_ERROR(_error, _msg, ...) { \
 		LOGGING_LOCK; \
-		printf("-- ERROR [%.03Lf tid=%ld] -- " _msg ": %s\n", now_ms_ld(), \
+		printf("-- ERROR [%.03Lf tid=%ld] -- " _msg ": %s\n", now_monotonic_ms(), \
 			syscall(SYS_gettid), ##__VA_ARGS__, omx_error_to_string(_error)); \
 		LOGGING_UNLOCK; \
 	}

src/stream.c

@@ -169,8 +169,8 @@ void stream_loop(struct stream_t *stream) {
 
 					if (stream->dev->every_frame) {
 						if (frames_count < stream->dev->every_frame - 1) {
-							LOG_DEBUG("Dropping frame %d for option --every-frame=%d", frames_count + 1, stream->dev->every_frame);
+							frames_count += 1;
-							++frames_count;
+							LOG_DEBUG("Dropping frame %d for option --every-frame=%d", frames_count, stream->dev->every_frame);
 							goto pass_frame;
 						}
 						frames_count = 0;
@@ -187,7 +187,7 @@ void stream_loop(struct stream_t *stream) {
 					}
 
 					{
-						long double now = now_ms_ld();
+						long double now = now_monotonic_ms();
 
 						if (now < grab_after) {
 							fluency_passed += 1;
@@ -202,7 +202,7 @@ void stream_loop(struct stream_t *stream) {
 							fps = 0;
 							fps_second = (long long)now;
 						}
-						++fps;
+						fps += 1;
 
 						long double fluency_delay = _stream_get_fluency_delay(stream->dev, &pool);
 
@@ -407,7 +407,7 @@ static void *_stream_worker_thread(void *v_ctx) {
 			long double start_time;
 			long double last_comp_time;
 
-			start_time = now_ms_ld();
+			start_time = now_monotonic_ms();
 
 			LOG_DEBUG("Worker %u compressing JPEG from buffer %d ...", ctx->number, ctx->buf_index);
 
@@ -419,7 +419,7 @@ static void *_stream_worker_thread(void *v_ctx) {
 				*ctx->job_start_time = start_time;
 				*ctx->has_job = false;
 
-				last_comp_time = now_ms_ld() - start_time;
+				last_comp_time = now_monotonic_ms() - start_time;
 
 				A_PTHREAD_M_LOCK(ctx->last_comp_time_mutex);
 				*ctx->last_comp_time = last_comp_time;

src/tools.h

@@ -61,10 +61,10 @@ INLINE unsigned max_u(unsigned a, unsigned b) {
 	return (a > b ? a : b);
 }
 
-INLINE void now_ms(time_t *sec, long *msec) {
+INLINE void now_ms(clockid_t clk_id, time_t *sec, long *msec) {
 	struct timespec spec;
 
-	assert(!clock_gettime(CLOCK_MONOTONIC_RAW, &spec));
+	assert(!clock_gettime(clk_id, &spec));
 	*sec = spec.tv_sec;
 	*msec = round(spec.tv_nsec / 1.0e6);
 
@@ -74,10 +74,18 @@ INLINE void now_ms(time_t *sec, long *msec) {
 	}
 }
 
-INLINE long double now_ms_ld(void) {
+INLINE long double now_monotonic_ms(void) {
 	time_t sec;
 	long msec;
 
-	now_ms(&sec, &msec);
+	now_ms(CLOCK_MONOTONIC_RAW, &sec, &msec);
+	return (long double)sec + ((long double)msec) / 1000;
+}
+
+INLINE long double now_real_ms(void) {
+	time_t sec;
+	long msec;
+
+	now_ms(CLOCK_REALTIME, &sec, &msec);
 	return (long double)sec + ((long double)msec) / 1000;
 }