Bump version: 1.14 → 1.15

.bumpversion.cfg

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

README.md

@@ -32,6 +32,10 @@ If you're going to live-stream from your backyard webcam and need to control it,
 # Building
 You'll need  ```make```, ```gcc```, ```libevent``` with ```pthreads``` support, ```libjpeg8```/```libjpeg-turbo```, ```libuuid``` and ```libbsd``` (only for Linux).
 
+* Arch: `sudo pacman -S libevent libjpeg-turbo libutil-linux libbsd`.
+* Raspbian: `sudo apt install libevent-dev libevent-pthreads-2.1-6-dev libjpeg8-dev uuid-dev libbsd-dev`.
+* Debian: `sudo apt install build-essential libevent-dev libjpeg62-turbo-dev uuid-dev libbsd-dev`.
+
 On Raspberry Pi you can build the program with OpenMAX IL. To do this pass option ```WITH_OMX=1``` to ```make```. To enable GPIO support install [wiringPi](http://wiringpi.com) and pass option ```WITH_GPIO=1```. If the compiler reports about a missing function ```pthread_get_name_np()``` (or similar), add option ```WITH_PTHREAD_NP=0``` (it's enabled by default). For the similar error with ```setproctitle()``` add option ```WITH_SETPROCTITLE=0```.
 
 ```

README.ru.md

@@ -32,6 +32,10 @@
 # Сборка
 Для сборки вам понадобятся ```make```, ```gcc```, ```libevent``` с поддержкой ```pthreads```, ```libjpeg8```/```libjpeg-turbo```, ```libuuid``` и ```libbsd``` (только для Linux).
 
+* Arch: `sudo pacman -S libevent libjpeg-turbo libutil-linux libbsd`.
+* Raspbian: `sudo apt install libevent-dev libevent-pthreads-2.1-6-dev libjpeg8-dev uuid-dev libbsd-dev`.
+* Debian: `sudo apt install build-essential libevent-dev libjpeg62-turbo-dev uuid-dev libbsd-dev`.
+
 На Raspberry Pi программу можно собрать с поддержкой OpenMAX IL. Для этого передайте ```make``` параметр ```WITH_OMX=1```. Для включения сборки с поддержкой GPIO установите [wiringPi](http://wiringpi.com) и добавьте параметр ```WITH_GPIO=1```. Если при сборке компилятор ругается на отсутствие функции ```pthread_get_name_np()``` или другой подобной, добавьте параметр ```WITH_PTHREAD_NP=0``` (по умолчанию он включен). При аналогичной ошибке с функцией ```setproctitle()``` добавьте параметр ```WITH_SETPROCTITLE=0```.
 
 ```

pkg/arch/PKGBUILD

@@ -3,7 +3,7 @@
 
 
 pkgname=ustreamer
-pkgver=1.12
+pkgver=1.15
 pkgrel=1
 pkgdesc="Lightweight and fast MJPG-HTTP streamer"
 url="https://github.com/pikvm/ustreamer"

pkg/openwrt/Makefile

@@ -6,7 +6,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ustreamer
-PKG_VERSION:=1.12
+PKG_VERSION:=1.15
 PKG_RELEASE:=1
 PKG_MAINTAINER:=Maxim Devaev <mdevaev@gmail.com>
 

src/config.h

@@ -23,5 +23,5 @@
 #pragma once
 
 #ifndef VERSION
-#	define VERSION "1.12"
+#	define VERSION "1.15"
 #endif

src/encoders/omx/formatters.c

@@ -35,9 +35,9 @@
 	case _value: { return #_value; }
 
 #define CASE_ASSERT(_msg, _value) default: { \
-		char *_buf; A_CALLOC(_buf, 128); \
-		sprintf(_buf, _msg ": 0x%08x", _value); \
-		assert(0 && _buf); \
+		char *_assert_buf; A_CALLOC(_assert_buf, 128); \
+		sprintf(_assert_buf, _msg ": 0x%08x", _value); \
+		assert(0 && _assert_buf); \
 	}
 
 const char *omx_error_to_string(OMX_ERRORTYPE error) {

src/http/server.c

@@ -50,6 +50,7 @@
 #include "../tools.h"
 #include "../threading.h"
 #include "../logging.h"
+#include "../process.h"
 #include "../picture.h"
 #include "../encoder.h"
 #include "../stream.h"
@@ -176,6 +177,9 @@ int http_server_listen(struct http_server_t *server) {
 	EXPOSED(expose_begin_ts) = get_now_monotonic();
 	EXPOSED(expose_cmp_ts) = EXPOSED(expose_begin_ts);
 	EXPOSED(expose_end_ts) = EXPOSED(expose_begin_ts);
+	// See _http_exposed_refresh()
+	EXPOSED(notify_last_width) = EXPOSED(picture->width);
+	EXPOSED(notify_last_height) = EXPOSED(picture->height);
 #	undef EXPOSED
 
 	{
@@ -791,6 +795,25 @@ static void _http_exposed_refresh(UNUSED int fd, UNUSED short what, void *v_serv
 #	undef UNLOCK_STREAM
 
 	_http_queue_send_stream(server, stream_updated, picture_updated);
+
+#	define EXPOSED(_next) server->run->exposed->_next
+
+	if (
+		picture_updated
+		&& server->notify_parent
+		&& (
+			EXPOSED(notify_last_online) != EXPOSED(online)
+			|| EXPOSED(notify_last_width) != EXPOSED(picture->width)
+			|| EXPOSED(notify_last_height) != EXPOSED(picture->height)
+		)
+	) {
+		EXPOSED(notify_last_online) = EXPOSED(online);
+		EXPOSED(notify_last_width) = EXPOSED(picture->width);
+		EXPOSED(notify_last_height) = EXPOSED(picture->height);
+		process_notify_parent();
+	}
+
+#	undef EXPOSED
 }
 
 static bool _expose_new_picture_unsafe(struct http_server_t *server) {

src/http/server.h

@@ -65,6 +65,10 @@ struct exposed_t {
 	long double			expose_cmp_ts;
 	long double			expose_end_ts;
 	long double			last_as_blank_ts;
+
+	bool		notify_last_online;
+	unsigned	notify_last_width;
+	unsigned	notify_last_height;
 };
 
 struct http_server_runtime_t {
@@ -100,6 +104,8 @@ struct http_server_t {
 	unsigned	fake_width;
 	unsigned	fake_height;
 
+	bool		notify_parent;
+
 	struct http_server_runtime_t *run;
 };
 

src/http/static.c

@@ -30,7 +30,7 @@
 #include <sys/stat.h>
 
 #include "../tools.h"
-// #include "../logging.h"
+#include "../logging.h"
 
 #include "path.h"
 
@@ -42,6 +42,7 @@ char *find_static_file_path(const char *root_path, const char *request_path) {
 
 	simplified_path = simplify_request_path(request_path);
 	if (simplified_path[0] == '\0') {
+		LOG_VERBOSE("HTTP: Invalid request path %s to static", request_path);
 		goto error;
 	}
 
@@ -50,13 +51,14 @@ char *find_static_file_path(const char *root_path, const char *request_path) {
 
 #	define LOAD_STAT { \
 			if (lstat(path, &st) < 0) { \
-				/* LOG_PERROR("Can't stat() file %s", path); */ \
+				LOG_VERBOSE_PERROR("HTTP: Can't stat() static path %s", path); \
 				goto error; \
 			} \
 		}
 
 	LOAD_STAT;
 	if (S_ISDIR(st.st_mode)) {
+		LOG_VERBOSE("HTTP: Requested static path %s is a directory, trying %s/index.html", path, path);
 		strcat(path, "/index.html");
 		LOAD_STAT;
 	}
@@ -64,12 +66,12 @@ char *find_static_file_path(const char *root_path, const char *request_path) {
 #	undef LOAD_STAT
 
 	if (!S_ISREG(st.st_mode)) {
-		// LOG_ERROR("Not a regulary file: %s", path);
+		LOG_VERBOSE("HTTP: Not a regular file: %s", path);
 		goto error;
 	}
 
 	if (access(path, R_OK) < 0) {
-		// LOG_PERROR("Can't access() R_OK file %s", path);
+		LOG_VERBOSE_PERROR("HTTP: Can't access() R_OK file %s", path);
 		goto error;
 	}
 

src/logging.h

@@ -88,14 +88,14 @@ pthread_mutex_t log_mutex;
 
 
 #define LOG_PRINTF_NOLOCK(_label_color, _label, _msg_color, _msg, ...) { \
-		char _buf[MAX_THREAD_NAME] = {0}; \
-		thread_get_name(_buf); \
+		char _tname_buf[MAX_THREAD_NAME] = {0}; \
+		thread_get_name(_tname_buf); \
 		if (log_colored) { \
 			printf(COLOR_GRAY "-- " _label_color _label COLOR_GRAY " [%.03Lf %9s]" " -- " COLOR_RESET _msg_color _msg COLOR_RESET, \
-				get_now_monotonic(), _buf, ##__VA_ARGS__); \
+				get_now_monotonic(), _tname_buf, ##__VA_ARGS__); \
 		} else { \
 			printf("-- " _label " [%.03Lf %9s] -- " _msg, \
-				get_now_monotonic(), _buf, ##__VA_ARGS__); \
+				get_now_monotonic(), _tname_buf, ##__VA_ARGS__); \
 		} \
 		putchar('\n'); \
 		fflush(stdout); \
@@ -112,9 +112,9 @@ pthread_mutex_t log_mutex;
 	}
 
 #define LOG_PERROR(_msg, ...) { \
-		char _buf[1024] = {0}; \
-		char *_ptr = errno_to_string(_buf, 1024); \
-		LOG_ERROR(_msg ": %s", ##__VA_ARGS__, _ptr); \
+		char _perror_buf[1024] = {0}; \
+		char *_perror_ptr = errno_to_string(_perror_buf, 1024); \
+		LOG_ERROR(_msg ": %s", ##__VA_ARGS__, _perror_ptr); \
 	}
 
 #define LOG_INFO(_msg, ...) { \
@@ -143,6 +143,14 @@ pthread_mutex_t log_mutex;
 		} \
 	}
 
+#define LOG_VERBOSE_PERROR(_msg, ...) { \
+		if (log_level >= LOG_LEVEL_VERBOSE) { \
+			char _perror_buf[1024] = {0}; \
+			char *_perror_ptr = errno_to_string(_perror_buf, 1024); \
+			LOG_PRINTF(COLOR_BLUE, "VERB ", COLOR_BLUE, _msg ": %s", ##__VA_ARGS__, _perror_ptr); \
+		} \
+	}
+
 #define LOG_DEBUG(_msg, ...) { \
 		if (log_level >= LOG_LEVEL_DEBUG) { \
 			LOG_PRINTF(COLOR_GRAY, "DEBUG", COLOR_GRAY, _msg, ##__VA_ARGS__); \

src/options.c

@@ -110,6 +110,7 @@ enum _OPT_VALUES {
 #ifdef WITH_SETPROCTITLE
 	_O_PROCESS_NAME_PREFIX,
 #endif
+	_O_NOTIFY_PARENT,
 
 	_O_LOG_LEVEL,
 	_O_PERF,
@@ -180,6 +181,7 @@ static const struct option _LONG_OPTS[] = {
 #ifdef WITH_SETPROCTITLE
 	{"process-name-prefix",		required_argument,	NULL,	_O_PROCESS_NAME_PREFIX},
 #endif
+	{"notify-parent",			no_argument,		NULL,	_O_NOTIFY_PARENT},
 
 	{"log-level",				required_argument,	NULL,	_O_LOG_LEVEL},
 	{"perf",					no_argument,		NULL,	_O_PERF},
@@ -396,6 +398,7 @@ int options_parse(struct options_t *options, struct device_t *dev, struct encode
 #			ifdef WITH_SETPROCTITLE
 			case _O_PROCESS_NAME_PREFIX:	OPT_SET(process_name_prefix, optarg);
 #			endif
+			case _O_NOTIFY_PARENT:			OPT_SET(server->notify_parent, true);
 
 			case _O_LOG_LEVEL:			OPT_NUMBER("--log-level", log_level, LOG_LEVEL_INFO, LOG_LEVEL_DEBUG, 0);
 			case _O_PERF:				OPT_SET(log_level, LOG_LEVEL_PERF);
@@ -612,7 +615,7 @@ static void _help(struct device_t *dev, struct encoder_t *encoder, struct http_s
 	printf("                                  or webcams, it's useless. Default: disabled.\n\n");
 	printf("    -l|--slowdown  ────────────── Slowdown capturing to 1 FPS or less when no stream clients are connected.\n");
 	printf("                                  Useful to reduce CPU consumption. Default: disabled.\n\n");
-	printf("    -R|--fake-resolution <WxH>  ─ Override image resolution for state. Default: disabled.\n\n");
+	printf("    -R|--fake-resolution <WxH>  ─ Override image resolution for the /state. Default: disabled.\n\n");
 	printf("    --server-timeout <sec>  ───── Timeout for client connections. Default: %u.\n\n", server->timeout);
 #ifdef WITH_GPIO
 	printf("GPIO options:\n");
@@ -633,6 +636,8 @@ static void _help(struct device_t *dev, struct encoder_t *encoder, struct http_s
 #ifdef WITH_SETPROCTITLE
 	printf("    --process-name-prefix <str>  ── Set process name prefix which will be displayed in the process list\n");
 	printf("                                    like '<str>: ustreamer --blah-blah-blah'. Default: disabled.\n\n");
+	printf("    --notify-parent  ────────────── Send SIGUSR2 to the parent process when the stream parameters are changed.\n");
+	printf("                                    Checking changes is performed for the online flag and image resolution.\n\n");
 #endif
 	printf("Logging options:\n");
 	printf("════════════════\n");

src/process.h

@@ -22,6 +22,12 @@
 
 #pragma once
 
+#include <signal.h>
+#include <unistd.h>
+
+#include <sys/types.h>
+
+
 #if defined(__linux__)
 #	define HAS_PDEATHSIG
 #elif defined(__FreeBSD__)
@@ -32,19 +38,14 @@
 #endif
 
 
-#ifdef HAS_PDEATHSIG
-#	include <signal.h>
-#	include <unistd.h>
-#endif
 #ifdef WITH_SETPROCTITLE
 #	include <stdlib.h>
 #	include <string.h>
 #	if defined(__linux__)
 #		include <bsd/unistd.h>
-#		include <sys/types.h>
 #	elif (defined(__FreeBSD__) || defined(__DragonFly__))
-#		include <unistd.h>
-#		include <sys/types.h>
+//#		include <unistd.h>
+//#		include <sys/types.h>
 #	elif (defined(__NetBSD__) || defined(__OpenBSD__)) // setproctitle() placed in stdlib.h
 #	else
 #		error setproctitle() not implemented, you can disable it using WITH_SETPROCTITLE=0
@@ -72,6 +73,7 @@ extern char **environ;
 
 #ifdef HAS_PDEATHSIG
 INLINE int process_track_parent_death(void) {
+	pid_t parent = getppid();
 	int signum = SIGTERM;
 #	if defined(__linux__)
 	int retval = prctl(PR_SET_PDEATHSIG, signum);
@@ -85,8 +87,8 @@ INLINE int process_track_parent_death(void) {
 		return -1;
 	}
 
-	if (kill(getppid(), 0) < 0) {
-		LOG_PERROR("The parent process is already dead");
+	if (kill(parent, 0) < 0) {
+		LOG_PERROR("The parent process %d is already dead", parent);
 		return -1;
 	}
 
@@ -128,3 +130,11 @@ INLINE void process_set_name_prefix(int argc, char *argv[], const char *prefix)
 	free(cmdline);
 }
 #endif
+
+INLINE void process_notify_parent(void) {
+	pid_t parent = getppid();
+
+	if (kill(parent, SIGUSR2) < 0) {
+		LOG_PERROR("Can't send SIGUSR2 to the parent process %d", parent);
+	}
+}

src/threading.h

@@ -51,9 +51,9 @@
 
 #ifdef WITH_PTHREAD_NP
 #	define A_THREAD_RENAME(_fmt, ...) { \
-			char _buf[MAX_THREAD_NAME] = {0}; \
-			assert(snprintf(_buf, MAX_THREAD_NAME, _fmt, ##__VA_ARGS__) > 0); \
-			thread_set_name(_buf); \
+			char _new_tname_buf[MAX_THREAD_NAME] = {0}; \
+			assert(snprintf(_new_tname_buf, MAX_THREAD_NAME, _fmt, ##__VA_ARGS__) > 0); \
+			thread_set_name(_new_tname_buf); \
 		}
 #else
 #	define A_THREAD_RENAME(_fmt, ...)