Bump version: 6.54 → 6.55

According to N2176 of ISO/IEC 9899:2017 §5.1.2.2.1 ¶2:

> - argv[argc] shall be a null pointer.

Possibly fixes openwrt/packages#28472.

.bumpversion.cfg

@@ -1,7 +1,7 @@
 [bumpversion]
 commit = True
 tag = True
-current_version = 5.54
+current_version = 6.55
 parse = (?P<major>\d+)\.(?P<minor>\d+)
 serialize = 
 	{major}.{minor}

.github/workflows/docker-alpine-image.yaml

@@ -66,7 +66,7 @@ jobs:
         uses: docker/build-push-action@v3
         with:
           context: .
-          platforms: linux/arm64,linux/amd64,linux/arm/v7
+          platforms: linux/arm64,linux/amd64,linux/arm/v6,linux/arm/v7
           file: pkg/docker/Dockerfile.alpine
       -
         name: Push

.gitignore

@@ -3,11 +3,12 @@
 /pkg/arch/pkg/
 /pkg/arch/src/
 /src/build/
-/python/build/
+/python/dist/
 /python/ustreamer.egg-info/
+/python/root/
 /janus/build/
 /ustreamer
-/ustreamer-dump
+/ustreamer-*
 /config.mk
 vgcore.*
 *.sock

Makefile

@@ -1,47 +1,78 @@
 -include config.mk
 
+
+# =====
 DESTDIR ?=
 PREFIX ?= /usr/local
 MANPREFIX ?= $(PREFIX)/share/man
 
 CC ?= gcc
 PY ?= python3
+PKG_CONFIG ?= pkg-config
 CFLAGS ?= -O3
 LDFLAGS ?=
 
+R_DESTDIR = $(if $(DESTDIR),$(shell realpath "$(DESTDIR)"),)
+
+WITH_PYTHON ?= 0
+WITH_JANUS ?= 0
+WITH_V4P ?= 0
+WITH_GPIO ?= 0
+WITH_SYSTEMD ?= 0
+WITH_PTHREAD_NP ?= 1
+WITH_SETPROCTITLE ?= 1
+WITH_PDEATHSIG ?= 1
+
+define optbool
+$(filter $(shell echo $(1) | tr A-Z a-z), yes on 1)
+endef
+MK_WITH_PYTHON = $(call optbool,$(WITH_PYTHON))
+MK_WITH_JANUS = $(call optbool,$(WITH_JANUS))
+MK_WITH_V4P = $(call optbool,$(WITH_V4P))
+MK_WITH_GPIO = $(call optbool,$(WITH_GPIO))
+MK_WITH_SYSTEMD = $(call optbool,$(WITH_SYSTEMD))
+MK_WITH_PTHREAD_NP = $(call optbool,$(WITH_PTHREAD_NP))
+MK_WITH_SETPROCTITLE = $(call optbool,$(WITH_SETPROCTITLE))
+MK_WITH_PDEATHSIG = $(call optbool,$(WITH_PDEATHSIG))
+
 export
 
 _LINTERS_IMAGE ?= ustreamer-linters
 
 
 # =====
-define optbool
-$(filter $(shell echo $(1) | tr A-Z a-z), yes on 1)
-endef
+ifeq (__not_found__,$(shell which $(PKG_CONFIG) 2>/dev/null || echo "__not_found__"))
+$(error "No $(PKG_CONFIG) found in $(PATH)")
+endif
 
+
+# =====
 ifeq ($(V),)
 	ECHO = @
 endif
 
+
 # =====
 all:
 	+ $(MAKE) apps
-ifneq ($(call optbool,$(WITH_PYTHON)),)
+ifneq ($(MK_WITH_PYTHON),)
 	+ $(MAKE) python
 endif
-ifneq ($(call optbool,$(WITH_JANUS)),)
+ifneq ($(MK_WITH_JANUS),)
 	+ $(MAKE) janus
 endif
 
 
 apps:
 	$(MAKE) -C src
-	$(ECHO) ln -sf src/*.bin .
+	for i in src/*.bin; do \
+		test ! -x $$i || ln -sf $$i `basename $$i .bin`; \
+	done
 
 
 python:
 	$(MAKE) -C python
-	$(ECHO) ln -sf python/build/lib.*/*.so .
+	$(ECHO) ln -sf python/root/usr/lib/python*/site-packages/*.so .
 
 
 janus:
@@ -51,16 +82,16 @@ janus:
 
 install: all
 	$(MAKE) -C src install
-ifneq ($(call optbool,$(WITH_PYTHON)),)
+ifneq ($(MK_WITH_PYTHON),)
 	$(MAKE) -C python install
 endif
-ifneq ($(call optbool,$(WITH_JANUS)),)
+ifneq ($(MK_WITH_JANUS),)
 	$(MAKE) -C janus install
 endif
-	mkdir -p $(DESTDIR)$(MANPREFIX)/man1
+	mkdir -p $(R_DESTDIR)$(MANPREFIX)/man1
 	for man in $(shell ls man); do \
-		install -m644 man/$$man $(DESTDIR)$(MANPREFIX)/man1/$$man; \
-		gzip -f $(DESTDIR)$(MANPREFIX)/man1/$$man; \
+		install -m644 man/$$man $(R_DESTDIR)$(MANPREFIX)/man1/$$man; \
+		gzip -f $(R_DESTDIR)$(MANPREFIX)/man1/$$man; \
 	done
 
 
@@ -69,9 +100,8 @@ install-strip: install
 
 
 regen:
-	tools/$(MAKE)-jpeg-h.py src/ustreamer/data/blank.jpeg src/ustreamer/data/blank_jpeg.c BLANK
-	tools/$(MAKE)-ico-h.py src/ustreamer/data/favicon.ico src/ustreamer/data/favicon_ico.c FAVICON
-	tools/$(MAKE)-html-h.py src/ustreamer/data/index.html src/ustreamer/data/index_html.c INDEX
+	tools/make-ico-h.py src/ustreamer/data/favicon.ico src/ustreamer/data/favicon_ico.c FAVICON
+	tools/make-html-h.py src/ustreamer/data/index.html src/ustreamer/data/index_html.c INDEX
 
 
 release:
@@ -118,7 +148,7 @@ clean-all: linters clean
 
 clean:
 	rm -rf pkg/arch/pkg pkg/arch/src pkg/arch/v*.tar.gz pkg/arch/ustreamer-*.pkg.tar.{xz,zst}
-	rm -f *.bin *.so
+	rm -f ustreamer ustreamer-* *.so
 	$(MAKE) -C src clean
 	$(MAKE) -C python clean
 	$(MAKE) -C janus clean

README.md

@@ -11,7 +11,7 @@
 |----------|---------------|-------------------|
 | Multithreaded JPEG encoding | ✔ | ✘ |
 | Hardware image encoding<br>on Raspberry Pi | ✔ | ✘ |
-| Behavior when the device<br>is disconnected while streaming | ✔ Shows a black screen<br>with ```NO SIGNAL``` on it<br>until reconnected | ✘ Stops the streaming <sup>1</sup> |
+| Behavior when the device<br>is disconnected while streaming | ✔ Shows a black screen<br>with ```NO LIVE VIDEO``` on it<br>until reconnected | ✘ Stops the streaming <sup>1</sup> |
 | [DV-timings](https://linuxtv.org/downloads/v4l-dvb-apis-new/userspace-api/v4l/dv-timings.html) support -<br>the ability to change resolution<br>on the fly by source signal | ✔ | ☹ Partially yes <sup>1</sup> |
 | Option to skip frames when streaming<br>static images by HTTP to save the traffic | ✔ <sup>2</sup> | ✘ |
 | Streaming via UNIX domain socket | ✔ | ✘ |
@@ -23,7 +23,7 @@
 | Compatibility with mjpg-streamer's API | ✔ | :) |
 
 Footnotes:
-  * ```1``` Long before µStreamer, I made a [patch](https://github.com/jacksonliam/mjpg-streamer/pull/164) to add DV-timings support to mjpg-streamer and to keep it from hanging up no device disconnection. Alas, the patch is far from perfect and I can't guarantee it will work every time - mjpg-streamer's source code is very complicated and its structure is hard to understand. With this in mind, along with needing multithreading and JPEG hardware acceleration in the future, I decided to make my own stream server from scratch instead of supporting legacy code.
+  * ```1``` Long before µStreamer, I made a [patch](https://github.com/jacksonliam/mjpg-streamer/pull/164) to add DV-timings support to mjpg-streamer and to keep it from hanging up on device disconnection. Alas, the patch is far from perfect and I can't guarantee it will work every time - mjpg-streamer's source code is very complicated and its structure is hard to understand. With this in mind, along with needing multithreading and JPEG hardware acceleration in the future, I decided to make my own stream server from scratch instead of supporting legacy code.
 
   * ```2``` This feature allows to cut down outgoing traffic several-fold when streaming HDMI, but it increases CPU usage a little bit. The idea is that HDMI is a fully digital interface and each captured frame can be identical to the previous one byte-wise. There's no need to stream the same image over the net several times a second. With the `--drop-same-frames=20` option enabled, µStreamer will drop all the matching frames (with a limit of 20 in a row). Each new frame is matched with the previous one first by length, then using ```memcmp()```.
 
@@ -35,16 +35,17 @@ If you're going to live-stream from your backyard webcam and need to control it,
 # Installation
 
 ## Building
-You need to download the µStreamer onto your system and build it from the sources.
+You need to download the µStreamer onto your system and build it from the sources, or use a package:
 
-* AUR has a package for Arch Linux: https://aur.archlinux.org/packages/ustreamer.
-* Fedora: https://src.fedoraproject.org/rpms/ustreamer.
-* Ubuntu: https://packages.ubuntu.com/jammy/ustreamer.
+* Arch Linux: https://aur.archlinux.org/packages/ustreamer
+* Fedora: https://src.fedoraproject.org/rpms/ustreamer
+* Ubuntu: https://packages.ubuntu.com/jammy/ustreamer
 * Debian: https://packages.debian.org/sid/ustreamer
-* FreeBSD port: https://www.freshports.org/multimedia/ustreamer.
+* OpenWRT: https://github.com/openwrt/packages/tree/master/multimedia/ustreamer
+* FreeBSD port: https://www.freshports.org/multimedia/ustreamer
 
 ### Preconditions
-You'll need  ```make```, ```gcc```, ```libevent``` with ```pthreads``` support, ```libjpeg9```/```libjpeg-turbo``` and ```libbsd``` (only for Linux).
+You'll need  ```make```, ```gcc```, ```pkg-config```, ```libevent``` with ```pthreads``` support, ```libjpeg9```/```libjpeg-turbo``` and ```libbsd``` (only for Linux).
 
 * Arch: `sudo pacman -S libevent libjpeg-turbo libutil-linux libbsd`.
 * Raspberry OS Bullseye: `sudo apt install libevent-dev libjpeg62-turbo libbsd-dev`. Add `libgpiod-dev` for `WITH_GPIO=1` and `libsystemd-dev` for `WITH_SYSTEMD=1` and `libasound2-dev libspeex-dev libspeexdsp-dev libopus-dev` for `WITH_JANUS=1`.
@@ -85,13 +86,13 @@ Without arguments, ```ustreamer``` will try to open ```/dev/video0``` with 640x4
 
 :exclamation: Please note that since µStreamer v2.0 cross-domain requests were disabled by default for [security reasons](https://developer.mozilla.org/en-US/docs/Web/HTTP/CORS). To enable the old behavior, use the option `--allow-origin=\*`.
 
-The recommended way of running µStreamer with [Auvidea B101](https://www.raspberrypi.org/forums/viewtopic.php?f=38&t=120702&start=400#p1339178) on Raspberry Pi:
+The recommended way of running µStreamer with [TC358743-based capture device](https://www.raspberrypi.org/forums/viewtopic.php?f=38&t=120702&start=400#p1339178) on Raspberry Pi:
 ```
 $ ./ustreamer \
     --format=uyvy \ # Device input format
     --encoder=m2m-image \ # Hardware encoding on V4L2 M2M driver
     --workers=3 \ # Workers number
-    --persistent \ # Don't re-initialize device on timeout (for example when HDMI cable was disconnected)
+    --persistent \ # Suppress repetitive signal source errors (for example when HDMI cable was disconnected)
     --dv-timings \ # Use DV-timings
     --drop-same-frames=30 # Save the traffic
 ```
@@ -209,7 +210,7 @@ v4l2 utilities provide the tools to manage USB webcam setting and information. S
 
 -----
 # License
-Copyright (C) 2018-2023 by Maxim Devaev mdevaev@gmail.com
+Copyright (C) 2018-2024 by 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

janus/Makefile

@@ -1,7 +1,8 @@
-DESTDIR ?=
+R_DESTDIR ?=
 PREFIX ?= /usr/local
 
 CC ?= gcc
+PKG_CONFIG ?= pkg-config
 CFLAGS ?= -O3
 LDFLAGS ?=
 
@@ -9,21 +10,20 @@ LDFLAGS ?=
 # =====
 _PLUGIN = libjanus_ustreamer.so
 
-_CFLAGS = -fPIC -MD -c -std=c17 -Wall -Wextra -D_GNU_SOURCE $(shell pkg-config --cflags glib-2.0) $(CFLAGS)
-_LDFLAGS = -shared -lm -pthread -lrt -ljansson -lopus -lasound -lspeexdsp $(shell pkg-config --libs glib-2.0) $(LDFLAGS)
+_CFLAGS = -fPIC -MD -c -std=c17 -Wall -Wextra -D_GNU_SOURCE $(shell $(PKG_CONFIG) --cflags janus-gateway) $(CFLAGS)
+_LDFLAGS = -shared -lm -pthread -lrt -ljansson -lopus -lasound -lspeexdsp $(shell $(PKG_CONFIG) --libs janus-gateway) $(LDFLAGS)
 
 _SRCS = $(shell ls src/uslibs/*.c src/*.c)
 
 _BUILD = build
 
 
-define optbool
-$(filter $(shell echo $(1) | tr A-Z a-z), yes on 1)
-endef
+# =====
+ifeq ($(findstring bsd,$(shell $(CC) -dumpmachine)),)
+override _LDFLAGS += -latomic
+endif
 
-
-WITH_PTHREAD_NP ?= 1
-ifneq ($(call optbool,$(WITH_PTHREAD_NP)),)
+ifneq ($(MK_WITH_PTHREAD_NP),)
 override _CFLAGS += -DWITH_PTHREAD_NP
 endif
 
@@ -42,8 +42,8 @@ $(_BUILD)/%.o: %.c
 
 
 install: $(_PLUGIN)
-	mkdir -p $(DESTDIR)$(PREFIX)/lib/ustreamer/janus
-	install -m755 $(_PLUGIN) $(DESTDIR)$(PREFIX)/lib/ustreamer/janus/$(PLUGIN)
+	mkdir -p $(R_DESTDIR)$(PREFIX)/lib/ustreamer/janus
+	install -m755 $(_PLUGIN) $(R_DESTDIR)$(PREFIX)/lib/ustreamer/janus/$(PLUGIN)
 
 
 clean:

janus/src/acap.c

@@ -0,0 +1,243 @@
+/*****************************************************************************
+#                                                                            #
+#    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 "acap.h"
+
+#include <stdlib.h>
+#include <stdatomic.h>
+#include <assert.h>
+
+#include <pthread.h>
+#include <alsa/asoundlib.h>
+#include <speex/speex_resampler.h>
+#include <opus/opus.h>
+
+#include "uslibs/types.h"
+#include "uslibs/errors.h"
+#include "uslibs/tools.h"
+#include "uslibs/array.h"
+#include "uslibs/ring.h"
+#include "uslibs/threading.h"
+
+#include "rtp.h"
+#include "au.h"
+#include "logging.h"
+
+
+static void *_pcm_thread(void *v_acap);
+static void *_encoder_thread(void *v_acap);
+
+
+us_acap_s *us_acap_init(const char *name, uint pcm_hz) {
+	us_acap_s *acap;
+	US_CALLOC(acap, 1);
+	acap->pcm_hz = pcm_hz;
+	US_RING_INIT_WITH_ITEMS(acap->pcm_ring, 8, us_au_pcm_init);
+	US_RING_INIT_WITH_ITEMS(acap->enc_ring, 8, us_au_encoded_init);
+	atomic_init(&acap->stop, false);
+
+	int err;
+
+	{
+		if ((err = snd_pcm_open(&acap->dev, name, SND_PCM_STREAM_CAPTURE, 0)) < 0) {
+			acap->dev = NULL;
+			US_JLOG_PERROR_ALSA(err, "acap", "Can't open PCM capture");
+			goto error;
+		}
+		assert(!snd_pcm_hw_params_malloc(&acap->dev_params));
+
+#		define SET_PARAM(_msg, _func, ...) { \
+				if ((err = _func(acap->dev, acap->dev_params, ##__VA_ARGS__)) < 0) { \
+					US_JLOG_PERROR_ALSA(err, "acap", _msg); \
+					goto error; \
+				} \
+			}
+
+		SET_PARAM("Can't initialize PCM params",	snd_pcm_hw_params_any);
+		SET_PARAM("Can't set PCM access type",		snd_pcm_hw_params_set_access, SND_PCM_ACCESS_RW_INTERLEAVED);
+		SET_PARAM("Can't set PCM channels number",	snd_pcm_hw_params_set_channels, US_RTP_OPUS_CH);
+		SET_PARAM("Can't set PCM sampling format",	snd_pcm_hw_params_set_format, SND_PCM_FORMAT_S16_LE);
+		SET_PARAM("Can't set PCM sampling rate",	snd_pcm_hw_params_set_rate_near, &acap->pcm_hz, 0);
+		if (acap->pcm_hz < US_AU_MIN_PCM_HZ || acap->pcm_hz > US_AU_MAX_PCM_HZ) {
+			US_JLOG_ERROR("acap", "Unsupported PCM freq: %u; should be: %u <= F <= %u",
+				acap->pcm_hz, US_AU_MIN_PCM_HZ, US_AU_MAX_PCM_HZ);
+			goto error;
+		}
+		acap->pcm_frames = US_AU_HZ_TO_FRAMES(acap->pcm_hz);
+		acap->pcm_size = US_AU_HZ_TO_BUF8(acap->pcm_hz);
+		SET_PARAM("Can't apply PCM params", snd_pcm_hw_params);
+
+#		undef SET_PARAM
+	}
+
+	if (acap->pcm_hz != US_RTP_OPUS_HZ) {
+		acap->res = speex_resampler_init(US_RTP_OPUS_CH, acap->pcm_hz, US_RTP_OPUS_HZ, SPEEX_RESAMPLER_QUALITY_DESKTOP, &err);
+		if (err < 0) {
+			acap->res = NULL;
+			US_JLOG_PERROR_RES(err, "acap", "Can't create resampler");
+			goto error;
+		}
+	}
+
+	{
+		// OPUS_APPLICATION_VOIP, OPUS_APPLICATION_RESTRICTED_LOWDELAY
+		acap->enc = opus_encoder_create(US_RTP_OPUS_HZ, US_RTP_OPUS_CH, OPUS_APPLICATION_AUDIO, &err);
+		assert(err == 0);
+		// https://github.com/meetecho/janus-gateway/blob/3cdd6ff/src/plugins/janus_audiobridge.c#L2272
+		// https://datatracker.ietf.org/doc/html/rfc7587#section-3.1.1
+		assert(!opus_encoder_ctl(acap->enc, OPUS_SET_BITRATE(128000)));
+		assert(!opus_encoder_ctl(acap->enc, OPUS_SET_MAX_BANDWIDTH(OPUS_BANDWIDTH_FULLBAND)));
+		assert(!opus_encoder_ctl(acap->enc, OPUS_SET_SIGNAL(OPUS_SIGNAL_MUSIC)));
+		// OPUS_SET_INBAND_FEC(1), OPUS_SET_PACKET_LOSS_PERC(10): see rtpa.c
+	}
+
+	US_JLOG_INFO("acap", "Capture configured on %uHz; capturing ...", acap->pcm_hz);
+	acap->tids_created = true;
+	US_THREAD_CREATE(acap->enc_tid, _encoder_thread, acap);
+	US_THREAD_CREATE(acap->pcm_tid, _pcm_thread, acap);
+
+	return acap;
+
+	error:
+		us_acap_destroy(acap);
+		return NULL;
+}
+
+void us_acap_destroy(us_acap_s *acap) {
+	if (acap->tids_created) {
+		atomic_store(&acap->stop, true);
+		US_THREAD_JOIN(acap->pcm_tid);
+		US_THREAD_JOIN(acap->enc_tid);
+	}
+	US_DELETE(acap->enc, opus_encoder_destroy);
+	US_DELETE(acap->res, speex_resampler_destroy);
+	US_DELETE(acap->dev, snd_pcm_close);
+	US_DELETE(acap->dev_params, snd_pcm_hw_params_free);
+	US_RING_DELETE_WITH_ITEMS(acap->enc_ring, us_au_encoded_destroy);
+	US_RING_DELETE_WITH_ITEMS(acap->pcm_ring, us_au_pcm_destroy);
+	if (acap->tids_created) {
+		US_JLOG_INFO("acap", "Capture closed");
+	}
+	free(acap);
+}
+
+int us_acap_get_encoded(us_acap_s *acap, u8 *data, uz *size, u64 *pts) {
+	if (atomic_load(&acap->stop)) {
+		return -1;
+	}
+	const int ri = us_ring_consumer_acquire(acap->enc_ring, 0.1);
+	if (ri < 0) {
+		return US_ERROR_NO_DATA;
+	}
+	const us_au_encoded_s *const buf = acap->enc_ring->items[ri];
+	if (buf->used == 0 || *size < buf->used) {
+		us_ring_consumer_release(acap->enc_ring, ri);
+		return US_ERROR_NO_DATA;
+	}
+	memcpy(data, buf->data, buf->used);
+	*size = buf->used;
+	*pts = buf->pts;
+	us_ring_consumer_release(acap->enc_ring, ri);
+	return 0;
+}
+
+static void *_pcm_thread(void *v_acap) {
+	US_THREAD_SETTLE("us_ac_pcm");
+
+	us_acap_s *const acap = v_acap;
+	u8 in[US_AU_MAX_BUF8];
+
+	while (!atomic_load(&acap->stop)) {
+		const int frames = snd_pcm_readi(acap->dev, in, acap->pcm_frames);
+		if (frames < 0) {
+			US_JLOG_PERROR_ALSA(frames, "acap", "Fatal: Can't capture PCM frames");
+			break;
+		} else if (frames < (int)acap->pcm_frames) {
+			US_JLOG_ERROR("acap", "Fatal: Too few PCM frames captured");
+			break;
+		}
+
+		const int ri = us_ring_producer_acquire(acap->pcm_ring, 0);
+		if (ri >= 0) {
+			us_au_pcm_s *const out = acap->pcm_ring->items[ri];
+			memcpy(out->data, in, acap->pcm_size);
+			us_ring_producer_release(acap->pcm_ring, ri);
+		} else {
+			US_JLOG_ERROR("acap", "PCM ring is full");
+		}
+	}
+
+	atomic_store(&acap->stop, true);
+	return NULL;
+}
+
+static void *_encoder_thread(void *v_acap) {
+	US_THREAD_SETTLE("us_ac_enc");
+
+	us_acap_s *const acap = v_acap;
+	s16 in_res[US_AU_MAX_BUF16];
+
+	while (!atomic_load(&acap->stop)) {
+		const int in_ri = us_ring_consumer_acquire(acap->pcm_ring, 0.1);
+		if (in_ri < 0) {
+			continue;
+		}
+		us_au_pcm_s *const in = acap->pcm_ring->items[in_ri];
+
+		s16 *in_ptr;
+		if (acap->res != NULL) {
+			assert(acap->pcm_hz != US_RTP_OPUS_HZ);
+			u32 in_count = acap->pcm_frames;
+			u32 out_count = US_AU_HZ_TO_FRAMES(US_RTP_OPUS_HZ);
+			speex_resampler_process_interleaved_int(acap->res, in->data, &in_count, in_res, &out_count);
+			in_ptr = in_res;
+		} else {
+			assert(acap->pcm_hz == US_RTP_OPUS_HZ);
+			in_ptr = in->data;
+		}
+
+		const int out_ri = us_ring_producer_acquire(acap->enc_ring, 0);
+		if (out_ri < 0) {
+			US_JLOG_ERROR("acap", "OPUS encoder queue is full");
+			us_ring_consumer_release(acap->pcm_ring, in_ri);
+			continue;
+		}
+		us_au_encoded_s *const out = acap->enc_ring->items[out_ri];
+
+		const int size = opus_encode(acap->enc, in_ptr, US_AU_HZ_TO_FRAMES(US_RTP_OPUS_HZ), out->data, US_ARRAY_LEN(out->data));
+		us_ring_consumer_release(acap->pcm_ring, in_ri);
+
+		if (size > 0) {
+			out->used = size;
+			out->pts = acap->pts;
+			// https://datatracker.ietf.org/doc/html/rfc7587#section-4.2
+			acap->pts += US_AU_HZ_TO_FRAMES(US_RTP_OPUS_HZ);
+		} else {
+			out->used = 0;
+			US_JLOG_PERROR_OPUS(size, "acap", "Fatal: Can't encode PCM frame to OPUS");
+		}
+		us_ring_producer_release(acap->enc_ring, out_ri);
+	}
+
+	atomic_store(&acap->stop, true);
+	return NULL;
+}

janus/src/acap.h

@@ -2,7 +2,7 @@
 #                                                                            #
 #    uStreamer - Lightweight and fast MJPEG-HTTP streamer.                   #
 #                                                                            #
-#    Copyright (C) 2018-2023  Maxim Devaev <mdevaev@gmail.com>               #
+#    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    #
@@ -22,28 +22,38 @@
 
 #pragma once
 
-#include <stdbool.h>
 #include <stdatomic.h>
-#include <assert.h>
 
-#include "../libs/tools.h"
-#include "../libs/logging.h"
-#include "../libs/frame.h"
-#include "../libs/memsink.h"
-#include "../libs/unjpeg.h"
-#include "m2m.h"
+#include <pthread.h>
+#include <alsa/asoundlib.h>
+#include <speex/speex_resampler.h>
+#include <opus/opus.h>
+
+#include "uslibs/types.h"
+#include "uslibs/ring.h"
 
 
 typedef struct {
-	us_memsink_s		*sink;
-	bool				key_requested;
-	us_frame_s			*tmp_src;
-	us_frame_s			*dest;
-	us_m2m_encoder_s	*enc;
-	atomic_bool			online;
-} us_h264_stream_s;
+	snd_pcm_t			*dev;
+	uint				pcm_hz;
+	uint				pcm_frames;
+	uz					pcm_size;
+	snd_pcm_hw_params_t	*dev_params;
+	SpeexResamplerState	*res;
+	OpusEncoder			*enc;
+
+	us_ring_s		*pcm_ring;
+	us_ring_s		*enc_ring;
+	u32				pts;
+
+	pthread_t		pcm_tid;
+	pthread_t		enc_tid;
+	bool			tids_created;
+	atomic_bool		stop;
+} us_acap_s;
 
 
-us_h264_stream_s *us_h264_stream_init(us_memsink_s *sink, const char *path, unsigned bitrate, unsigned gop);
-void us_h264_stream_destroy(us_h264_stream_s *h264);
-void us_h264_stream_process(us_h264_stream_s *h264, const us_frame_s *frame, bool force_key);
+us_acap_s *us_acap_init(const char *name, uint pcm_hz);
+void us_acap_destroy(us_acap_s *acap);
+
+int us_acap_get_encoded(us_acap_s *acap, u8 *data, uz *size, u64 *pts);

janus/src/au.c

@@ -0,0 +1,151 @@
+/*****************************************************************************
+#                                                                            #
+#    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 "au.h"
+
+#include <stdlib.h>
+#include <string.h>
+#include <ctype.h>
+
+#include <sys/stat.h>
+
+#include "uslibs/tools.h"
+
+
+bool us_au_probe(const char *name) {
+	// This function is very limited. It takes something like:
+	//   hw:0,0 or hw:tc358743,0 or plughw:UAC2Gadget,0
+	// parses card name (0, tc358743, UAC2Gadget) and checks
+	// the existence of it in /proc/asound/.
+	// It's enough for our case.
+
+	if (name == NULL) {
+		return false;
+	}
+
+	if (strchr(name, '/') || strchr(name, '.')) {
+		return false;
+	}
+
+	const char *begin = strchr(name, ':');
+	if (begin == NULL) {
+		return false;
+	}
+	begin += 1;
+	if (*begin == '\0') {
+		return false;
+	}
+
+	const char *end = strchr(begin, ',');
+	if (end == NULL) {
+		return false;
+	}
+	if (end - begin < 1) {
+		return false;
+	}
+
+	char *card = us_strdup(begin);
+	card[end - begin] = '\0';
+
+	bool numeric = true;
+	for (uz index = 0; card[index] != '\0'; ++index) {
+		if (!isdigit(card[index])) {
+			numeric = false;
+			break;
+		}
+	}
+
+	char *path;
+	if (numeric) {
+		US_ASPRINTF(path, "/proc/asound/card%s", card);
+	} else {
+		US_ASPRINTF(path, "/proc/asound/%s", card);
+	}
+
+	bool ok = false;
+	struct stat st;
+	if (lstat(path, &st) == 0) {
+		if (numeric && S_ISDIR(st.st_mode)) {
+			ok = true;
+		} else if (!numeric && S_ISLNK(st.st_mode)) {
+			ok = true;
+		}
+	}
+	free(path);
+	free(card);
+	return ok;
+}
+
+us_au_pcm_s *us_au_pcm_init(void) {
+	us_au_pcm_s *pcm;
+	US_CALLOC(pcm, 1);
+	return pcm;
+}
+
+void us_au_pcm_destroy(us_au_pcm_s *pcm) {
+	free(pcm);
+}
+
+void us_au_pcm_mix(us_au_pcm_s *dest, us_au_pcm_s *src) {
+	const uz size = src->frames * US_RTP_OPUS_CH * 2; // 2 for 16 bit
+
+	if (src->frames == 0) {
+		return;
+
+	} else if (dest->frames == 0) {
+		memcpy(dest->data, src->data, size);
+		dest->frames = src->frames;
+
+	} else if (dest->frames == src->frames) {
+		// https://stackoverflow.com/questions/12089662
+		for (uz index = 0; index < size; ++index) {
+			int a = dest->data[index];
+			int b = src->data[index];
+			int m;
+
+			a += 32768;
+			b += 32768;
+
+			if ((a < 32768) && (b < 32768)) {
+				m = a * b / 32768;
+			} else {
+				m = 2 * (a + b) - (a * b) / 32768 - 65536;
+			}
+			if (m == 65536) {
+				m = 65535;
+			}
+			m -= 32768;
+
+			dest->data[index] = m;
+		}
+	}
+}
+
+us_au_encoded_s *us_au_encoded_init(void) {
+	us_au_encoded_s *enc;
+	US_CALLOC(enc, 1);
+	return enc;
+}
+
+void us_au_encoded_destroy(us_au_encoded_s *enc) {
+	free(enc);
+}

janus/src/au.h

@@ -0,0 +1,61 @@
+/*****************************************************************************
+#                                                                            #
+#    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/>.  #
+#                                                                            #
+*****************************************************************************/
+
+
+#pragma once
+
+#include "uslibs/types.h"
+
+#include "rtp.h"
+
+// A number of frames per 1 channel:
+//   - https://github.com/xiph/opus/blob/7b05f44/src/opus_demo.c#L368
+#define US_AU_FRAME_MS			20
+// #define _HZ_TO_FRAMES(_hz)	(6 * (_hz) / 50) // 120ms
+#define US_AU_HZ_TO_FRAMES(_hz)	((_hz) / 50) // 20ms
+#define US_AU_HZ_TO_BUF16(_hz)	(US_AU_HZ_TO_FRAMES(_hz) * US_RTP_OPUS_CH) // ... * 2: One stereo frame = (16bit L) + (16bit R)
+#define US_AU_HZ_TO_BUF8(_hz)	(US_AU_HZ_TO_BUF16(_hz) * sizeof(s16))
+
+#define US_AU_MIN_PCM_HZ		8000
+#define US_AU_MAX_PCM_HZ		192000
+#define US_AU_MAX_BUF16			US_AU_HZ_TO_BUF16(US_AU_MAX_PCM_HZ)
+#define US_AU_MAX_BUF8			US_AU_HZ_TO_BUF8(US_AU_MAX_PCM_HZ)
+
+
+typedef struct {
+	s16		data[US_AU_MAX_BUF16];
+	uz		frames;
+} us_au_pcm_s;
+
+typedef struct {
+	u8		data[US_RTP_PAYLOAD_SIZE];
+	uz		used;
+	u64		pts;
+} us_au_encoded_s;
+
+bool us_au_probe(const char *name);
+
+us_au_pcm_s *us_au_pcm_init(void);
+void us_au_pcm_destroy(us_au_pcm_s *pcm);
+void us_au_pcm_mix(us_au_pcm_s *a, us_au_pcm_s *b);
+
+us_au_encoded_s *us_au_encoded_init(void);
+void us_au_encoded_destroy(us_au_encoded_s *enc);

janus/src/audio.c

@@ -1,255 +0,0 @@
-/*****************************************************************************
-#                                                                            #
-#    uStreamer - Lightweight and fast MJPEG-HTTP streamer.                   #
-#                                                                            #
-#    Copyright (C) 2018-2023  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 "audio.h"
-
-
-#define _JLOG_PERROR_ALSA(_err, _prefix, _msg, ...)	US_JLOG_ERROR(_prefix, _msg ": %s", ##__VA_ARGS__, snd_strerror(_err))
-#define _JLOG_PERROR_RES(_err, _prefix, _msg, ...)	US_JLOG_ERROR(_prefix, _msg ": %s", ##__VA_ARGS__, speex_resampler_strerror(_err))
-#define _JLOG_PERROR_OPUS(_err, _prefix, _msg, ...)	US_JLOG_ERROR(_prefix, _msg ": %s", ##__VA_ARGS__, opus_strerror(_err))
-
-// A number of frames per 1 channel:
-//   - https://github.com/xiph/opus/blob/7b05f44/src/opus_demo.c#L368
-#define _HZ_TO_FRAMES(_hz)	(6 * (_hz) / 50) // 120ms
-#define _HZ_TO_BUF16(_hz)	(_HZ_TO_FRAMES(_hz) * 2) // One stereo frame = (16bit L) + (16bit R)
-#define _HZ_TO_BUF8(_hz)	(_HZ_TO_BUF16(_hz) * sizeof(int16_t))
-
-#define _MIN_PCM_HZ			8000
-#define _MAX_PCM_HZ			192000
-#define _MAX_BUF16			_HZ_TO_BUF16(_MAX_PCM_HZ)
-#define _MAX_BUF8			_HZ_TO_BUF8(_MAX_PCM_HZ)
-#define _ENCODER_INPUT_HZ	48000
-
-
-typedef struct {
-	int16_t		data[_MAX_BUF16];
-} _pcm_buffer_s;
-
-typedef struct {
-	uint8_t		data[_MAX_BUF8]; // Worst case
-	size_t		used;
-	uint64_t	pts;
-} _enc_buffer_s;
-
-
-static void *_pcm_thread(void *v_audio);
-static void *_encoder_thread(void *v_audio);
-
-
-bool us_audio_probe(const char *name) {
-	snd_pcm_t *pcm;
-	int err;
-	US_JLOG_INFO("audio", "Probing PCM capture ...");
-	if ((err = snd_pcm_open(&pcm, name, SND_PCM_STREAM_CAPTURE, 0)) < 0) {
-		_JLOG_PERROR_ALSA(err, "audio", "Can't probe PCM capture");
-		return false;
-	}
-	snd_pcm_close(pcm);
-	US_JLOG_INFO("audio", "PCM capture is available");
-	return true;
-}
-
-us_audio_s *us_audio_init(const char *name, unsigned pcm_hz) {
-	us_audio_s *audio;
-	US_CALLOC(audio, 1);
-	audio->pcm_hz = pcm_hz;
-	audio->pcm_queue = us_queue_init(8);
-	audio->enc_queue = us_queue_init(8);
-	atomic_init(&audio->stop, false);
-
-	int err;
-
-	{
-		if ((err = snd_pcm_open(&audio->pcm, name, SND_PCM_STREAM_CAPTURE, 0)) < 0) {
-			audio->pcm = NULL;
-			_JLOG_PERROR_ALSA(err, "audio", "Can't open PCM capture");
-			goto error;
-		}
-		assert(!snd_pcm_hw_params_malloc(&audio->pcm_params));
-
-#		define SET_PARAM(_msg, _func, ...) { \
-				if ((err = _func(audio->pcm, audio->pcm_params, ##__VA_ARGS__)) < 0) { \
-					_JLOG_PERROR_ALSA(err, "audio", _msg); \
-					goto error; \
-				} \
-			}
-
-		SET_PARAM("Can't initialize PCM params",	snd_pcm_hw_params_any);
-		SET_PARAM("Can't set PCM access type",		snd_pcm_hw_params_set_access, SND_PCM_ACCESS_RW_INTERLEAVED);
-		SET_PARAM("Can't set PCM channels numbre",	snd_pcm_hw_params_set_channels, 2);
-		SET_PARAM("Can't set PCM sampling format",	snd_pcm_hw_params_set_format, SND_PCM_FORMAT_S16_LE);
-		SET_PARAM("Can't set PCM sampling rate",	snd_pcm_hw_params_set_rate_near, &audio->pcm_hz, 0);
-		if (audio->pcm_hz < _MIN_PCM_HZ || audio->pcm_hz > _MAX_PCM_HZ) {
-			US_JLOG_ERROR("audio", "Unsupported PCM freq: %u; should be: %u <= F <= %u",
-				audio->pcm_hz, _MIN_PCM_HZ, _MAX_PCM_HZ);
-			goto error;
-		}
-		audio->pcm_frames = _HZ_TO_FRAMES(audio->pcm_hz);
-		audio->pcm_size = _HZ_TO_BUF8(audio->pcm_hz);
-		SET_PARAM("Can't apply PCM params", snd_pcm_hw_params);
-
-#		undef SET_PARAM
-	}
-
-	if (audio->pcm_hz != _ENCODER_INPUT_HZ) {
-		audio->res = speex_resampler_init(2, audio->pcm_hz, _ENCODER_INPUT_HZ, SPEEX_RESAMPLER_QUALITY_DESKTOP, &err);
-		if (err < 0) {
-			audio->res = NULL;
-			_JLOG_PERROR_RES(err, "audio", "Can't create resampler");
-			goto error;
-		}
-	}
-
-	{
-		// OPUS_APPLICATION_VOIP, OPUS_APPLICATION_RESTRICTED_LOWDELAY
-		audio->enc = opus_encoder_create(_ENCODER_INPUT_HZ, 2, OPUS_APPLICATION_AUDIO, &err);
-		assert(err == 0);
-		assert(!opus_encoder_ctl(audio->enc, OPUS_SET_BITRATE(48000)));
-		assert(!opus_encoder_ctl(audio->enc, OPUS_SET_MAX_BANDWIDTH(OPUS_BANDWIDTH_FULLBAND)));
-		assert(!opus_encoder_ctl(audio->enc, OPUS_SET_SIGNAL(OPUS_SIGNAL_MUSIC)));
-		// OPUS_SET_INBAND_FEC(1), OPUS_SET_PACKET_LOSS_PERC(10): see rtpa.c
-	}
-
-	US_JLOG_INFO("audio", "Pipeline configured on %uHz; capturing ...", audio->pcm_hz);
-	audio->tids_created = true;
-	US_THREAD_CREATE(audio->enc_tid, _encoder_thread, audio);
-	US_THREAD_CREATE(audio->pcm_tid, _pcm_thread, audio);
-
-	return audio;
-
-	error:
-		us_audio_destroy(audio);
-		return NULL;
-}
-
-void us_audio_destroy(us_audio_s *audio) {
-	if (audio->tids_created) {
-		atomic_store(&audio->stop, true);
-		US_THREAD_JOIN(audio->pcm_tid);
-		US_THREAD_JOIN(audio->enc_tid);
-	}
-	US_DELETE(audio->enc, opus_encoder_destroy);
-	US_DELETE(audio->res, speex_resampler_destroy);
-	US_DELETE(audio->pcm, snd_pcm_close);
-	US_DELETE(audio->pcm_params, snd_pcm_hw_params_free);
-	US_QUEUE_DELETE_WITH_ITEMS(audio->enc_queue, free);
-	US_QUEUE_DELETE_WITH_ITEMS(audio->pcm_queue, free);
-	if (audio->tids_created) {
-		US_JLOG_INFO("audio", "Pipeline closed");
-	}
-	free(audio);
-}
-
-int us_audio_get_encoded(us_audio_s *audio, uint8_t *data, size_t *size, uint64_t *pts) {
-	if (atomic_load(&audio->stop)) {
-		return -1;
-	}
-	_enc_buffer_s *buf;
-	if (!us_queue_get(audio->enc_queue, (void **)&buf, 0.1)) {
-		if (*size < buf->used) {
-			free(buf);
-			return -3;
-		}
-		memcpy(data, buf->data, buf->used);
-		*size = buf->used;
-		*pts = buf->pts;
-		free(buf);
-		return 0;
-	}
-	return -2;
-}
-
-static void *_pcm_thread(void *v_audio) {
-	US_THREAD_RENAME("us_a_pcm");
-
-	us_audio_s *const audio = (us_audio_s *)v_audio;
-	uint8_t in[_MAX_BUF8];
-
-	while (!atomic_load(&audio->stop)) {
-		const int frames = snd_pcm_readi(audio->pcm, in, audio->pcm_frames);
-		if (frames < 0) {
-			_JLOG_PERROR_ALSA(frames, "audio", "Fatal: Can't capture PCM frames");
-			break;
-		} else if (frames < (int)audio->pcm_frames) {
-			US_JLOG_ERROR("audio", "Fatal: Too few PCM frames captured");
-			break;
-		}
-
-		if (us_queue_get_free(audio->pcm_queue)) {
-			_pcm_buffer_s *out;
-			US_CALLOC(out, 1);
-			memcpy(out->data, in, audio->pcm_size);
-			assert(!us_queue_put(audio->pcm_queue, out, 0));
-		} else {
-			US_JLOG_ERROR("audio", "PCM queue is full");
-		}
-	}
-
-	atomic_store(&audio->stop, true);
-	return NULL;
-}
-
-static void *_encoder_thread(void *v_audio) {
-	US_THREAD_RENAME("us_a_enc");
-
-	us_audio_s *const audio = (us_audio_s *)v_audio;
-	int16_t in_res[_MAX_BUF16];
-
-	while (!atomic_load(&audio->stop)) {
-		_pcm_buffer_s *in;
-		if (!us_queue_get(audio->pcm_queue, (void **)&in, 0.1)) {
-			int16_t *in_ptr;
-			if (audio->res != NULL) {
-				assert(audio->pcm_hz != _ENCODER_INPUT_HZ);
-				uint32_t in_count = audio->pcm_frames;
-				uint32_t out_count = _HZ_TO_FRAMES(_ENCODER_INPUT_HZ);
-				speex_resampler_process_interleaved_int(audio->res, in->data, &in_count, in_res, &out_count);
-				in_ptr = in_res;
-			} else {
-				assert(audio->pcm_hz == _ENCODER_INPUT_HZ);
-				in_ptr = in->data;
-			}
-
-			_enc_buffer_s *out;
-			US_CALLOC(out, 1);
-			const int size = opus_encode(audio->enc, in_ptr, _HZ_TO_FRAMES(_ENCODER_INPUT_HZ), out->data, US_ARRAY_LEN(out->data));
-			free(in);
-			if (size < 0) {
-				_JLOG_PERROR_OPUS(size, "audio", "Fatal: Can't encode PCM frame to OPUS");
-				free(out);
-				break;
-			}
-			out->used = size;
-			out->pts = audio->pts;
-			// https://datatracker.ietf.org/doc/html/rfc7587#section-4.2
-			audio->pts += _HZ_TO_FRAMES(_ENCODER_INPUT_HZ);
-
-			if (us_queue_put(audio->enc_queue, out, 0) != 0) {
-				US_JLOG_ERROR("audio", "OPUS encoder queue is full");
-				free(out);
-			}
-		}
-	}
-
-	atomic_store(&audio->stop, true);
-	return NULL;
-}

janus/src/client.c

@@ -2,7 +2,7 @@
 #                                                                            #
 #    uStreamer - Lightweight and fast MJPEG-HTTP streamer.                   #
 #                                                                            #
-#    Copyright (C) 2018-2023  Maxim Devaev <mdevaev@gmail.com>               #
+#    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    #
@@ -25,23 +25,29 @@
 #include <stdlib.h>
 #include <stdatomic.h>
 #include <string.h>
+#include <assert.h>
 
 #include <pthread.h>
 #include <janus/plugins/plugin.h>
+#include <janus/rtp.h>
+#include <opus/opus.h>
 
 #include "uslibs/types.h"
 #include "uslibs/tools.h"
 #include "uslibs/threading.h"
+#include "uslibs/array.h"
 #include "uslibs/list.h"
+#include "uslibs/ring.h"
 
 #include "logging.h"
-#include "queue.h"
+#include "au.h"
 #include "rtp.h"
 
 
 static void *_video_thread(void *v_client);
-static void *_audio_thread(void *v_client);
-static void *_common_thread(void *v_client, bool video);
+static void *_acap_thread(void *v_client);
+static void *_video_or_acap_thread(void *v_client, bool video);
+static void *_aplay_thread(void *v_client);
 
 
 us_janus_client_s *us_janus_client_init(janus_callbacks *gw, janus_plugin_session *session) {
@@ -50,29 +56,37 @@ us_janus_client_s *us_janus_client_init(janus_callbacks *gw, janus_plugin_sessio
 	client->gw = gw;
 	client->session = session;
 	atomic_init(&client->transmit, false);
-	atomic_init(&client->transmit_audio, false);
+	atomic_init(&client->transmit_acap, false);
+	atomic_init(&client->transmit_aplay, false);
+	atomic_init(&client->video_orient, 0);
 
 	atomic_init(&client->stop, false);
 
-	client->video_queue = us_queue_init(2048);
+	US_RING_INIT_WITH_ITEMS(client->video_ring, 2048, us_rtp_init);
 	US_THREAD_CREATE(client->video_tid, _video_thread, client);
 
-	client->audio_queue = us_queue_init(64);
-	US_THREAD_CREATE(client->audio_tid, _audio_thread, client);
+	US_RING_INIT_WITH_ITEMS(client->acap_ring, 64, us_rtp_init);
+	US_THREAD_CREATE(client->acap_tid, _acap_thread, client);
+
+	US_RING_INIT_WITH_ITEMS(client->aplay_enc_ring, 64, us_au_encoded_init);
+	US_RING_INIT_WITH_ITEMS(client->aplay_pcm_ring, 64, us_au_pcm_init);
+	US_THREAD_CREATE(client->aplay_tid, _aplay_thread, client);
 
 	return client;
 }
 
 void us_janus_client_destroy(us_janus_client_s *client) {
 	atomic_store(&client->stop, true);
-	us_queue_put(client->video_queue, NULL, 0);
-	us_queue_put(client->audio_queue, NULL, 0);
 
 	US_THREAD_JOIN(client->video_tid);
-	US_QUEUE_DELETE_WITH_ITEMS(client->video_queue, us_rtp_destroy);
+	US_RING_DELETE_WITH_ITEMS(client->video_ring, us_rtp_destroy);
 
-	US_THREAD_JOIN(client->audio_tid);
-	US_QUEUE_DELETE_WITH_ITEMS(client->audio_queue, us_rtp_destroy);
+	US_THREAD_JOIN(client->acap_tid);
+	US_RING_DELETE_WITH_ITEMS(client->acap_ring, us_rtp_destroy);
+
+	US_THREAD_JOIN(client->aplay_tid);
+	US_RING_DELETE_WITH_ITEMS(client->aplay_enc_ring, us_au_encoded_destroy);
+	US_RING_DELETE_WITH_ITEMS(client->aplay_pcm_ring, us_au_pcm_destroy);
 
 	free(client);
 }
@@ -80,67 +94,183 @@ void us_janus_client_destroy(us_janus_client_s *client) {
 void us_janus_client_send(us_janus_client_s *client, const us_rtp_s *rtp) {
 	if (
 		atomic_load(&client->transmit)
-		&& (rtp->video || atomic_load(&client->transmit_audio))
+		&& (rtp->video || atomic_load(&client->transmit_acap))
 	) {
-		us_rtp_s *const new = us_rtp_dup(rtp);
-		if (us_queue_put((new->video ? client->video_queue : client->audio_queue), new, 0) != 0) {
-			US_JLOG_ERROR("client", "Session %p %s queue is full",
-				client->session, (new->video ? "video" : "audio"));
-			us_rtp_destroy(new);
+		us_ring_s *const ring = (rtp->video ? client->video_ring : client->acap_ring);
+		const int ri = us_ring_producer_acquire(ring, 0);
+		if (ri < 0) {
+			US_JLOG_ERROR("client", "Session %p %s ring is full",
+				client->session, (rtp->video ? "video" : "acap"));
+			return;
 		}
+		memcpy(ring->items[ri], rtp, sizeof(us_rtp_s));
+		us_ring_producer_release(ring, ri);
+	}
+}
+
+void us_janus_client_recv(us_janus_client_s *client, janus_plugin_rtp *packet) {
+	if (
+		packet->video
+		|| packet->length < sizeof(janus_rtp_header)
+		|| !atomic_load(&client->transmit)
+		|| !atomic_load(&client->transmit_aplay)
+	) {
+		return;
+	}
+
+	const janus_rtp_header *const header = (janus_rtp_header*)packet->buffer;
+	if (header->type != US_RTP_OPUS_PAYLOAD) {
+		return;
+	}
+
+	const u16 seq = ntohs(header->seq_number);
+	if (
+		seq >= client->aplay_seq_next // In order or missing
+		|| (client->aplay_seq_next - seq) > 50 // In late sequence or sequence wrapped
+	) {
+		client->aplay_seq_next = seq + 1;
+
+		int size = 0;
+		const char *const data = janus_rtp_payload(packet->buffer, packet->length, &size);
+		if (data == NULL || size <= 0) {
+			return;
+		}
+
+		us_ring_s *const ring = client->aplay_enc_ring;
+		const int ri = us_ring_producer_acquire(ring, 0);
+		if (ri < 0) {
+			// US_JLOG_ERROR("client", "Session %p aplay ring is full", client->session);
+			return;
+		}
+		us_au_encoded_s *enc = ring->items[ri];
+		if ((uz)size < US_ARRAY_LEN(enc->data)) {
+			memcpy(enc->data, data, size);
+			enc->used = size;
+		} else {
+			enc->used = 0;
+		}
+		us_ring_producer_release(ring, ri);
 	}
 }
 
 static void *_video_thread(void *v_client) {
-	return _common_thread(v_client, true);
+	US_THREAD_SETTLE("us_cx_vid");
+	return _video_or_acap_thread(v_client, true);
 }
 
-static void *_audio_thread(void *v_client) {
-	return _common_thread(v_client, false);
+static void *_acap_thread(void *v_client) {
+	US_THREAD_SETTLE("us_cx_ac");
+	return _video_or_acap_thread(v_client, false);
 }
 
-static void *_common_thread(void *v_client, bool video) {
-	us_janus_client_s *const client = (us_janus_client_s *)v_client;
-	us_queue_s *const queue = (video ? client->video_queue : client->audio_queue);
-	assert(queue != NULL); // Audio may be NULL
+static void *_video_or_acap_thread(void *v_client, bool video) {
+	us_janus_client_s *const client = v_client;
+	us_ring_s *const ring = (video ? client->video_ring : client->acap_ring);
+	assert(ring != NULL);
 
 	while (!atomic_load(&client->stop)) {
-		us_rtp_s *rtp;
-		if (!us_queue_get(queue, (void **)&rtp, 0.1)) {
-			if (rtp == NULL) {
-				break;
-			}
+		const int ri = us_ring_consumer_acquire(ring, 0.1);
+		if (ri < 0) {
+			continue;
+		}
+		us_rtp_s rtp;
+		memcpy(&rtp, ring->items[ri], sizeof(us_rtp_s));
+		us_ring_consumer_release(ring, ri);
 
-			if (
-				atomic_load(&client->transmit)
-				&& (video || atomic_load(&client->transmit_audio))
-			) {
-				janus_plugin_rtp packet = {
-					.video = rtp->video,
-					.buffer = (char *)rtp->datagram,
-					.length = rtp->used,
-#					if JANUS_PLUGIN_API_VERSION >= 100
-					// The uStreamer Janus plugin places video in stream index 0 and audio
-					// (if available) in stream index 1.
-					.mindex = (rtp->video ? 0 : 1),
-#					endif
-				};
-				janus_plugin_rtp_extensions_reset(&packet.extensions);
-				/*if (rtp->zero_playout_delay) {
+		if (
+			atomic_load(&client->transmit)
+			&& (video || atomic_load(&client->transmit_acap))
+		) {
+			janus_plugin_rtp packet = {
+				.video = rtp.video,
+				.buffer = (char*)rtp.datagram,
+				.length = rtp.used,
+#				if JANUS_PLUGIN_API_VERSION >= 100
+				// The uStreamer Janus plugin places video in stream index 0 and audio
+				// (if available) in stream index 1.
+				.mindex = (rtp.video ? 0 : 1),
+#				endif
+			};
+			janus_plugin_rtp_extensions_reset(&packet.extensions);
+
+			if (rtp.first_of_frame) {
+				if (rtp.zero_playout_delay) {
 					// https://github.com/pikvm/pikvm/issues/784
 					packet.extensions.min_delay = 0;
 					packet.extensions.max_delay = 0;
 				} else {
+					// Эти дефолты используются в Chrome/Safari/Firefox.
+					// Работает всё одинаково, потому что у них общая кодовая база WebRTC.
 					packet.extensions.min_delay = 0;
-					// 10s - Chromium/WebRTC default
-					// 3s - Firefox default
-					packet.extensions.max_delay = 300; // == 3s, i.e. 10ms granularity
-				}*/
-
-				client->gw->relay_rtp(client->session, &packet);
+					packet.extensions.max_delay = 1000; // == 10s, i.e. 10ms granularity
+				}
 			}
-			us_rtp_destroy(rtp);
+
+			if (rtp.video && rtp.first_of_frame) {
+				packet.extensions.abs_capture_ts = rtp.grab_ntp_ts;
+			}
+
+			if (rtp.video && rtp.last_of_frame) {
+				uint video_orient = atomic_load(&client->video_orient);
+				if (video_orient != 0) {
+					// The extension rotates the video clockwise, but want it counterclockwise.
+					// It's more intuitive for people who have seen a protractor at least once in their life.
+					if (video_orient == 90) {
+						video_orient = 270;
+					} else if (video_orient == 270) {
+						video_orient = 90;
+					}
+					packet.extensions.video_rotation = video_orient;
+				}
+			}
+
+			client->gw->relay_rtp(client->session, &packet);
 		}
 	}
 	return NULL;
 }
+
+static void *_aplay_thread(void *v_client) {
+	US_THREAD_SETTLE("us_cx_ap");
+
+	us_janus_client_s *const client = v_client;
+
+	int err;
+	OpusDecoder *dec = opus_decoder_create(US_RTP_OPUS_HZ, US_RTP_OPUS_CH, &err);
+	assert(err == 0);
+
+	while (!atomic_load(&client->stop)) {
+		const int in_ri = us_ring_consumer_acquire(client->aplay_enc_ring, 0.1);
+		if (in_ri < 0) {
+			continue;
+		}
+		us_au_encoded_s *in = client->aplay_enc_ring->items[in_ri];
+
+		if (in->used == 0) {
+			us_ring_consumer_release(client->aplay_enc_ring, in_ri);
+			continue;
+		}
+
+		const int out_ri = us_ring_producer_acquire(client->aplay_pcm_ring, 0);
+		if (out_ri < 0) {
+			US_JLOG_ERROR("aplay", "OPUS decoder queue is full");
+			us_ring_consumer_release(client->aplay_enc_ring, in_ri);
+			continue;
+		}
+		us_au_pcm_s *out = client->aplay_pcm_ring->items[out_ri];
+
+		const int frames = opus_decode(dec, in->data, in->used, out->data, US_AU_HZ_TO_FRAMES(US_RTP_OPUS_HZ), 0);
+		us_ring_consumer_release(client->aplay_enc_ring, in_ri);
+
+		if (frames > 0) {
+			out->frames = frames;
+		} else {
+			out->frames = 0;
+			US_JLOG_PERROR_OPUS(frames, "aplay", "Fatal: Can't decode OPUS to PCM frame");
+		}
+		us_ring_producer_release(client->aplay_pcm_ring, out_ri);
+	}
+
+	opus_decoder_destroy(dec);
+	return NULL;
+}

janus/src/client.h

@@ -2,7 +2,7 @@
 #                                                                            #
 #    uStreamer - Lightweight and fast MJPEG-HTTP streamer.                   #
 #                                                                            #
-#    Copyright (C) 2018-2023  Maxim Devaev <mdevaev@gmail.com>               #
+#    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    #
@@ -29,25 +29,32 @@
 
 #include "uslibs/types.h"
 #include "uslibs/list.h"
+#include "uslibs/ring.h"
 
-#include "queue.h"
 #include "rtp.h"
 
 
-typedef struct us_janus_client_sx {
+typedef struct {
 	janus_callbacks			*gw;
 	janus_plugin_session	*session;
 	atomic_bool				transmit;
-	atomic_bool				transmit_audio;
+	atomic_bool				transmit_acap;
+	atomic_bool				transmit_aplay;
+	atomic_uint				video_orient;
 
 	pthread_t				video_tid;
-	pthread_t				audio_tid;
+	pthread_t				acap_tid;
+	pthread_t				aplay_tid;
 	atomic_bool				stop;
 
-	us_queue_s				*video_queue;
-	us_queue_s				*audio_queue;
+	us_ring_s				*video_ring;
+	us_ring_s				*acap_ring;
 
-    US_LIST_STRUCT(struct us_janus_client_sx);
+	us_ring_s				*aplay_enc_ring;
+	u16						aplay_seq_next;
+	us_ring_s				*aplay_pcm_ring;
+
+    US_LIST_DECLARE;
 } us_janus_client_s;
 
 
@@ -55,3 +62,4 @@ us_janus_client_s *us_janus_client_init(janus_callbacks *gw, janus_plugin_sessio
 void us_janus_client_destroy(us_janus_client_s *client);
 
 void us_janus_client_send(us_janus_client_s *client, const us_rtp_s *rtp);
+void us_janus_client_recv(us_janus_client_s *client, janus_plugin_rtp *packet);

janus/src/config.c

@@ -2,7 +2,7 @@
 #                                                                            #
 #    uStreamer - Lightweight and fast MJPEG-HTTP streamer.                   #
 #                                                                            #
-#    Copyright (C) 2018-2023  Maxim Devaev <mdevaev@gmail.com>               #
+#    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    #
@@ -28,6 +28,7 @@
 #include <janus/config.h>
 #include <janus/plugins/plugin.h>
 
+#include "uslibs/types.h"
 #include "uslibs/tools.h"
 
 #include "const.h"
@@ -35,6 +36,7 @@
 
 
 static char *_get_value(janus_config *jcfg, const char *section, const char *option);
+static uint _get_uint(janus_config *jcfg, const char *section, const char *option, uint def);
 // static bool _get_bool(janus_config *jcfg, const char *section, const char *option, bool def);
 
 
@@ -55,18 +57,18 @@ us_config_s *us_config_init(const char *config_dir_path) {
 	}
 	janus_config_print(jcfg);
 
-	if (
-		(config->video_sink_name = _get_value(jcfg, "memsink", "object")) == NULL
-		&& (config->video_sink_name = _get_value(jcfg, "video", "sink")) == NULL
-	) {
-		US_JLOG_ERROR("config", "Missing config value: video.sink (ex. memsink.object)");
+	if ((config->video_sink_name = _get_value(jcfg, "video", "sink")) == NULL) {
+		US_JLOG_ERROR("config", "Missing config value: video.sink");
 		goto error;
 	}
-	if ((config->audio_dev_name = _get_value(jcfg, "audio", "device")) != NULL) {
-		if ((config->tc358743_dev_path = _get_value(jcfg, "audio", "tc358743")) == NULL) {
-			US_JLOG_INFO("config", "Missing config value: audio.tc358743");
+	if ((config->acap_dev_name = _get_value(jcfg, "acap", "device")) != NULL) {
+		config->acap_hz = _get_uint(jcfg, "acap", "sampling_rate", 0);
+		config->tc358743_dev_path = _get_value(jcfg, "acap", "tc358743");
+		if (config->acap_hz == 0 && config->tc358743_dev_path == NULL) {
+			US_JLOG_ERROR("config", "Either acap.sampling_rate or acap.tc358743 required");
 			goto error;
 		}
+		config->aplay_dev_name = _get_value(jcfg, "aplay", "device");
 	}
 
 	goto ok;
@@ -82,8 +84,9 @@ ok:
 
 void us_config_destroy(us_config_s *config) {
 	US_DELETE(config->video_sink_name, free);
-	US_DELETE(config->audio_dev_name, free);
+	US_DELETE(config->acap_dev_name, free);
 	US_DELETE(config->tc358743_dev_path, free);
+	US_DELETE(config->aplay_dev_name, free);
 	free(config);
 }
 
@@ -96,6 +99,20 @@ static char *_get_value(janus_config *jcfg, const char *section, const char *opt
 	return us_strdup(option_obj->value);
 }
 
+static uint _get_uint(janus_config *jcfg, const char *section, const char *option, uint def) {
+	char *const tmp = _get_value(jcfg, section, option);
+	uint value = def;
+	if (tmp != NULL) {
+		errno = 0;
+		value = (uint)strtoul(tmp, NULL, 10);
+		if (errno != 0) {
+			value = def;
+		}
+		free(tmp);
+	}
+	return value;
+}
+
 /*static bool _get_bool(janus_config *jcfg, const char *section, const char *option, bool def) {
 	char *const tmp = _get_value(jcfg, section, option);
 	bool value = def;

janus/src/config.h

@@ -2,7 +2,7 @@
 #                                                                            #
 #    uStreamer - Lightweight and fast MJPEG-HTTP streamer.                   #
 #                                                                            #
-#    Copyright (C) 2018-2023  Maxim Devaev <mdevaev@gmail.com>               #
+#    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    #
@@ -23,11 +23,17 @@
 #pragma once
 
 
+#include "uslibs/types.h"
+
+
 typedef struct {
 	char	*video_sink_name;
 
-	char	*audio_dev_name;
+	char	*acap_dev_name;
+	uint	acap_hz;
 	char	*tc358743_dev_path;
+
+	char	*aplay_dev_name;
 } us_config_s;
 
 

janus/src/const.h

@@ -2,7 +2,7 @@
 #                                                                            #
 #    uStreamer - Lightweight and fast MJPEG-HTTP streamer.                   #
 #                                                                            #
-#    Copyright (C) 2018-2023  Maxim Devaev <mdevaev@gmail.com>               #
+#    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    #

janus/src/logging.h

@@ -2,7 +2,7 @@
 #                                                                            #
 #    uStreamer - Lightweight and fast MJPEG-HTTP streamer.                   #
 #                                                                            #
-#    Copyright (C) 2018-2023  Maxim Devaev <mdevaev@gmail.com>               #
+#    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    #
@@ -37,10 +37,7 @@
 		free(m_perror_str); \
 	}
 
-#define US_ONCE(...) { \
-		const int m_reported = __LINE__; \
-		if (m_reported != once) { \
-			__VA_ARGS__; \
-			once = m_reported; \
-		} \
-	}
+// We don't include alsa, speex and opus headers here
+#define US_JLOG_PERROR_ALSA(_err, _prefix, _msg, ...)	US_JLOG_ERROR(_prefix, _msg ": %s", ##__VA_ARGS__, snd_strerror(_err))
+#define US_JLOG_PERROR_RES(_err, _prefix, _msg, ...)	US_JLOG_ERROR(_prefix, _msg ": %s", ##__VA_ARGS__, speex_resampler_strerror(_err))
+#define US_JLOG_PERROR_OPUS(_err, _prefix, _msg, ...)	US_JLOG_ERROR(_prefix, _msg ": %s", ##__VA_ARGS__, opus_strerror(_err))

janus/src/memsinkfd.c

@@ -2,7 +2,7 @@
 #                                                                            #
 #    uStreamer - Lightweight and fast MJPEG-HTTP streamer.                   #
 #                                                                            #
-#    Copyright (C) 2018-2023  Maxim Devaev <mdevaev@gmail.com>               #
+#    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    #
@@ -27,6 +27,7 @@
 #include <linux/videodev2.h>
 
 #include "uslibs/types.h"
+#include "uslibs/errors.h"
 #include "uslibs/tools.h"
 #include "uslibs/frame.h"
 #include "uslibs/memsinksh.h"
@@ -34,7 +35,7 @@
 #include "logging.h"
 
 
-int us_memsink_fd_wait_frame(int fd, us_memsink_shared_s* mem, u64 last_id) {
+int us_memsink_fd_wait_frame(int fd, us_memsink_shared_s *mem, u64 last_id) {
 	const ldf deadline_ts = us_get_now_monotonic() + 1; // wait_timeout
 	ldf now_ts;
 	do {
@@ -54,12 +55,11 @@ int us_memsink_fd_wait_frame(int fd, us_memsink_shared_s* mem, u64 last_id) {
 		}
 		usleep(1000); // lock_polling
 	} while (now_ts < deadline_ts);
-	return -2;
+	return US_ERROR_NO_DATA;
 }
 
-us_frame_s *us_memsink_fd_get_frame(int fd, us_memsink_shared_s *mem, u64 *frame_id, bool key_required) {
-	us_frame_s *frame = us_frame_init();
-	us_frame_set_data(frame, mem->data, mem->used);
+int us_memsink_fd_get_frame(int fd, us_memsink_shared_s *mem, us_frame_s *frame, u64 *frame_id, bool key_required) {
+	us_frame_set_data(frame, us_memsink_get_data(mem), mem->used);
 	US_FRAME_COPY_META(mem, frame);
 	*frame_id = mem->id;
 	mem->last_client_ts = us_get_now_monotonic();
@@ -67,17 +67,14 @@ us_frame_s *us_memsink_fd_get_frame(int fd, us_memsink_shared_s *mem, u64 *frame
 		mem->key_requested = true;
 	}
 
-	bool ok = true;
+	bool retval = 0;
 	if (frame->format != V4L2_PIX_FMT_H264) {
 		US_JLOG_ERROR("video", "Got non-H264 frame from memsink");
-		ok = false;
+		retval = -1;
 	}
 	if (flock(fd, LOCK_UN) < 0) {
 		US_JLOG_PERROR("video", "Can't unlock memsink");
-		ok = false;
+		retval = -1;
 	}
-	if (!ok) {
-		US_DELETE(frame, us_frame_destroy);
-	}
-	return frame;
+	return retval;
 }

janus/src/memsinkfd.h

@@ -2,7 +2,7 @@
 #                                                                            #
 #    uStreamer - Lightweight and fast MJPEG-HTTP streamer.                   #
 #                                                                            #
-#    Copyright (C) 2018-2023  Maxim Devaev <mdevaev@gmail.com>               #
+#    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    #
@@ -27,5 +27,5 @@
 #include "uslibs/memsinksh.h"
 
 
-int us_memsink_fd_wait_frame(int fd, us_memsink_shared_s* mem, u64 last_id);
-us_frame_s *us_memsink_fd_get_frame(int fd, us_memsink_shared_s *mem, u64 *frame_id, bool key_required);
+int us_memsink_fd_wait_frame(int fd, us_memsink_shared_s *mem, u64 last_id);
+int us_memsink_fd_get_frame(int fd, us_memsink_shared_s *mem, us_frame_s *frame, u64 *frame_id, bool key_required);

janus/src/plugin.c

@@ -2,7 +2,7 @@
 #                                                                            #
 #    uStreamer - Lightweight and fast MJPEG-HTTP streamer.                   #
 #                                                                            #
-#    Copyright (C) 2018-2023  Maxim Devaev <mdevaev@gmail.com>               #
+#    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    #
@@ -22,9 +22,9 @@
 
 #include <stdatomic.h>
 #include <stdlib.h>
-#include <inttypes.h>
 #include <unistd.h>
 #include <fcntl.h>
+#include <errno.h>
 #include <assert.h>
 
 #include <sys/mman.h>
@@ -33,34 +33,41 @@
 #include <pthread.h>
 #include <jansson.h>
 #include <janus/plugins/plugin.h>
+#include <janus/rtp.h>
 #include <janus/rtcp.h>
+#include <alsa/asoundlib.h>
 
 #include "uslibs/types.h"
 #include "uslibs/const.h"
+#include "uslibs/errors.h"
 #include "uslibs/tools.h"
 #include "uslibs/threading.h"
 #include "uslibs/list.h"
+#include "uslibs/ring.h"
 #include "uslibs/memsinksh.h"
+#include "uslibs/tc358743.h"
 
 #include "const.h"
 #include "logging.h"
-#include "queue.h"
 #include "client.h"
-#include "audio.h"
-#include "tc358743.h"
+#include "au.h"
+#include "acap.h"
 #include "rtp.h"
 #include "rtpv.h"
 #include "rtpa.h"
+#include "sdp.h"
 #include "memsinkfd.h"
 #include "config.h"
 
 
+static const char *const	default_ice_url = "stun:stun.l.google.com:19302";
+
 static us_config_s		*_g_config = NULL;
 static const useconds_t	_g_watchers_polling = 100000;
 
 static us_janus_client_s	*_g_clients = NULL;
 static janus_callbacks		*_g_gw = NULL;
-static us_queue_s			*_g_video_queue = NULL;
+static us_ring_s			*_g_video_ring = NULL;
 static us_rtpv_s			*_g_rtpv = NULL;
 static us_rtpa_s			*_g_rtpa = NULL;
 
@@ -68,31 +75,41 @@ static pthread_t		_g_video_rtp_tid;
 static atomic_bool		_g_video_rtp_tid_created = false;
 static pthread_t		_g_video_sink_tid;
 static atomic_bool		_g_video_sink_tid_created = false;
-static pthread_t		_g_audio_tid;
-static atomic_bool		_g_audio_tid_created = false;
+static pthread_t		_g_acap_tid;
+static atomic_bool		_g_acap_tid_created = false;
+static pthread_t		_g_aplay_tid;
+static atomic_bool		_g_aplay_tid_created = false;
 
 static pthread_mutex_t	_g_video_lock = PTHREAD_MUTEX_INITIALIZER;
-static pthread_mutex_t	_g_audio_lock = PTHREAD_MUTEX_INITIALIZER;
+static pthread_mutex_t	_g_acap_lock = PTHREAD_MUTEX_INITIALIZER;
+static pthread_mutex_t	_g_aplay_lock = PTHREAD_MUTEX_INITIALIZER;
 static atomic_bool		_g_ready = false;
 static atomic_bool		_g_stop = false;
 static atomic_bool		_g_has_watchers = false;
 static atomic_bool		_g_has_listeners = false;
+static atomic_bool		_g_has_speakers = false;
 static atomic_bool		_g_key_required = false;
 
 
 #define _LOCK_VIDEO		US_MUTEX_LOCK(_g_video_lock)
 #define _UNLOCK_VIDEO	US_MUTEX_UNLOCK(_g_video_lock)
 
-#define _LOCK_AUDIO		US_MUTEX_LOCK(_g_audio_lock)
-#define _UNLOCK_AUDIO	US_MUTEX_UNLOCK(_g_audio_lock)
+#define _LOCK_ACAP		US_MUTEX_LOCK(_g_acap_lock)
+#define _UNLOCK_ACAP	US_MUTEX_UNLOCK(_g_acap_lock)
 
-#define _LOCK_ALL		{ _LOCK_VIDEO; _LOCK_AUDIO; }
-#define _UNLOCK_ALL		{ _UNLOCK_AUDIO; _UNLOCK_VIDEO; }
+#define _LOCK_APLAY		US_MUTEX_LOCK(_g_aplay_lock)
+#define _UNLOCK_APLAY	US_MUTEX_UNLOCK(_g_aplay_lock)
+
+#define _LOCK_ALL		{ _LOCK_VIDEO; _LOCK_ACAP; _LOCK_APLAY; }
+#define _UNLOCK_ALL		{ _UNLOCK_APLAY; _UNLOCK_ACAP; _UNLOCK_VIDEO; }
 
 #define _READY			atomic_load(&_g_ready)
 #define _STOP			atomic_load(&_g_stop)
 #define _HAS_WATCHERS	atomic_load(&_g_has_watchers)
 #define _HAS_LISTENERS	atomic_load(&_g_has_listeners)
+#define _HAS_SPEAKERS	atomic_load(&_g_has_speakers)
+
+#define _IF_DISABLED(...) { if (!_READY || _STOP) { __VA_ARGS__ } }
 
 
 janus_plugin *create(void);
@@ -100,18 +117,18 @@ janus_plugin *create(void);
 
 static void *_video_rtp_thread(void *arg) {
 	(void)arg;
-
-	US_THREAD_RENAME("us_video_rtp");
+	US_THREAD_SETTLE("us_p_rtpv");
 	atomic_store(&_g_video_rtp_tid_created, true);
 
 	while (!_STOP) {
-		us_frame_s *frame;
-		if (us_queue_get(_g_video_queue, (void **)&frame, 0.1) == 0) {
+		const int ri = us_ring_consumer_acquire(_g_video_ring, 0.1);
+		if (ri >= 0) {
+			const us_frame_s *const frame = _g_video_ring->items[ri];
 			_LOCK_VIDEO;
 			const bool zero_playout_delay = (frame->gop == 0);
 			us_rtpv_wrap(_g_rtpv, frame, zero_playout_delay);
 			_UNLOCK_VIDEO;
-			us_frame_destroy(frame);
+			us_ring_consumer_release(_g_video_ring, ri);
 		}
 	}
 	return NULL;
@@ -119,10 +136,10 @@ static void *_video_rtp_thread(void *arg) {
 
 static void *_video_sink_thread(void *arg) {
 	(void)arg;
-
-	US_THREAD_RENAME("us_video_sink");
+	US_THREAD_SETTLE("us_p_vsink");
 	atomic_store(&_g_video_sink_tid_created, true);
 
+	us_frame_s *drop = us_frame_init();
 	u64 frame_id = 0;
 	int once = 0;
 
@@ -136,12 +153,18 @@ static void *_video_sink_thread(void *arg) {
 		int fd = -1;
 		us_memsink_shared_s *mem = NULL;
 
+		const uz data_size = us_memsink_calculate_size(_g_config->video_sink_name);
+		if (data_size == 0) {
+			US_ONCE({ US_JLOG_ERROR("video", "Invalid memsink object suffix"); });
+			goto close_memsink;
+		}
+
 		if ((fd = shm_open(_g_config->video_sink_name, O_RDWR, 0)) <= 0) {
 			US_ONCE({ US_JLOG_PERROR("video", "Can't open memsink"); });
 			goto close_memsink;
 		}
 
-		if ((mem = us_memsink_shared_map(fd)) == NULL) {
+		if ((mem = us_memsink_shared_map(fd, data_size)) == NULL) {
 			US_ONCE({ US_JLOG_PERROR("video", "Can't map memsink"); });
 			goto close_memsink;
 		}
@@ -150,40 +173,78 @@ static void *_video_sink_thread(void *arg) {
 
 		US_JLOG_INFO("video", "Memsink opened; reading frames ...");
 		while (!_STOP && _HAS_WATCHERS) {
-			const int result = us_memsink_fd_wait_frame(fd, mem, frame_id);
-			if (result == 0) {
-				us_frame_s *const frame = us_memsink_fd_get_frame(fd, mem, &frame_id, atomic_load(&_g_key_required));
-				if (frame == NULL) {
+			const int waited = us_memsink_fd_wait_frame(fd, mem, frame_id);
+			if (waited == 0) {
+				const int ri = us_ring_producer_acquire(_g_video_ring, 0);
+				us_frame_s *frame;
+				if (ri >= 0) {
+					frame = _g_video_ring->items[ri];
+				} else {
+					US_ONCE({ US_JLOG_PERROR("video", "Video ring is full"); });
+					frame = drop;
+				}
+
+				const int got = us_memsink_fd_get_frame(fd, mem, frame, &frame_id, atomic_load(&_g_key_required));
+				if (ri >= 0) {
+					us_ring_producer_release(_g_video_ring, ri);
+				}
+				if (got < 0) {
 					goto close_memsink;
 				}
-				if (frame->key) {
+
+				if (ri >= 0 && frame->key) {
 					atomic_store(&_g_key_required, false);
 				}
-				if (us_queue_put(_g_video_queue, frame, 0) != 0) {
-					US_ONCE({ US_JLOG_PERROR("video", "Video queue is full"); });
-					us_frame_destroy(frame);
-				}
-			} else if (result == -1) {
+			} else if (waited != US_ERROR_NO_DATA) {
 				goto close_memsink;
 			}
 		}
 
 	close_memsink:
-		US_DELETE(mem, us_memsink_shared_unmap);
-		US_CLOSE_FD(fd, close);
+		if (mem != NULL) {
+			us_memsink_shared_unmap(mem, data_size);
+			mem = NULL;
+		}
+		US_CLOSE_FD(fd);
 		US_JLOG_INFO("video", "Memsink closed");
 		sleep(1); // error_delay
 	}
+
+	us_frame_destroy(drop);
 	return NULL;
 }
 
-static void *_audio_thread(void *arg) {
-	(void)arg;
+static int _get_acap_hz(uint *hz) {
+	if (_g_config->acap_hz != 0) {
+		*hz = _g_config->acap_hz;
+		return 0;
+	}
+	if (_g_config->tc358743_dev_path == NULL) {
+		US_JLOG_ERROR("acap", "No configured sampling rate");
+		return -1;
+	}
+	int fd;
+	if ((fd = open(_g_config->tc358743_dev_path, O_RDWR)) < 0) {
+		US_JLOG_PERROR("acap", "Can't open TC358743 V4L2 device");
+		return -1;
+	}
+	const int checked = us_tc358743_xioctl_get_audio_hz(fd, hz);
+	if (checked < 0) {
+		US_JLOG_PERROR("acap", "Can't check TC358743 audio state (%d)", checked);
+		close(fd);
+		return -1;
+	}
+	close(fd);
+	return 0;
+}
 
-	US_THREAD_RENAME("us_audio");
-	atomic_store(&_g_audio_tid_created, true);
-	assert(_g_config->audio_dev_name != NULL);
-	assert(_g_config->tc358743_dev_path != NULL);
+static void *_acap_thread(void *arg) {
+	(void)arg;
+	US_THREAD_SETTLE("us_p_ac");
+	atomic_store(&_g_acap_tid_created, true);
+
+	assert(_g_config->acap_dev_name != NULL);
+	assert(_g_rtpa != NULL);
 
 	int once = 0;
 
@@ -193,58 +254,175 @@ static void *_audio_thread(void *arg) {
 			continue;
 		}
 
-		us_tc358743_info_s info = {0};
-		us_audio_s *audio = NULL;
+		uint hz = 0;
+		us_acap_s *acap = NULL;
 
-		if (us_tc358743_read_info(_g_config->tc358743_dev_path, &info) < 0) {
-			goto close_audio;
+		if (!us_au_probe(_g_config->acap_dev_name)) {
+			US_ONCE({ US_JLOG_ERROR("acap", "No PCM capture device"); });
+			goto close_acap;
 		}
-		if (!info.has_audio) {
-			US_ONCE({ US_JLOG_INFO("audio", "No audio presented from the host"); });
-			goto close_audio;
+		if (_get_acap_hz(&hz) < 0) {
+			goto close_acap;
 		}
-		US_ONCE({ US_JLOG_INFO("audio", "Detected host audio"); });
-		if ((audio = us_audio_init(_g_config->audio_dev_name, info.audio_hz)) == NULL) {
-			goto close_audio;
+		if (hz == 0) {
+			US_ONCE({ US_JLOG_INFO("acap", "No audio presented from the host"); });
+			goto close_acap;
+		}
+		US_ONCE({ US_JLOG_INFO("acap", "Detected host audio"); });
+		if ((acap = us_acap_init(_g_config->acap_dev_name, hz)) == NULL) {
+			goto close_acap;
 		}
 
 		once = 0;
 
 		while (!_STOP && _HAS_WATCHERS && _HAS_LISTENERS) {
-			if (
-				us_tc358743_read_info(_g_config->tc358743_dev_path, &info) < 0
-				|| !info.has_audio
-				|| audio->pcm_hz != info.audio_hz
-			) {
-				goto close_audio;
+			if (_get_acap_hz(&hz) < 0 || acap->pcm_hz != hz) {
+				goto close_acap;
 			}
-
-			uz size = US_RTP_DATAGRAM_SIZE - US_RTP_HEADER_SIZE;
+			uz size = US_RTP_TOTAL_SIZE - US_RTP_HEADER_SIZE;
 			u8 data[size];
 			u64 pts;
-			const int result = us_audio_get_encoded(audio, data, &size, &pts);
+			const int result = us_acap_get_encoded(acap, data, &size, &pts);
 			if (result == 0) {
-				_LOCK_AUDIO;
+				_LOCK_ACAP;
 				us_rtpa_wrap(_g_rtpa, data, size, pts);
-				_UNLOCK_AUDIO;
+				_UNLOCK_ACAP;
 			} else if (result == -1) {
-				goto close_audio;
+				goto close_acap;
 			}
 		}
 
-	close_audio:
-		US_DELETE(audio, us_audio_destroy);
+	close_acap:
+		US_DELETE(acap, us_acap_destroy);
 		sleep(1); // error_delay
 	}
 	return NULL;
 }
 
+static void *_aplay_thread(void *arg) {
+	(void)arg;
+	US_THREAD_SETTLE("us_p_ap");
+	atomic_store(&_g_aplay_tid_created, true);
+
+	assert(_g_config->aplay_dev_name != NULL);
+
+	int once = 0;
+
+	while (!_STOP) {
+		snd_pcm_t *dev = NULL;
+		bool skip = true;
+
+		while (!_STOP) {
+			usleep((US_AU_FRAME_MS / 4) * 1000);
+
+			us_au_pcm_s mixed = {0};
+			_LOCK_APLAY;
+			US_LIST_ITERATE(_g_clients, client, {
+				us_au_pcm_s last = {0};
+				do {
+					const int ri = us_ring_consumer_acquire(client->aplay_pcm_ring, 0);
+					if (ri >= 0) {
+						const us_au_pcm_s *pcm = client->aplay_pcm_ring->items[ri];
+						memcpy(&last, pcm, sizeof(us_au_pcm_s));
+						us_ring_consumer_release(client->aplay_pcm_ring, ri);
+					} else {
+						break;
+					}
+				} while (skip && !_STOP);
+				us_au_pcm_mix(&mixed, &last);
+				// US_JLOG_INFO("++++++", "mixed %p", client);
+			});
+			_UNLOCK_APLAY;
+			// US_JLOG_INFO("++++++", "--------------");
+
+			if (skip) {
+				static uint skipped = 0;
+				if (skipped < (1000 / (US_AU_FRAME_MS / 4))) {
+					++skipped;
+					continue;
+				} else {
+					skipped = 0;
+				}
+			}
+
+			if (!_HAS_WATCHERS || !_HAS_LISTENERS || !_HAS_SPEAKERS) {
+				goto close_aplay;
+			}
+
+			if (dev == NULL) {
+				if (!us_au_probe(_g_config->aplay_dev_name)) {
+					US_ONCE({ US_JLOG_ERROR("aplay", "No PCM playback device"); });
+					goto close_aplay;
+				}
+
+				int err = snd_pcm_open(&dev, _g_config->aplay_dev_name, SND_PCM_STREAM_PLAYBACK, 0);
+				if (err < 0) {
+					US_ONCE({ US_JLOG_PERROR_ALSA(err, "aplay", "Can't open PCM playback"); });
+					goto close_aplay;
+				}
+
+				err = snd_pcm_set_params(dev, SND_PCM_FORMAT_S16_LE, SND_PCM_ACCESS_RW_INTERLEAVED,
+					US_RTP_OPUS_CH, US_RTP_OPUS_HZ, 1 /* soft resample */, 50000 /* 50000 = 0.05sec */
+				);
+				if (err < 0) {
+					US_ONCE({ US_JLOG_PERROR_ALSA(err, "aplay", "Can't configure PCM playback"); });
+					goto close_aplay;
+				}
+
+				US_JLOG_INFO("aplay", "Playback opened, playing ...");
+				once = 0;
+			}
+
+			if (dev != NULL && mixed.frames > 0) {
+				snd_pcm_sframes_t frames = snd_pcm_writei(dev, mixed.data, mixed.frames);
+				if (frames < 0) {
+					frames = snd_pcm_recover(dev, frames, 1);
+				} else {
+					if (once != 0) {
+						US_JLOG_INFO("aplay", "Playing resumed (snd_pcm_writei) ...");
+					}
+					once = 0;
+					skip = false;
+				}
+				if (frames < 0) {
+					US_ONCE({ US_JLOG_PERROR_ALSA(frames, "aplay", "Can't play to PCM playback"); });
+					if (frames == -ENODEV) {
+						goto close_aplay;
+					}
+					skip = true;
+				} else {
+					if (once != 0) {
+						US_JLOG_INFO("aplay", "Playing resumed (snd_pcm_recover) ...");
+					}
+					once = 0;
+					skip = false;
+				}
+			}
+		}
+
+	close_aplay:
+		if (dev != NULL) {
+			US_DELETE(dev, snd_pcm_close);
+			US_JLOG_INFO("aplay", "Playback closed");
+		}
+	}
+	return NULL;
+}
+
 static void _relay_rtp_clients(const us_rtp_s *rtp) {
 	US_LIST_ITERATE(_g_clients, client, {
 		us_janus_client_send(client, rtp);
 	});
 }
 
+static void _alsa_quiet(const char *file, int line, const char *func, int err, const char *fmt, ...) {
+	(void)file;
+	(void)line;
+	(void)func;
+	(void)err;
+	(void)fmt;
+}
+
 static int _plugin_init(janus_callbacks *gw, const char *config_dir_path) {
 	// https://groups.google.com/g/meetecho-janus/c/xoWIQfaoJm8
 	// sysctl -w net.core.rmem_default=500000 
@@ -258,11 +436,16 @@ static int _plugin_init(janus_callbacks *gw, const char *config_dir_path) {
 	}
 	_g_gw = gw;
 
-	_g_video_queue = us_queue_init(1024);
+	snd_lib_error_set_handler(_alsa_quiet);
+
+	US_RING_INIT_WITH_ITEMS(_g_video_ring, 64, us_frame_init);
 	_g_rtpv = us_rtpv_init(_relay_rtp_clients);
-	if (_g_config->audio_dev_name != NULL && us_audio_probe(_g_config->audio_dev_name)) {
+	if (_g_config->acap_dev_name != NULL) {
 		_g_rtpa = us_rtpa_init(_relay_rtp_clients);
-		US_THREAD_CREATE(_g_audio_tid, _audio_thread, NULL);
+		US_THREAD_CREATE(_g_acap_tid, _acap_thread, NULL);
+		if (_g_config->aplay_dev_name != NULL) {
+			US_THREAD_CREATE(_g_aplay_tid, _aplay_thread, NULL);
+		}
 	}
 	US_THREAD_CREATE(_g_video_rtp_tid, _video_rtp_thread, NULL);
 	US_THREAD_CREATE(_g_video_sink_tid, _video_sink_thread, NULL);
@@ -278,7 +461,8 @@ static void _plugin_destroy(void) {
 #	define JOIN(_tid) { if (atomic_load(&_tid##_created)) { US_THREAD_JOIN(_tid); } }
 	JOIN(_g_video_sink_tid);
 	JOIN(_g_video_rtp_tid);
-	JOIN(_g_audio_tid);
+	JOIN(_g_acap_tid);
+	JOIN(_g_aplay_tid);
 #	undef JOIN
 
 	US_LIST_ITERATE(_g_clients, client, {
@@ -286,15 +470,13 @@ static void _plugin_destroy(void) {
 		us_janus_client_destroy(client);
 	});
 
-	US_QUEUE_DELETE_WITH_ITEMS(_g_video_queue, us_frame_destroy);
+	US_RING_DELETE_WITH_ITEMS(_g_video_ring, us_frame_destroy);
 
 	US_DELETE(_g_rtpa, us_rtpa_destroy);
 	US_DELETE(_g_rtpv, us_rtpv_destroy);
 	US_DELETE(_g_config, us_config_destroy);
 }
 
-#define _IF_DISABLED(...) { if (!_READY || _STOP) { __VA_ARGS__ } }
-
 static void _plugin_create_session(janus_plugin_session *session, int *err) {
 	_IF_DISABLED({ *err = -1; return; });
 	_LOCK_ALL;
@@ -311,6 +493,7 @@ static void _plugin_destroy_session(janus_plugin_session* session, int *err) {
 	bool found = false;
 	bool has_watchers = false;
 	bool has_listeners = false;
+	bool has_speakers = false;
 	US_LIST_ITERATE(_g_clients, client, {
 		if (client->session == session) {
 			US_JLOG_INFO("main", "Removing session %p ...", session);
@@ -319,7 +502,8 @@ static void _plugin_destroy_session(janus_plugin_session* session, int *err) {
 			found = true;
 		} else {
 			has_watchers = (has_watchers || atomic_load(&client->transmit));
-			has_listeners = (has_listeners || atomic_load(&client->transmit_audio));
+			has_listeners = (has_listeners || atomic_load(&client->transmit_acap));
+			has_speakers = (has_speakers || atomic_load(&client->transmit_aplay));
 		}
 	});
 	if (!found) {
@@ -328,6 +512,7 @@ static void _plugin_destroy_session(janus_plugin_session* session, int *err) {
 	}
 	atomic_store(&_g_has_watchers, has_watchers);
 	atomic_store(&_g_has_listeners, has_listeners);
+	atomic_store(&_g_has_speakers, has_speakers);
 	_UNLOCK_ALL;
 }
 
@@ -366,25 +551,19 @@ static void _set_transmit(janus_plugin_session *session, const char *msg, bool t
 	_UNLOCK_ALL;
 }
 
-#undef _IF_DISABLED
-
 static void _plugin_setup_media(janus_plugin_session *session) { _set_transmit(session, "Unmuted", true); }
 static void _plugin_hangup_media(janus_plugin_session *session) { _set_transmit(session, "Muted", false); }
 
 static struct janus_plugin_result *_plugin_handle_message(
 	janus_plugin_session *session, char *transaction, json_t *msg, json_t *jsep) {
 
-	assert(transaction != NULL);
-
-#	define FREE_MSG_JSEP { \
-			US_DELETE(msg, json_decref); \
-			US_DELETE(jsep, json_decref); \
-		}
+	janus_plugin_result_type result_type = JANUS_PLUGIN_OK;
+	char *result_msg = NULL;
 
 	if (session == NULL || msg == NULL) {
-		free(transaction);
-		FREE_MSG_JSEP;
-		return janus_plugin_result_new(JANUS_PLUGIN_ERROR, (msg ? "No session" : "No message"), NULL);
+		result_type = JANUS_PLUGIN_ERROR;
+		result_msg = (msg ? "No session" : "No message");
+		goto done;
 	}
 
 #	define PUSH_ERROR(x_error, x_reason) { \
@@ -393,20 +572,20 @@ static struct janus_plugin_result *_plugin_handle_message(
 			json_object_set_new(m_event, "ustreamer", json_string("event")); \
 			json_object_set_new(m_event, "error_code", json_integer(x_error)); \
 			json_object_set_new(m_event, "error", json_string(x_reason)); \
-			_g_gw->push_event(session, create(), transaction, m_event, NULL); \
+			_g_gw->push_event(session, create(), NULL, m_event, NULL); \
 			json_decref(m_event); \
 		}
 
 	json_t *const request = json_object_get(msg, "request");
 	if (request == NULL) {
 		PUSH_ERROR(400, "Request missing");
-		goto ok_wait;
+		goto done;
 	}
 
 	const char *const request_str = json_string_value(request);
 	if (request_str == NULL) {
 		PUSH_ERROR(400, "Request not a string");
-		goto ok_wait;
+		goto done;
 	}
 	// US_JLOG_INFO("main", "Message: %s", request_str);
 
@@ -416,10 +595,10 @@ static struct janus_plugin_result *_plugin_handle_message(
 			json_t *const m_result = json_object(); \
 			json_object_set_new(m_result, "status", json_string(x_status)); \
 			if (x_payload != NULL) { \
-				json_object_set_new(m_result, x_status, x_payload); \
+				json_object_set(m_result, x_status, x_payload); \
 			} \
 			json_object_set_new(m_event, "result", m_result); \
-			_g_gw->push_event(session, create(), transaction, m_event, x_jsep); \
+			_g_gw->push_event(session, create(), NULL, m_event, x_jsep); \
 			json_decref(m_event); \
 		}
 
@@ -430,61 +609,75 @@ static struct janus_plugin_result *_plugin_handle_message(
 		PUSH_STATUS("stopped", NULL, NULL);
 
 	} else if (!strcmp(request_str, "watch")) {
-		bool with_audio = false;
+		uint video_orient = 0;
+		bool with_acap = false;
+		bool with_aplay = false;
 		{
 			json_t *const params = json_object_get(msg, "params");
 			if (params != NULL) {
-				json_t *const audio = json_object_get(params, "audio");
-				if (audio != NULL && json_is_boolean(audio)) {
-					with_audio = (_g_rtpa != NULL && json_boolean_value(audio));
+				{
+					json_t *const obj = json_object_get(params, "audio");
+					if (obj != NULL && json_is_boolean(obj)) {
+						with_acap = (us_au_probe(_g_config->acap_dev_name) && json_boolean_value(obj));
+					}
+				}
+				{
+					json_t *const obj = json_object_get(params, "mic");
+					if (obj != NULL && json_is_boolean(obj)) {
+						with_aplay = (us_au_probe(_g_config->aplay_dev_name) && json_boolean_value(obj));
+					}
+				}
+				{
+					json_t *const obj = json_object_get(params, "orientation");
+					if (obj != NULL && json_is_integer(obj)) {
+						video_orient = json_integer_value(obj);
+						switch (video_orient) {
+							case 90: case 180: case 270: break;
+							default: video_orient = 0; break;
+						}
+					}
 				}
 			}
 		}
 
 		{
-			char *sdp;
-			char *const video_sdp = us_rtpv_make_sdp(_g_rtpv);
-			char *const audio_sdp = (with_audio ? us_rtpa_make_sdp(_g_rtpa) : us_strdup(""));
-			US_ASPRINTF(sdp,
-				"v=0" RN
-				"o=- %" PRIu64 " 1 IN IP4 0.0.0.0" RN
-				"s=PiKVM uStreamer" RN
-				"t=0 0" RN
-				"%s%s",
-				us_get_now_id() >> 1,
-#				if JANUS_PLUGIN_API_VERSION >= 100
-				// Place video SDP before audio SDP so that the video and audio streams
-				// have predictable indices, even if audio is not available.
-				// See also client.c.
-				video_sdp, audio_sdp
-#				else
-				// For versions of Janus prior to 1.x, place the audio SDP first.
-				audio_sdp, video_sdp
-#				endif
-			);
+			char *const sdp = us_sdp_create(
+				_g_rtpv,
+				(with_acap ? _g_rtpa : NULL),
+				(with_acap && with_aplay));
 			json_t *const offer_jsep = json_pack("{ssss}", "type", "offer", "sdp", sdp);
 			PUSH_STATUS("started", NULL, offer_jsep);
 			json_decref(offer_jsep);
-			free(audio_sdp);
-			free(video_sdp);
 			free(sdp);
 		}
 
 		{
 			_LOCK_ALL;
 			bool has_listeners = false;
+			bool has_speakers = false;
 			US_LIST_ITERATE(_g_clients, client, {
 				if (client->session == session) {
-					atomic_store(&client->transmit_audio, with_audio);
+					atomic_store(&client->transmit_acap, with_acap);
+					atomic_store(&client->transmit_aplay, with_aplay);
+					atomic_store(&client->video_orient, video_orient);
 				}
-				has_listeners = (has_listeners || atomic_load(&client->transmit_audio));
+				has_listeners = (has_listeners || atomic_load(&client->transmit_acap));
+				has_speakers = (has_speakers || atomic_load(&client->transmit_aplay));
 			});
 			atomic_store(&_g_has_listeners, has_listeners);
+			atomic_store(&_g_has_speakers, has_speakers);
 			_UNLOCK_ALL;
 		}
 
 	} else if (!strcmp(request_str, "features")) {
-		json_t *const features = json_pack("{sb}", "audio", (_g_rtpa != NULL));
+		const char *const ice_url = getenv("JANUS_USTREAMER_WEB_ICE_URL");
+		const bool acap_avail = us_au_probe(_g_config->acap_dev_name);
+		json_t *const features = json_pack(
+			"{s:b, s:b, s:{s:s?}}",
+			"audio", acap_avail,
+			"mic", (acap_avail && us_au_probe(_g_config->aplay_dev_name)),
+			"ice", "url", (ice_url != NULL ? ice_url : default_ice_url)
+		);
 		PUSH_STATUS("features", features, NULL);
 		json_decref(features);
 
@@ -496,19 +689,40 @@ static struct janus_plugin_result *_plugin_handle_message(
 		PUSH_ERROR(405, "Not implemented");
 	}
 
-ok_wait:
-	FREE_MSG_JSEP;
-	return janus_plugin_result_new(JANUS_PLUGIN_OK_WAIT, NULL, NULL);
+done:
+	US_DELETE(transaction, free);
+	US_DELETE(msg, json_decref);
+	US_DELETE(jsep, json_decref);
+
+	return janus_plugin_result_new(
+		result_type, result_msg,
+		(result_type == JANUS_PLUGIN_OK ? json_pack("{sb}", "ok", 1) : NULL));
 
 #	undef PUSH_STATUS
 #	undef PUSH_ERROR
-#	undef FREE_MSG_JSEP
 }
 
-static void _plugin_incoming_rtcp(janus_plugin_session *handle, janus_plugin_rtcp *packet) {
-	(void)handle;
-	(void)packet;
-	if (packet->video && janus_rtcp_has_pli(packet->buffer, packet->length)) {
+static void _plugin_incoming_rtp(janus_plugin_session *session, janus_plugin_rtp *packet) {
+	_IF_DISABLED({ return; });
+	if (session == NULL || packet == NULL || packet->video) {
+		return; // Accept only valid audio
+	}
+	_LOCK_APLAY;
+	US_LIST_ITERATE(_g_clients, client, {
+		if (client->session == session) {
+			us_janus_client_recv(client, packet);
+			break;
+		}
+	});
+	_UNLOCK_APLAY;
+}
+
+static void _plugin_incoming_rtcp(janus_plugin_session *session, janus_plugin_rtcp *packet) {
+	_IF_DISABLED({ return; });
+	if (session == NULL || packet == NULL || !packet->video) {
+		return; // Accept only valid video
+	}
+	if (janus_rtcp_has_pli(packet->buffer, packet->length)) {
 		// US_JLOG_INFO("main", "Got video PLI");
 		atomic_store(&_g_key_required, true);
 	}
@@ -549,6 +763,7 @@ janus_plugin *create(void) {
 		.get_author = _plugin_get_author,
 		.get_package = _plugin_get_package,
 
+		.incoming_rtp = _plugin_incoming_rtp,
 		.incoming_rtcp = _plugin_incoming_rtcp,
 	);
 #	pragma GCC diagnostic pop

janus/src/rtp.c

@@ -5,7 +5,7 @@
 #    This source file is partially based on this code:                       #
 #      - https://github.com/catid/kvm/blob/master/kvm_pipeline/src           #
 #                                                                            #
-#    Copyright (C) 2018-2023  Maxim Devaev <mdevaev@gmail.com>               #
+#    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    #
@@ -31,26 +31,22 @@
 #include "uslibs/tools.h"
 
 
-us_rtp_s *us_rtp_init(uint payload, bool video) {
+us_rtp_s *us_rtp_init(void) {
 	us_rtp_s *rtp;
 	US_CALLOC(rtp, 1);
-	rtp->payload = payload;
-	rtp->video = video;
-	rtp->ssrc = us_triple_u32(us_get_now_monotonic_u64());
 	return rtp;
 }
 
-us_rtp_s *us_rtp_dup(const us_rtp_s *rtp) {
-	us_rtp_s *new;
-	US_CALLOC(new, 1);
-	memcpy(new, rtp, sizeof(us_rtp_s));
-	return new;
-}
-
 void us_rtp_destroy(us_rtp_s *rtp) {
 	free(rtp);
 }
 
+void us_rtp_assign(us_rtp_s *rtp, uint payload, bool video) {
+	rtp->payload = payload;
+	rtp->video = video;
+	rtp->ssrc = us_triple_u32(us_get_now_monotonic_u64());
+}
+
 void us_rtp_write_header(us_rtp_s *rtp, u32 pts, bool marked) {
 	u32 word0 = 0x80000000;
 	if (marked) {
@@ -61,7 +57,7 @@ void us_rtp_write_header(us_rtp_s *rtp, u32 pts, bool marked) {
 	++rtp->seq;
 
 #	define WRITE_BE_U32(x_offset, x_value) \
-		*((u32 *)(rtp->datagram + x_offset)) = __builtin_bswap32(x_value)
+		*((u32*)(rtp->datagram + x_offset)) = __builtin_bswap32(x_value)
 	WRITE_BE_U32(0, word0);
 	WRITE_BE_U32(4, pts);
 	WRITE_BE_U32(8, rtp->ssrc);

janus/src/rtp.h

@@ -2,7 +2,7 @@
 #                                                                            #
 #    uStreamer - Lightweight and fast MJPEG-HTTP streamer.                   #
 #                                                                            #
-#    Copyright (C) 2018-2023  Maxim Devaev <mdevaev@gmail.com>               #
+#    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    #
@@ -25,9 +25,23 @@
 #include "uslibs/types.h"
 
 
-// https://stackoverflow.com/questions/47635545/why-webrtc-chose-rtp-max-packet-size-to-1200-bytes
-#define US_RTP_DATAGRAM_SIZE	1200
+// Max RTP size for WebRTC is 1200 bytes:
+//   - https://stackoverflow.com/questions/47635545/why-webrtc-chose-rtp-max-packet-size-to-1200-bytes
+// But(!) Tailscale has 1200 MTU. So to fit it required to substract:
+// 1. possible RTP extensions (see sdp.c)
+// 2. additional SRTP fields (>= 10 bytes)
+// 3. UDP header (8 bytes)
+// 4. IPv6 header (40 bytes)
+// Finally it looks like 100 bytes for all above should be enough
+#define US_RTP_TOTAL_SIZE		(1200 - 100)
 #define US_RTP_HEADER_SIZE		12
+#define US_RTP_PAYLOAD_SIZE		(US_RTP_TOTAL_SIZE - US_RTP_HEADER_SIZE)
+
+#define US_RTP_H264_PAYLOAD		96
+#define US_RTP_OPUS_PAYLOAD		111
+
+#define US_RTP_OPUS_HZ			48000
+#define US_RTP_OPUS_CH			2
 
 
 typedef struct {
@@ -36,16 +50,20 @@ typedef struct {
 	u32		ssrc;
 
 	u16		seq;
-	u8		datagram[US_RTP_DATAGRAM_SIZE];
+	u8		datagram[US_RTP_TOTAL_SIZE];
 	uz		used;
+
+	bool	first_of_frame;
+	bool	last_of_frame;
 	bool	zero_playout_delay;
+	u64		grab_ntp_ts;
 } us_rtp_s;
 
 typedef void (*us_rtp_callback_f)(const us_rtp_s *rtp);
 
 
-us_rtp_s *us_rtp_init(uint payload, bool video);
-us_rtp_s *us_rtp_dup(const us_rtp_s *rtp);
+us_rtp_s *us_rtp_init(void);
 void us_rtp_destroy(us_rtp_s *rtp);
 
+void us_rtp_assign(us_rtp_s *rtp, uint payload, bool video);
 void us_rtp_write_header(us_rtp_s *rtp, u32 pts, bool marked);

janus/src/rtpa.c

@@ -2,7 +2,7 @@
 #                                                                            #
 #    uStreamer - Lightweight and fast MJPEG-HTTP streamer.                   #
 #                                                                            #
-#    Copyright (C) 2018-2023  Maxim Devaev <mdevaev@gmail.com>               #
+#    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    #
@@ -23,16 +23,18 @@
 #include "rtpa.h"
 
 #include <stdlib.h>
-#include <inttypes.h>
 
 #include "uslibs/types.h"
 #include "uslibs/tools.h"
 
+#include "rtp.h"
+
 
 us_rtpa_s *us_rtpa_init(us_rtp_callback_f callback) {
 	us_rtpa_s *rtpa;
 	US_CALLOC(rtpa, 1);
-	rtpa->rtp = us_rtp_init(111, false);
+	rtpa->rtp = us_rtp_init();
+	us_rtp_assign(rtpa->rtp, US_RTP_OPUS_PAYLOAD, false);
 	rtpa->callback = callback;
 	return rtpa;
 }
@@ -42,27 +44,8 @@ void us_rtpa_destroy(us_rtpa_s *rtpa) {
 	free(rtpa);
 }
 
-char *us_rtpa_make_sdp(us_rtpa_s *rtpa) {
-	const uint pl = rtpa->rtp->payload;
-	char *sdp;
-	US_ASPRINTF(sdp,
-		"m=audio 1 RTP/SAVPF %u" RN
-		"c=IN IP4 0.0.0.0" RN
-		"a=rtpmap:%u OPUS/48000/2" RN
-		// "a=fmtp:%u useinbandfec=1" RN
-		"a=rtcp-fb:%u nack" RN
-		"a=rtcp-fb:%u nack pli" RN
-		"a=rtcp-fb:%u goog-remb" RN
-		"a=ssrc:%" PRIu32 " cname:ustreamer" RN
-		"a=sendonly" RN,
-		pl, pl, pl, pl, pl, // pl,
-		rtpa->rtp->ssrc
-	);
-	return sdp;
-}
-
 void us_rtpa_wrap(us_rtpa_s *rtpa, const u8 *data, uz size, u32 pts) {
-    if (size + US_RTP_HEADER_SIZE <= US_RTP_DATAGRAM_SIZE) {
+    if (size + US_RTP_HEADER_SIZE <= US_RTP_TOTAL_SIZE) {
         us_rtp_write_header(rtpa->rtp, pts, false);
         memcpy(rtpa->rtp->datagram + US_RTP_HEADER_SIZE, data, size);
 		rtpa->rtp->used = size + US_RTP_HEADER_SIZE;

janus/src/rtpa.h

@@ -2,7 +2,7 @@
 #                                                                            #
 #    uStreamer - Lightweight and fast MJPEG-HTTP streamer.                   #
 #                                                                            #
-#    Copyright (C) 2018-2023  Maxim Devaev <mdevaev@gmail.com>               #
+#    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    #
@@ -36,5 +36,4 @@ typedef struct {
 us_rtpa_s *us_rtpa_init(us_rtp_callback_f callback);
 void us_rtpa_destroy(us_rtpa_s *rtpa);
 
-char *us_rtpa_make_sdp(us_rtpa_s *rtpa);
 void us_rtpa_wrap(us_rtpa_s *rtpa, const u8 *data, uz size, u32 pts);

janus/src/rtpv.c

@@ -5,7 +5,7 @@
 #    This source file is partially based on this code:                       #
 #      - https://github.com/catid/kvm/blob/master/kvm_pipeline/src           #
 #                                                                            #
-#    Copyright (C) 2018-2023  Maxim Devaev <mdevaev@gmail.com>               #
+#    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    #
@@ -35,6 +35,8 @@
 #include "uslibs/tools.h"
 #include "uslibs/frame.h"
 
+#include "rtp.h"
+
 
 void _rtpv_process_nalu(us_rtpv_s *rtpv, const u8 *data, uz size, u32 pts, bool marked);
 
@@ -44,7 +46,8 @@ static sz _find_annexb(const u8 *data, uz size);
 us_rtpv_s *us_rtpv_init(us_rtp_callback_f callback) {
 	us_rtpv_s *rtpv;
 	US_CALLOC(rtpv, 1);
-	rtpv->rtp = us_rtp_init(96, true);
+	rtpv->rtp = us_rtp_init();
+	us_rtp_assign(rtpv->rtp, US_RTP_H264_PAYLOAD, true);
 	rtpv->callback = callback;
 	return rtpv;
 }
@@ -54,30 +57,6 @@ void us_rtpv_destroy(us_rtpv_s *rtpv) {
 	free(rtpv);
 }
 
-char *us_rtpv_make_sdp(us_rtpv_s *rtpv) {
-	// https://tools.ietf.org/html/rfc6184
-	// https://github.com/meetecho/janus-gateway/issues/2443
-	const uint pl = rtpv->rtp->payload;
-	char *sdp;
-	US_ASPRINTF(sdp,
-		"m=video 1 RTP/SAVPF %u" RN
-		"c=IN IP4 0.0.0.0" RN
-		"a=rtpmap:%u H264/90000" RN
-		"a=fmtp:%u profile-level-id=42E01F" RN
-		"a=fmtp:%u packetization-mode=1" RN
-		"a=rtcp-fb:%u nack" RN
-		"a=rtcp-fb:%u nack pli" RN
-		"a=rtcp-fb:%u goog-remb" RN
-		"a=ssrc:%" PRIu32 " cname:ustreamer" RN
-		"a=extmap:1 http://www.webrtc.org/experiments/rtp-hdrext/playout-delay" RN
-		"a=sendonly" RN,
-		pl, pl, pl, pl,
-		pl, pl, pl,
-		rtpv->rtp->ssrc
-	);
-	return sdp;
-}
-
 #define _PRE 3 // Annex B prefix length
 
 void us_rtpv_wrap(us_rtpv_s *rtpv, const us_frame_s *frame, bool zero_playout_delay) {
@@ -86,7 +65,10 @@ void us_rtpv_wrap(us_rtpv_s *rtpv, const us_frame_s *frame, bool zero_playout_de
 
 	assert(frame->format == V4L2_PIX_FMT_H264);
 
+	rtpv->rtp->first_of_frame = true;
+	rtpv->rtp->last_of_frame = false;
 	rtpv->rtp->zero_playout_delay = zero_playout_delay;
+	rtpv->rtp->grab_ntp_ts = us_get_now_ntp() - us_ld_to_ntp(us_get_now_monotonic() - frame->grab_begin_ts);
 
 	const u32 pts = us_get_now_monotonic_u64() * 9 / 100; // PTS units are in 90 kHz
 	sz last_offset = -_PRE;
@@ -123,11 +105,30 @@ void _rtpv_process_nalu(us_rtpv_s *rtpv, const u8 *data, uz size, u32 pts, bool
 	const uint type = data[0] & 0x1F;
 	u8 *dg = rtpv->rtp->datagram;
 
-	if (size + US_RTP_HEADER_SIZE <= US_RTP_DATAGRAM_SIZE) {
+	// Set *_of_frame flags only for non-SPS/PPS packages
+/*
+#	define CALL_FOR_SERVICE { \
+			const bool m_fof = rtpv->rtp->first_of_frame; \
+			const bool m_lof = rtpv->rtp->last_of_frame; \
+			rtpv->rtp->first_of_frame = false; \
+			rtpv->rtp->last_of_frame = false; \
+			rtpv->callback(rtpv->rtp); \
+			rtpv->rtp->first_of_frame = m_fof; \
+			rtpv->rtp->last_of_frame = m_lof; \
+		}
+*/
+
+	if (size + US_RTP_HEADER_SIZE <= US_RTP_TOTAL_SIZE) {
 		us_rtp_write_header(rtpv->rtp, pts, marked);
 		memcpy(dg + US_RTP_HEADER_SIZE, data, size);
 		rtpv->rtp->used = size + US_RTP_HEADER_SIZE;
-		rtpv->callback(rtpv->rtp);
+//		if (type == 7 || type == 8) {
+//			CALL_FOR_SERVICE;
+//		} else {*/
+			rtpv->rtp->last_of_frame = true;
+			rtpv->callback(rtpv->rtp);
+			rtpv->rtp->first_of_frame = false;
+//		}
 		return;
 	}
 
@@ -138,7 +139,7 @@ void _rtpv_process_nalu(us_rtpv_s *rtpv, const u8 *data, uz size, u32 pts, bool
 
 	bool first = true;
 	while (remaining > 0) {
-		sz frag_size = US_RTP_DATAGRAM_SIZE - fu_overhead;
+		sz frag_size = US_RTP_TOTAL_SIZE - fu_overhead;
 		const bool last = (remaining <= frag_size);
 		if (last) {
 			frag_size = remaining;
@@ -159,12 +160,20 @@ void _rtpv_process_nalu(us_rtpv_s *rtpv, const u8 *data, uz size, u32 pts, bool
 
 		memcpy(dg + fu_overhead, src, frag_size);
 		rtpv->rtp->used = fu_overhead + frag_size;
-		rtpv->callback(rtpv->rtp);
+//		if (type == 7 || type == 8) {
+//			CALL_FOR_SERVICE;
+//		} else {
+			rtpv->rtp->last_of_frame = last;
+			rtpv->callback(rtpv->rtp);
+			rtpv->rtp->first_of_frame = false;
+//		}
 
 		src += frag_size;
 		remaining -= frag_size;
 		first = false;
 	}
+
+#	undef CALL_FOR_SERVICE
 }
 
 static sz _find_annexb(const u8 *data, uz size) {

janus/src/rtpv.h

@@ -2,7 +2,7 @@
 #                                                                            #
 #    uStreamer - Lightweight and fast MJPEG-HTTP streamer.                   #
 #                                                                            #
-#    Copyright (C) 2018-2023  Maxim Devaev <mdevaev@gmail.com>               #
+#    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    #
@@ -37,5 +37,4 @@ typedef struct {
 us_rtpv_s *us_rtpv_init(us_rtp_callback_f callback);
 void us_rtpv_destroy(us_rtpv_s *rtpv);
 
-char *us_rtpv_make_sdp(us_rtpv_s *rtpv);
 void us_rtpv_wrap(us_rtpv_s *rtpv, const us_frame_s *frame, bool zero_playout_delay);

janus/src/sdp.c

@@ -0,0 +1,110 @@
+/*****************************************************************************
+#                                                                            #
+#    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 "sdp.h"
+
+#include <inttypes.h>
+
+#include <janus/plugins/plugin.h>
+
+#include "uslibs/types.h"
+#include "uslibs/tools.h"
+
+#include "rtp.h"
+#include "rtpv.h"
+#include "rtpa.h"
+
+
+char *us_sdp_create(us_rtpv_s *rtpv, us_rtpa_s *rtpa, bool mic) {
+	char *video_sdp;
+	{
+		// https://tools.ietf.org/html/rfc6184
+		// https://github.com/meetecho/janus-gateway/issues/2443
+		const uint pl = rtpv->rtp->payload;
+		US_ASPRINTF(
+			video_sdp,
+			"m=video 1 RTP/SAVPF %u" RN
+			"c=IN IP4 0.0.0.0" RN
+			"a=rtpmap:%u H264/90000" RN
+			"a=fmtp:%u profile-level-id=42E01F;packetization-mode=1" RN
+			"a=rtcp-fb:%u nack" RN
+			"a=rtcp-fb:%u nack pli" RN
+			"a=rtcp-fb:%u goog-remb" RN
+			"a=mid:v" RN
+			"a=msid:video v" RN
+			"a=ssrc:%" PRIu32 " cname:ustreamer" RN
+			"a=extmap:1/sendonly urn:3gpp:video-orientation" RN
+			"a=extmap:2/sendonly http://www.webrtc.org/experiments/rtp-hdrext/playout-delay" RN
+			"a=extmap:3/sendonly http://www.webrtc.org/experiments/rtp-hdrext/abs-capture-time" RN
+			"a=sendonly" RN,
+			pl, pl, pl, pl, pl, pl,
+			rtpv->rtp->ssrc);
+	}
+
+	char *audio_sdp;
+	if (rtpa == NULL) {
+		audio_sdp = us_strdup("");
+	} else {
+		const uint pl = rtpa->rtp->payload;
+		US_ASPRINTF(
+			audio_sdp,
+			"m=audio 1 RTP/SAVPF %u" RN
+			"c=IN IP4 0.0.0.0" RN
+			"a=rtpmap:%u OPUS/%u/%u" RN
+			"a=fmtp:%u sprop-stereo=1" RN // useinbandfec=1
+			"a=rtcp-fb:%u nack" RN
+			"a=rtcp-fb:%u nack pli" RN
+			"a=rtcp-fb:%u goog-remb" RN
+			"a=mid:a" RN
+			"a=msid:audio a" RN
+			"a=ssrc:%" PRIu32 " cname:ustreamer" RN
+			"a=%s" RN,
+			pl, pl,
+			US_RTP_OPUS_HZ, US_RTP_OPUS_CH,
+			pl, pl, pl, pl,
+			rtpa->rtp->ssrc,
+			(mic ? "sendrecv" : "sendonly"));
+	}
+
+	char *sdp;
+	US_ASPRINTF(sdp,
+		"v=0" RN
+		"o=- %" PRIu64 " 1 IN IP4 0.0.0.0" RN
+		"s=PiKVM uStreamer" RN
+		"t=0 0" RN
+		"%s%s",
+		us_get_now_id() >> 1,
+#		if JANUS_PLUGIN_API_VERSION >= 100
+		// Place video SDP before audio SDP so that the video and audio streams
+		// have predictable indices, even if audio is not available.
+		// See also client.c.
+		video_sdp, audio_sdp
+#		else
+		// For versions of Janus prior to 1.x, place the audio SDP first.
+		audio_sdp, video_sdp
+#		endif
+	);
+
+	free(audio_sdp);
+	free(video_sdp);
+	return sdp;
+}

janus/src/sdp.h

@@ -2,7 +2,7 @@
 #                                                                            #
 #    uStreamer - Lightweight and fast MJPEG-HTTP streamer.                   #
 #                                                                            #
-#    Copyright (C) 2018-2023  Maxim Devaev <mdevaev@gmail.com>               #
+#    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    #
@@ -24,11 +24,8 @@
 
 #include "uslibs/types.h"
 
-
-typedef struct {
-	bool	has_audio;
-	uint	audio_hz;
-} us_tc358743_info_s;
+#include "rtpv.h"
+#include "rtpa.h"
 
 
-int us_tc358743_read_info(const char *path, us_tc358743_info_s *info);
+char *us_sdp_create(us_rtpv_s *rtpv, us_rtpa_s *rtpa, bool mic);

janus/src/uslibs/errors.h

@@ -0,0 +1 @@
+../../../src/libs/errors.h

janus/src/uslibs/memsinksh.c

@@ -0,0 +1 @@
+../../../src/libs/memsinksh.c

janus/src/uslibs/queue.c

@@ -0,0 +1 @@
+../../../src/libs/queue.c

janus/src/uslibs/queue.h

@@ -0,0 +1 @@
+../../../src/libs/queue.h

janus/src/uslibs/ring.c

@@ -0,0 +1 @@
+../../../src/libs/ring.c

janus/src/uslibs/ring.h

@@ -0,0 +1 @@
+../../../src/libs/ring.h

janus/src/uslibs/tc358743.c

@@ -0,0 +1 @@
+../../../src/libs/tc358743.c

janus/src/uslibs/tc358743.h

@@ -0,0 +1 @@
+../../../src/libs/tc358743.h

janus/src/uslibs/types.h

@@ -1,44 +0,0 @@
-/*****************************************************************************
-#                                                                            #
-#    uStreamer - Lightweight and fast MJPEG-HTTP streamer.                   #
-#                                                                            #
-#    Copyright (C) 2018-2023  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/>.  #
-#                                                                            #
-*****************************************************************************/
-
-#pragma once
-
-#include <stdio.h>
-#include <stdbool.h>
-#include <stdint.h>
-
-
-typedef long long sll;
-typedef ssize_t sz;
-typedef int8_t s8;
-typedef int16_t s16;
-typedef int32_t s32;
-typedef int64_t s64;
-
-typedef unsigned uint;
-typedef unsigned long long ull;
-typedef size_t uz;
-typedef uint8_t u8;
-typedef uint16_t u16;
-typedef uint32_t u32;
-typedef uint64_t u64;
-
-typedef long double ldf;

janus/src/uslibs/types.h

@@ -0,0 +1 @@
+../../../src/libs/types.h

linters/mypy.ini

@@ -1,5 +1,5 @@
 [mypy]
-python_version = 3.9
+python_version = 3.14
 ignore_missing_imports = true
 disallow_untyped_defs = true
 strict_optional = true

linters/pylint.ini

@@ -33,7 +33,7 @@ max-line-length = 160
 
 [BASIC]
 # Good variable names which should always be accepted, separated by a comma
-good-names = _, __, x, y, ws, make-html-h, make-jpeg-h, make-ico-h
+good-names = _, __, i, x, y, ws, make-html-h, make-ico-h
 
 # Regular expression matching correct method names
 method-rgx = [a-z_][a-z0-9_]{2,50}$

linters/tox.ini

@@ -3,7 +3,7 @@ envlist = cppcheck, flake8, pylint, mypy, vulture, htmlhint
 skipsdist = true
 
 [testenv]
-basepython = python3.11
+basepython = python3.14
 changedir = /src
 
 [testenv:cppcheck]
@@ -13,8 +13,8 @@ commands = cppcheck \
 			--std=c17 \
 			--error-exitcode=1 \
 			--quiet \
-			--enable=warning,unusedFunction,portability,performance,style \
-			--suppress=assignmentInAssert \
+			--check-level=exhaustive \
+			--enable=warning,portability,performance,style \
 			--suppress=variableScope \
 			--inline-suppr \
 			--library=python \
@@ -25,7 +25,7 @@ commands = cppcheck \
 allowlist_externals = bash
 commands = bash -c 'flake8 --config=linters/flake8.ini tools/*.py' python/*.py
 deps =
-	flake8==5.0.4
+	flake8
 	flake8-quotes
 
 [testenv:pylint]
@@ -33,6 +33,7 @@ allowlist_externals = bash
 commands = bash -c 'pylint --rcfile=linters/pylint.ini --output-format=colorized --reports=no tools/*.py python/*.py'
 deps =
 	pylint
+	setuptools
 
 [testenv:mypy]
 allowlist_externals = bash

man/ustreamer-dump.1

@@ -1,6 +1,6 @@
 .\" Manpage for ustreamer-dump.
 .\" Open an issue or pull request to https://github.com/pikvm/ustreamer to correct errors or typos
-.TH USTREAMER-DUMP 1 "version 5.54" "January 2021"
+.TH USTREAMER-DUMP 1 "version 6.55" "January 2021"
 
 .SH NAME
 ustreamer-dump \- Dump uStreamer's memory sink to file

man/ustreamer.1

@@ -1,6 +1,6 @@
 .\" Manpage for ustreamer.
 .\" Open an issue or pull request to https://github.com/pikvm/ustreamer to correct errors or typos
-.TH USTREAMER 1 "version 5.54" "November 2020"
+.TH USTREAMER 1 "version 6.55" "November 2020"
 
 .SH NAME
 ustreamer \- stream MJPEG video from any V4L2 device to the network
@@ -17,17 +17,17 @@ Without arguments, \fBustreamer\fR will try to open \fB/dev/video0\fR with 640x4
 
 Please note that since µStreamer v2\.0 cross\-domain requests were disabled by default for security reasons\. To enable the old behavior, use the option \fB\-\-allow\-origin=\e*\fR\.
 
-For example, the recommended way of running µStreamer with Auvidea B101 on a Raspberry Pi is:
+For example, the recommended way of running µStreamer with TC358743-based capture device on a Raspberry Pi is:
 
 \fBustreamer \e\fR
 .RS
 \fB\-\-format=uyvy \e\fR # Device input format
 .nf
-\fB\-\-encoder=m2m-image \e\fR # Hardware encoding with V4L2 M2M intraface
+\fB\-\-encoder=m2m-image \e\fR # Hardware encoding with V4L2 M2M interface
 .nf
 \fB\-\-workers=3 \e\fR # Maximum workers for V4L2 encoder
 .nf
-\fB\-\-persistent \e\fR # Don\'t re\-initialize device on timeout (for example when HDMI cable was disconnected)
+\fB\-\-persistent \e\fR # Suppress repetitive signal source errors (for example when HDMI cable was disconnected)
 .nf
 \fB\-\-dv\-timings \e\fR # Use DV\-timings
 .nf
@@ -52,7 +52,7 @@ Initial image resolution. Default: 640x480.
 .TP
 .BR \-m\ \fIfmt ", " \-\-format\ \fIfmt
 Image format.
-Available: YUYV, YVYU, UYVY, RGB565, RGB24, JPEG; default: YUYV.
+Available: YUYV, YVYU, UYVY, YUV420, YVU420, RGB565, RGB24, GREY, MJPEG, JPEG; default: YUYV.
 .TP
 .BR \-a\ \fIstd ", " \-\-tv\-standard\ \fIstd
 Force TV standard.
@@ -66,16 +66,19 @@ Available: MMAP, USERPTR; default: MMAP.
 Desired FPS. Default: maximum possible.
 .TP
 .BR \-z\ \fIN ", " \-\-min\-frame\-size\ \fIN
-Drop frames smaller then this limit. Useful if the device produces small\-sized garbage frames. Default: 128 bytes.
+Drop frames smaller than this limit. Useful if the device produces small\-sized garbage frames. Default: 128 bytes.
+.TP
+.BR \-T ", " \-\-allow\-truncated\-frames
+Allows to handle truncated frames. Useful if the device produces incorrect but still acceptable frames. Default: disabled.
 .TP
 .BR \-n ", " \-\-persistent
-Don't re\-initialize device on timeout. Default: disabled.
+Suppress repetitive signal source errors. Default: disabled.
 .TP
 .BR \-t ", " \-\-dv\-timings
 Enable DV-timings querying and events processing to automatic resolution change. Default: disabled.
 .TP
 .BR \-b\ \fIN ", " \-\-buffers\ \fIN
-The number of buffers to receive data from the device. Each buffer may processed using an independent thread.
+The number of buffers to receive data from the device. Each buffer may be processed using an independent thread.
 Default: 2 (the number of CPU cores (but not more than 4) + 1).
 .TP
 .BR \-w\ \fIN ", " \-\-workers\ \fIN
@@ -96,17 +99,15 @@ HW ─ Use pre-encoded MJPEG frames directly from camera hardware.
 M2M-VIDEO ─ GPU-accelerated MJPEG encoding.
 
 M2M-IMAGE ─ GPU-accelerated JPEG encoding.
-
-NOOP ─ Don't compress MJPEG stream (do nothing).
 .TP
 .BR \-g\ \fIWxH,... ", " \-\-glitched\-resolutions\ \fIWxH,...
 It doesn't do anything. Still here for compatibility.
 .TP
 .BR \-k\ \fIpath ", " \-\-blank\ \fIpath
-Path to JPEG file that will be shown when the device is disconnected during the streaming. Default: black screen 640x480 with 'NO SIGNAL'.
+It doesn't do anything. Still here for compatibility.
 .TP
 .BR \-K\ \fIsec ", " \-\-last\-as\-blank\ \fIsec
-Show the last frame received from the camera after it was disconnected, but no more than specified time (or endlessly if 0 is specified). If the device has not yet been online, display 'NO SIGNAL' or the image specified by option \-\-blank. Note: currently this option has no effect on memory sinks. Default: disabled.
+It doesn't do anything. Still here for compatibility.
 .TP
 .BR \-l ", " \-\-slowdown
 Slowdown capturing to 1 FPS or less when no stream or sink clients are connected. Useful to reduce CPU consumption. Default: disabled.
@@ -212,25 +213,25 @@ Timeout for client connections. Default: 10.
 .SS "JPEG sink options"
 With shared memory sink you can write a stream to a file. See \fBustreamer-dump\fR(1) for more info.
 .TP
-.BR \-\-sink\ \fIname
-Use the specified shared memory object to sink JPEG frames. Default: disabled.
+.BR \-\-jpeg\-sink\ \fIname
+Use the specified shared memory object to sink JPEG frames. The name should end with a suffix ".jpeg" or ":jpeg". Default: disabled.
 .TP
-.BR \-\-sink\-mode\ \fImode
+.BR \-\-jpeg\-sink\-mode\ \fImode
 Set JPEG sink permissions (like 777). Default: 660.
 .TP
-.BR \-\-sink\-rm
+.BR \-\-jpeg\-sink\-rm
 Remove shared memory on stop. Default: disabled.
 .TP
-.BR \-\-sink\-client\-ttl\ \fIsec
+.BR \-\-jpeg\-sink\-client\-ttl\ \fIsec
 Client TTL. Default: 10.
 .TP
-.BR \-\-sink\-timeout\ \fIsec
+.BR \-\-jpeg\-sink\-timeout\ \fIsec
 Timeout for lock. Default: 1.
 
 .SS "H264 sink options"
 .TP
 .BR \-\-h264\-sink\ \fIname
-Use the specified shared memory object to sink H264 frames. Default: disabled.
+Use the specified shared memory object to sink H264 frames. The name should end with a suffix ".h264" or ":h264". Default: disabled.
 .TP
 .BR \-\-h264\-sink\-mode\ \fImode
 Set H264 sink permissions (like 777). Default: 660.
@@ -252,12 +253,34 @@ Interval between keyframes. Default: 30.
 .TP
 .BR \-\-h264\-m2m\-device\ \fI/dev/path
 Path to V4L2 mem-to-mem encoder device. Default: auto-select.
+.TP
+.BR \-\-h264\-boost\-device
+Increase encoder performance on PiKVM V4. Default: disabled.
 
+.SS "RAW sink options"
+.TP
+.BR \-\-raw\-sink\ \fIname
+Use the specified shared memory object to sink RAW frames. The name should end with a suffix ".raw" or ":raw". Default: disabled.
+.TP
+.BR \-\-raw\-sink\-mode\ \fImode
+Set RAW sink permissions (like 777). Default: 660.
+.TP
+.BR \-\-raw\-sink\-rm
+Remove shared memory on stop. Default: disabled.
+.TP
+.BR \-\-raw\-sink\-client\-ttl\ \fIsec
+Client TTL. Default: 10.
+.TP
+.BR \-\-raw\-sink\-timeout\ \fIsec
+Timeout for lock. Default: 1.
 
 .SS "Process options"
 .TP
 .BR \-\-exit\-on\-parent\-death
-Exit the program if the parent process is dead. Required \fBHAS_PDEATHSIG\fR feature. Default: disabled.
+Exit the program if the parent process is dead. Required \fBWITH_PDEATHSIG\fR feature. Default: disabled.
+.TP
+.BR \-\-exit\-on\-device\-error
+Exit on any device error instead of polling until success. Default: disabled.
 .TP
 .BR \-\-exit\-on\-no\-clients \fIsec
 Exit the program if there have been no stream or sink clients or any HTTP requests in the last N seconds. Default: 0 (disabled).

pkg/arch/PKGBUILD

@@ -3,14 +3,14 @@
 
 
 pkgname=ustreamer
-pkgver=5.54
+pkgver=6.55
 pkgrel=1
 pkgdesc="Lightweight and fast MJPEG-HTTP streamer"
 url="https://github.com/pikvm/ustreamer"
 license=(GPL)
 arch=(i686 x86_64 armv6h armv7h aarch64)
 depends=(libjpeg libevent libbsd libgpiod systemd)
-makedepends=(gcc make systemd)
+makedepends=(gcc make pkgconf systemd)
 source=(${pkgname}::"git+https://github.com/pikvm/ustreamer#commit=v${pkgver}")
 md5sums=(SKIP)
 
@@ -18,8 +18,8 @@ md5sums=(SKIP)
 _options="WITH_GPIO=1 WITH_SYSTEMD=1"
 if [ -e /usr/bin/python3 ]; then
 	_options="$_options WITH_PYTHON=1"
-	depends+=(python)
-	makedepends+=(python-setuptools)
+	depends+=("python>=3.14" "python<3.15")
+	makedepends+=(python-setuptools python-pip python-build python-wheel)
 fi
 if [ -e /usr/include/janus/plugins/plugin.h ];then
 	depends+=(janus-gateway alsa-lib opus)
@@ -28,12 +28,6 @@ if [ -e /usr/include/janus/plugins/plugin.h ];then
 fi
 
 
-# LD does not link mmal with this option
-# This DOESN'T affect setup.py
-LDFLAGS="${LDFLAGS//--as-needed/}"
-export LDFLAGS="${LDFLAGS//,,/,}"
-
-
 build() {
 	cd "$srcdir"
 	rm -rf $pkgname-build

pkg/docker/Dockerfile.alpine

@@ -24,7 +24,7 @@ RUN apk add --no-cache \
 WORKDIR /ustreamer
 COPY --from=build /build/ustreamer/src/ustreamer.bin ustreamer
 
-RUN wget https://raw.githubusercontent.com/pikvm/kvmd/master/configs/kvmd/edid/v3-hdmi.hex -O /edid.hex
+RUN wget https://raw.githubusercontent.com/pikvm/kvmd/master/configs/kvmd/edid/v2.hex -O /edid.hex
 COPY pkg/docker/entry.sh /
 
 EXPOSE 8080

pkg/openwrt/Makefile

@@ -2,11 +2,14 @@
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
+# This package is just an example. For OpenWRT it is recommended to use upstream package:
+#   - https://github.com/openwrt/packages/tree/master/multimedia/ustreamer
+#
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ustreamer
-PKG_VERSION:=5.54
+PKG_VERSION:=6.55
 PKG_RELEASE:=1
 PKG_MAINTAINER:=Maxim Devaev <mdevaev@gmail.com>
 
@@ -25,7 +28,7 @@ define Package/ustreamer
   SECTION:=multimedia
   CATEGORY:=Multimedia
   TITLE:=uStreamer
-  DEPENDS:=+libpthread +libjpeg +libv4l +libbsd +libevent2 +libevent2-core +libevent2-extra +libevent2-pthreads
+  DEPENDS:=+libatomic +libpthread +libjpeg +libv4l +libbsd +libevent2 +libevent2-core +libevent2-extra +libevent2-pthreads
   URL:=https://github.com/pikvm/ustreamer
 endef
 

python/MANIFEST.in

@@ -0,0 +1,2 @@
+include setup.py
+recursive-include src *.c *h

python/Makefile

@@ -1,20 +1,21 @@
--include ../config.mk
-
-DESTDIR ?=
+R_DESTDIR ?=
 PREFIX ?= /usr/local
 
 PY ?= python3
 
 
 # =====
-all:
+all: root
+root: $(shell find src -type f,l) setup.py
 	$(info == PY_BUILD ustreamer-*.so)
-	$(ECHO) $(PY) setup.py build
+	rm -rf root
+	$(ECHO) $(PY) -m build --skip-dependency-check --no-isolation
+	$(ECHO) $(PY) -m pip install dist/*.whl --ignore-installed --root=./root
 
 
 install:
-	$(PY) setup.py install --prefix=$(PREFIX) --root=$(if $(DESTDIR),$(DESTDIR),/)
+	$(PY) -m pip install dist/*.whl --ignore-installed --prefix=$(PREFIX) --root=$(if $(R_DESTDIR),$(R_DESTDIR),/)
 
 
 clean:
-	rm -rf build ustreamer.egg-info
+	rm -rf root dist ustreamer.egg-info

python/setup.py

@@ -5,19 +5,36 @@ from setuptools import setup
 
 
 # =====
-def _find_sources(suffix: str) -> list[str]:
+def _find_sources() -> list[str]:
     sources: list[str] = []
     for (root_path, _, names) in os.walk("src"):
         for name in names:
-            if name.endswith(suffix):
+            if name.endswith(".c"):
                 sources.append(os.path.join(root_path, name))
     return sources
 
 
-if __name__ == "__main__":
+def _find_flags() -> dict[str, bool]:
+    return {
+        key[3:]: (value.strip().lower() in ["true", "on", "1"])
+        for (key, value) in sorted(os.environ.items())
+        if key.startswith("MK_WITH_")
+    }
+
+
+def _make_d_features(flags: dict[str, bool]) -> str:
+    features = " ".join([
+        f"{key}={int(value)}"
+        for (key, value) in flags.items()
+    ])
+    return f"-DUS_FEATURES=\"{features}\""
+
+
+def main() -> None:
+    flags = _find_flags()
     setup(
         name="ustreamer",
-        version="5.54",
+        version="6.55",
         description="uStreamer tools",
         author="Maxim Devaev",
         author_email="mdevaev@gmail.com",
@@ -26,10 +43,16 @@ if __name__ == "__main__":
             Extension(
                 "ustreamer",
                 libraries=["rt", "m", "pthread"],
-                extra_compile_args=["-std=c17", "-D_GNU_SOURCE"],
+                extra_compile_args=[
+                    "-std=c17", "-D_GNU_SOURCE",
+                    _make_d_features(flags),
+                ],
                 undef_macros=["NDEBUG"],
-                sources=_find_sources(".c"),
-                depends=_find_sources(".h"),
+                sources=_find_sources(),
             ),
         ],
     )
+
+
+if __name__ == "__main__":
+    main()

python/src/uslibs/const.h

@@ -0,0 +1 @@
+../../../src/libs/const.h

python/src/uslibs/errors.h

@@ -0,0 +1 @@
+../../../src/libs/errors.h

python/src/uslibs/memsinksh.c

@@ -0,0 +1 @@
+../../../src/libs/memsinksh.c

python/src/uslibs/types.h

@@ -1,44 +0,0 @@
-/*****************************************************************************
-#                                                                            #
-#    uStreamer - Lightweight and fast MJPEG-HTTP streamer.                   #
-#                                                                            #
-#    Copyright (C) 2018-2023  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/>.  #
-#                                                                            #
-*****************************************************************************/
-
-#pragma once
-
-#include <stdio.h>
-#include <stdbool.h>
-#include <stdint.h>
-
-
-typedef long long sll;
-typedef ssize_t sz;
-typedef int8_t s8;
-typedef int16_t s16;
-typedef int32_t s32;
-typedef int64_t s64;
-
-typedef unsigned uint;
-typedef unsigned long long ull;
-typedef size_t uz;
-typedef uint8_t u8;
-typedef uint16_t u16;
-typedef uint32_t u32;
-typedef uint64_t u64;
-
-typedef long double ldf;

python/src/uslibs/types.h

@@ -0,0 +1 @@
+../../../src/libs/types.h

python/src/ustreamer.c

@@ -1,3 +1,25 @@
+/*****************************************************************************
+#                                                                            #
+#    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 <stdio.h>
 #include <stdint.h>
 #include <stdbool.h>
@@ -13,7 +35,9 @@
 
 #include <Python.h>
 
+#include "uslibs/const.h"
 #include "uslibs/types.h"
+#include "uslibs/errors.h"
 #include "uslibs/tools.h"
 #include "uslibs/frame.h"
 #include "uslibs/memsinksh.h"
@@ -26,6 +50,7 @@ typedef struct {
 	double	lock_timeout;
 	double	wait_timeout;
 	double	drop_same_frames;
+	uz		data_size;
 
 	int					fd;
 	us_memsink_shared_s	*mem;
@@ -37,12 +62,17 @@ typedef struct {
 
 
 static void _MemsinkObject_destroy_internals(_MemsinkObject *self) {
-	US_DELETE(self->mem, us_memsink_shared_unmap);
-	US_CLOSE_FD(self->fd, close);
+	if (self->mem != NULL) {
+		us_memsink_shared_unmap(self->mem, self->data_size);
+		self->mem = NULL;
+	}
+	US_CLOSE_FD(self->fd);
 	US_DELETE(self->frame, us_frame_destroy);
 }
 
 static int _MemsinkObject_init(_MemsinkObject *self, PyObject *args, PyObject *kwargs) {
+	self->fd = -1;
+
 	self->lock_timeout = 1;
 	self->wait_timeout = 1;
 
@@ -64,13 +94,18 @@ static int _MemsinkObject_init(_MemsinkObject *self, PyObject *args, PyObject *k
 	SET_DOUBLE(drop_same_frames, >= 0);
 #	undef SET_DOUBLE
 
+	if ((self->data_size = us_memsink_calculate_size(self->obj)) == 0) {
+		PyErr_SetString(PyExc_ValueError, "Invalid memsink object suffix");
+		return -1;
+	}
+
 	self->frame = us_frame_init();
 
 	if ((self->fd = shm_open(self->obj, O_RDWR, 0)) == -1) {
 		PyErr_SetFromErrno(PyExc_OSError);
 		goto error;
 	}
-	if ((self->mem = us_memsink_shared_map(self->fd)) == NULL) {
+	if ((self->mem = us_memsink_shared_map(self->fd, self->data_size)) == NULL) {
 		PyErr_SetFromErrno(PyExc_OSError);
 		goto error;
 	}
@@ -99,58 +134,68 @@ static PyObject *_MemsinkObject_close(_MemsinkObject *self, PyObject *Py_UNUSED(
 
 static PyObject *_MemsinkObject_enter(_MemsinkObject *self, PyObject *Py_UNUSED(ignored)) {
 	Py_INCREF(self);
-	return (PyObject *)self;
+	return (PyObject*)self;
 }
 
 static PyObject *_MemsinkObject_exit(_MemsinkObject *self, PyObject *Py_UNUSED(ignored)) {
-	return PyObject_CallMethod((PyObject *)self, "close", "");
+	return PyObject_CallMethod((PyObject*)self, "close", "");
 }
 
 static int _wait_frame(_MemsinkObject *self) {
 	const ldf deadline_ts = us_get_now_monotonic() + self->wait_timeout;
 
-#	define RETURN_OS_ERROR { \
-			Py_BLOCK_THREADS \
-			PyErr_SetFromErrno(PyExc_OSError); \
-			return -1; \
-		}
-
+	int locked = -1;
 	ldf now_ts;
 	do {
 		Py_BEGIN_ALLOW_THREADS
 
-		const int retval = us_flock_timedwait_monotonic(self->fd, self->lock_timeout);
+		locked = us_flock_timedwait_monotonic(self->fd, self->lock_timeout);
 		now_ts = us_get_now_monotonic();
-
-		if (retval < 0 && errno != EWOULDBLOCK) {
-			RETURN_OS_ERROR;
-
-		} else if (retval == 0) {
-			us_memsink_shared_s *mem = self->mem;
-			if (mem->magic == US_MEMSINK_MAGIC && mem->version == US_MEMSINK_VERSION && mem->id != self->frame_id) {
-				if (self->drop_same_frames > 0) {
-					if (
-						US_FRAME_COMPARE_META_USED_NOTS(self->mem, self->frame)
-						&& (self->frame_ts + self->drop_same_frames > now_ts)
-						&& !memcmp(self->frame->data, mem->data, mem->used)
-					) {
-						self->frame_id = mem->id;
-						goto drop;
-					}
-				}
-
-				Py_BLOCK_THREADS
-				return 0;
+		if (locked < 0) {
+			if (errno == EWOULDBLOCK) {
+				goto retry;
 			}
+			goto os_error;
+		}
 
-			if (flock(self->fd, LOCK_UN) < 0) {
-				RETURN_OS_ERROR;
+		us_memsink_shared_s *mem = self->mem;
+		if (mem->magic != US_MEMSINK_MAGIC || mem->version != US_MEMSINK_VERSION) {
+			goto retry;
+		}
+
+		// Let the sink know that the client is alive
+		mem->last_client_ts = now_ts;
+
+		if (mem->id == self->frame_id) {
+			goto retry;
+		}
+
+		if (self->drop_same_frames > 0) {
+			if (
+				US_FRAME_COMPARE_GEOMETRY(self->mem, self->frame)
+				&& (self->frame_ts + self->drop_same_frames > now_ts)
+				&& !memcmp(self->frame->data, us_memsink_get_data(mem), mem->used)
+			) {
+				self->frame_id = mem->id;
+				goto retry;
 			}
 		}
 
-	drop:
+		// New frame found
+		Py_BLOCK_THREADS
+		return 0;
+
+	os_error:
+		Py_BLOCK_THREADS
+		PyErr_SetFromErrno(PyExc_OSError);
+		return -1;
+
+	retry:
+		if (locked >= 0 && flock(self->fd, LOCK_UN) < 0) {
+			goto os_error;
+		}
 		if (usleep(1000) < 0) {
-			RETURN_OS_ERROR;
+			goto os_error;
 		}
 		Py_END_ALLOW_THREADS
 		if (PyErr_CheckSignals() < 0) {
@@ -158,8 +203,7 @@ static int _wait_frame(_MemsinkObject *self) {
 		}
 	} while (now_ts < deadline_ts);
 
-	return -2;
-#	undef RETURN_OS_ERROR
+	return US_ERROR_NO_DATA;
 }
 
 static PyObject *_MemsinkObject_wait_frame(_MemsinkObject *self, PyObject *args, PyObject *kwargs) {
@@ -176,16 +220,15 @@ static PyObject *_MemsinkObject_wait_frame(_MemsinkObject *self, PyObject *args,
 
 	switch (_wait_frame(self)) {
 		case 0: break;
-		case -2: Py_RETURN_NONE;
+		case US_ERROR_NO_DATA: Py_RETURN_NONE;
 		default: return NULL;
 	}
 
 	us_memsink_shared_s *mem = self->mem;
-	us_frame_set_data(self->frame, mem->data, mem->used);
+	us_frame_set_data(self->frame, us_memsink_get_data(mem), mem->used);
 	US_FRAME_COPY_META(self->mem, self->frame);
 	self->frame_id = mem->id;
 	self->frame_ts = us_get_now_monotonic();
-	mem->last_client_ts = self->frame_ts;
 	if (key_required) {
 		mem->key_requested = true;
 	}
@@ -210,7 +253,8 @@ static PyObject *_MemsinkObject_wait_frame(_MemsinkObject *self, PyObject *args,
 			} \
 			Py_DECREF(m_tmp); \
 		}
-#	define SET_NUMBER(x_key, x_from, x_to) SET_VALUE(#x_key, Py##x_to##_From##x_from(self->frame->x_key))
+#	define SET_NUMBER(x_key, x_from, x_to) \
+		SET_VALUE(#x_key, Py##x_to##_From##x_from(self->frame->x_key))
 
 	SET_NUMBER(width, Long, Long);
 	SET_NUMBER(height, Long, Long);
@@ -219,10 +263,11 @@ static PyObject *_MemsinkObject_wait_frame(_MemsinkObject *self, PyObject *args,
 	SET_NUMBER(online, Long, Bool);
 	SET_NUMBER(key, Long, Bool);
 	SET_NUMBER(gop, Long, Long);
-	SET_NUMBER(grab_ts, Double, Float);
+	SET_NUMBER(grab_begin_ts, Double, Float);
+	SET_NUMBER(grab_end_ts, Double, Float);
 	SET_NUMBER(encode_begin_ts, Double, Float);
 	SET_NUMBER(encode_end_ts, Double, Float);
-	SET_VALUE("data", PyBytes_FromStringAndSize((const char *)self->frame->data, self->frame->used));
+	SET_VALUE("data", PyBytes_FromStringAndSize((const char*)self->frame->data, self->frame->used));
 
 #	undef SET_NUMBER
 #	undef SET_VALUE
@@ -257,7 +302,8 @@ static PyMethodDef _MemsinkObject_methods[] = {
 };
 
 static PyGetSetDef _MemsinkObject_getsets[] = {
-#	define ADD_GETTER(x_field) {.name = #x_field, .get = (getter)_MemsinkObject_getter_##x_field}
+#	define ADD_GETTER(x_field) \
+		{.name = #x_field, .get = (getter)_MemsinkObject_getter_##x_field}
 	ADD_GETTER(obj),
 	ADD_GETTER(lock_timeout),
 	ADD_GETTER(wait_timeout),
@@ -285,21 +331,31 @@ static PyModuleDef _Module = {
 	.m_size = -1,
 };
 
-PyMODINIT_FUNC PyInit_ustreamer(void) { // cppcheck-suppress unusedFunction
-	PyObject *module = PyModule_Create(&_Module);
-	if (module == NULL) {
-		return NULL;
-	}
+PyMODINIT_FUNC PyInit_ustreamer(void) {
+	PyObject *module = NULL;
 
 	if (PyType_Ready(&_MemsinkType) < 0) {
-		return NULL;
+		goto error;
 	}
 
-	Py_INCREF(&_MemsinkType);
-
-	if (PyModule_AddObject(module, "Memsink", (PyObject *)&_MemsinkType) < 0) {
-		return NULL;
+	if ((module = PyModule_Create(&_Module)) == NULL) {
+		goto error;
 	}
 
+#	define ADD(x_what, x_key, x_value) \
+		{ if (PyModule_Add##x_what(module, x_key, x_value) < 0) { goto error; } }
+	ADD(StringConstant, "__version__", US_VERSION);
+	ADD(StringConstant, "VERSION", US_VERSION);
+	ADD(IntConstant, "VERSION_MAJOR", US_VERSION_MAJOR);
+	ADD(IntConstant, "VERSION_MINOR", US_VERSION_MINOR);
+	ADD(StringConstant, "FEATURES", US_FEATURES); // Defined in setup.py
+	ADD(ObjectRef, "Memsink", (PyObject*)&_MemsinkType);
+#	undef ADD
 	return module;
+
+error:
+	if (module != NULL) {
+		Py_DECREF(module);
+	}
+	return NULL;
 }

src/Makefile

@@ -1,7 +1,8 @@
-DESTDIR ?=
+R_DESTDIR ?=
 PREFIX ?= /usr/local
 
 CC ?= gcc
+PKG_CONFIG ?= pkg-config
 CFLAGS ?= -O3
 LDFLAGS ?=
 
@@ -12,11 +13,11 @@ _DUMP = ustreamer-dump.bin
 _V4P = ustreamer-v4p.bin
 
 _CFLAGS = -MD -c -std=c17 -Wall -Wextra -D_GNU_SOURCE $(CFLAGS)
-_LDFLAGS = $(LDFLAGS)
 
-_COMMON_LIBS = -lm -ljpeg -pthread -lrt
+_USTR_LDFLAGS = $(LDFLAGS) -lm -ljpeg -pthread -lrt -levent -levent_pthreads
+_DUMP_LDFLAGS = $(LDFLAGS) -lm -ljpeg -pthread -lrt
+_V4P_LDFLAGS = $(LDFLAGS) -lm -ljpeg -pthread -lrt
 
-_USTR_LIBS = $(_COMMON_LIBS) -levent -levent_pthreads
 _USTR_SRCS = $(shell ls \
 	libs/*.c \
 	ustreamer/*.c \
@@ -27,93 +28,105 @@ _USTR_SRCS = $(shell ls \
 	ustreamer/*.c \
 )
 
-_DUMP_LIBS = $(_COMMON_LIBS)
 _DUMP_SRCS = $(shell ls \
 	libs/*.c \
 	dump/*.c \
 )
 
-_V4P_LIBS = $(_COMMON_LIBS)
 _V4P_SRCS = $(shell ls \
 	libs/*.c \
+	libs/drm/*.c \
 	v4p/*.c \
 )
 
 _BUILD = build
 
-
 _TARGETS = $(_USTR) $(_DUMP)
 _OBJS = $(_USTR_SRCS:%.c=$(_BUILD)/%.o) $(_DUMP_SRCS:%.c=$(_BUILD)/%.o)
 
 
-define optbool
-$(filter $(shell echo $(1) | tr A-Z a-z), yes on 1)
-endef
-
-
-ifneq ($(call optbool,$(WITH_GPIO)),)
-_USTR_LIBS += -lgpiod
-override _CFLAGS += -DWITH_GPIO $(shell pkg-config --atleast-version=2 libgpiod 2> /dev/null && echo -DHAVE_GPIOD2)
-_USTR_SRCS += $(shell ls ustreamer/gpio/*.c)
+# =====
+ifeq ($(findstring bsd,$(shell $(CC) -dumpmachine)),)
+override _USTR_LDFLAGS += -latomic
+override _DUMP_LDFLAGS += -latomic
+override _V4P_LDFLAGS += -latomic
 endif
 
-
-ifneq ($(call optbool,$(WITH_SYSTEMD)),)
-_USTR_LIBS += -lsystemd
-override _CFLAGS += -DWITH_SYSTEMD
-_USTR_SRCS += $(shell ls ustreamer/http/systemd/*.c)
+ifneq ($(MK_WITH_PYTHON),)
+override _CFLAGS += -DMK_WITH_PYTHON
 endif
 
-
-WITH_PTHREAD_NP ?= 1
-ifneq ($(call optbool,$(WITH_PTHREAD_NP)),)
-override _CFLAGS += -DWITH_PTHREAD_NP
+ifneq ($(MK_WITH_JANUS),)
+override _CFLAGS += -DMK_WITH_JANUS
 endif
 
-
-WITH_SETPROCTITLE ?= 1
-ifneq ($(call optbool,$(WITH_SETPROCTITLE)),)
-ifeq ($(shell uname -s | tr A-Z a-z),linux)
-_USTR_LIBS += -lbsd
-endif
-override _CFLAGS += -DWITH_SETPROCTITLE
+ifneq ($(MK_WITH_GPIO),)
+override _CFLAGS += -DMK_WITH_GPIO -DWITH_GPIO $(shell $(PKG_CONFIG) --atleast-version=2 libgpiod 2> /dev/null && echo -DHAVE_GPIOD2)
+override _USTR_LDFLAGS += -lgpiod
+override _USTR_SRCS += $(shell ls ustreamer/gpio/*.c)
 endif
 
+ifneq ($(MK_WITH_SYSTEMD),)
+override _CFLAGS += -DMK_WITH_SYSTEMD -DWITH_SYSTEMD
+override _USTR_LDFLAGS += -lsystemd
+override _USTR_SRCS += $(shell ls ustreamer/http/systemd/*.c)
+endif
 
-WITH_V4P ?= 0
-ifneq ($(call optbool,$(WITH_V4P)),)
+ifneq ($(MK_WITH_PTHREAD_NP),)
+override _CFLAGS += -DMK_WITH_PTHREAD_NP -DWITH_PTHREAD_NP
+endif
+
+ifneq ($(MK_WITH_SETPROCTITLE),)
+override _CFLAGS += -DMK_WITH_SETPROCTITLE -DWITH_SETPROCTITLE
+ifneq ($(findstring linux,$(shell $(CC) -dumpmachine)),)
+override _USTR_LDFLAGS += -lbsd
+endif
+endif
+
+ifneq ($(MK_WITH_PDEATHSIG),)
+override _CFLAGS += -DMK_WITH_PDEATHSIG -DWITH_PDEATHSIG
+endif
+
+ifneq ($(MK_WITH_V4P),)
 override _TARGETS += $(_V4P)
 override _OBJS += $(_V4P_SRCS:%.c=$(_BUILD)/%.o)
-override _CFLAGS += $(shell pkg-config --cflags libdrm)
-_V4P_LDFLAGS = $(shell pkg-config --libs libdrm)
+override _CFLAGS += -DMK_WITH_V4P -DWITH_V4P $(shell $(PKG_CONFIG) --cflags libdrm)
+override _V4P_LDFLAGS += $(shell $(PKG_CONFIG) --libs libdrm)
+override _USTR_SRCS += $(shell ls libs/drm/*.c)
+override _USTR_LDFLAGS += $(shell $(PKG_CONFIG) --libs libdrm)
 endif
 
+
 # =====
 all: $(_TARGETS)
 
 
 install: all
-	mkdir -p $(DESTDIR)$(PREFIX)/bin
-	for i in $(subst .bin,,$(_TARGETS)); do install -m755 $$i.bin $(DESTDIR)$(PREFIX)/bin/$$i; done
+	mkdir -p $(R_DESTDIR)$(PREFIX)/bin
+	for i in $(subst .bin,,$(_TARGETS)); do \
+		install -m755 $$i.bin $(R_DESTDIR)$(PREFIX)/bin/$$i; \
+	done
 
 
 install-strip: install
-	for i in $(subst .bin,,$(_TARGETS)); do strip $(DESTDIR)$(PREFIX)/bin/$$i; done
+	for i in $(subst .bin,,$(_TARGETS)); do \
+		strip $(R_DESTDIR)$(PREFIX)/bin/$$i; \
+	done
 
 
 $(_USTR): $(_USTR_SRCS:%.c=$(_BUILD)/%.o)
 	$(info == LD $@)
-	$(ECHO) $(CC) $^ -o $@ $(_LDFLAGS) $(_USTR_LIBS)
+	$(ECHO) $(CC) $^ -o $@ $(_USTR_LDFLAGS)
 
 
 $(_DUMP): $(_DUMP_SRCS:%.c=$(_BUILD)/%.o)
 	$(info == LD $@)
-	$(ECHO) $(CC) $^ -o $@ $(_LDFLAGS) $(_DUMP_LIBS)
+	$(ECHO) $(CC) $^ -o $@ $(_DUMP_LDFLAGS)
 
 
 $(_V4P): $(_V4P_SRCS:%.c=$(_BUILD)/%.o)
 	$(info == LD $@)
-	$(ECHO) $(CC) $^ -o $@ $(_LDFLAGS) $(_V4P_LDFLAGS) $(_V4P_LIBS)
+	$(ECHO) $(CC) $^ -o $@ $(_V4P_LDFLAGS)
 
 
 $(_BUILD)/%.o: %.c

src/dump/file.c

@@ -2,7 +2,7 @@
 #                                                                            #
 #    uStreamer - Lightweight and fast MJPEG-HTTP streamer.                   #
 #                                                                            #
-#    Copyright (C) 2018-2023  Maxim Devaev <mdevaev@gmail.com>               #
+#    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    #
@@ -24,54 +24,73 @@
 
 
 us_output_file_s *us_output_file_init(const char *path, bool json) {
-	us_output_file_s *output;
-	US_CALLOC(output, 1);
+	us_output_file_s *out;
+	US_CALLOC(out, 1);
 
 	if (!strcmp(path, "-")) {
 		US_LOG_INFO("Using output: <stdout>");
-		output->fp = stdout;
+		out->fp = stdout;
 	} else {
 		US_LOG_INFO("Using output: %s", path);
-		if ((output->fp = fopen(path, "wb")) == NULL) {
+		if ((out->fp = fopen(path, "wb")) == NULL) {
 			US_LOG_PERROR("Can't open output file");
 			goto error;
 		}
 	}
 
-	output->json = json;
-	return output;
+	out->json = json;
+	return out;
 
 	error:
-		us_output_file_destroy(output);
+		us_output_file_destroy(out);
 		return NULL;
 }
 
-void us_output_file_write(void *v_output, const us_frame_s *frame) {
-	us_output_file_s *output = (us_output_file_s *)v_output;
-	if (output->json) {
-		us_base64_encode(frame->data, frame->used, &output->base64_data, &output->base64_allocated);
-		fprintf(output->fp,
-			"{\"size\": %zu, \"width\": %u, \"height\": %u,"
-			" \"format\": %u, \"stride\": %u, \"online\": %u, \"key\": %u, \"gop\": %u,"
-			" \"grab_ts\": %.3Lf, \"encode_begin_ts\": %.3Lf, \"encode_end_ts\": %.3Lf,"
+void us_output_file_write(void *v_out, const us_frame_s *frame) {
+	us_output_file_s *out = v_out;
+	if (out->json) {
+		us_base64_encode(frame->data, frame->used, &out->base64_data, &out->base64_allocated);
+		fprintf(
+			out->fp,
+			"{\"size\": %zu,"
+			" \"width\": %u,"
+			" \"height\": %u,"
+			" \"format\": %u,"
+			" \"stride\": %u,"
+			" \"online\": %u,"
+			" \"key\": %u,"
+			" \"gop\": %u,"
+			" \"grab_begin_ts\": %.3Lf,"
+			" \"grab_end_ts\": %.3Lf,"
+			" \"encode_begin_ts\": %.3Lf,"
+			" \"encode_end_ts\": %.3Lf,"
 			" \"data\": \"%s\"}\n",
-			frame->used, frame->width, frame->height,
-			frame->format, frame->stride, frame->online, frame->key, frame->gop,
-			frame->grab_ts, frame->encode_begin_ts, frame->encode_end_ts,
-			output->base64_data);
+			frame->used,
+			frame->width,
+			frame->height,
+			frame->format,
+			frame->stride,
+			frame->online,
+			frame->key,
+			frame->gop,
+			frame->grab_begin_ts,
+			frame->grab_end_ts,
+			frame->encode_begin_ts,
+			frame->encode_end_ts,
+			out->base64_data);
 	} else {
-		fwrite(frame->data, 1, frame->used, output->fp);
+		fwrite(frame->data, 1, frame->used, out->fp);
 	}
-	fflush(output->fp);
+	fflush(out->fp);
 }
 
-void us_output_file_destroy(void *v_output) {
-	us_output_file_s *output = (us_output_file_s *)v_output;
-	US_DELETE(output->base64_data, free);
-	if (output->fp && output->fp != stdout) {
-		if (fclose(output->fp) < 0) {
+void us_output_file_destroy(void *v_out) {
+	us_output_file_s *out = v_out;
+	US_DELETE(out->base64_data, free);
+	if (out->fp && out->fp != stdout) {
+		if (fclose(out->fp) < 0) {
 			US_LOG_PERROR("Can't close output file");
 		}
 	}
-	free(output);
+	free(out);
 }

src/dump/file.h

@@ -2,7 +2,7 @@
 #                                                                            #
 #    uStreamer - Lightweight and fast MJPEG-HTTP streamer.                   #
 #                                                                            #
-#    Copyright (C) 2018-2023  Maxim Devaev <mdevaev@gmail.com>               #
+#    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    #
@@ -45,5 +45,5 @@ typedef struct {
 
 
 us_output_file_s *us_output_file_init(const char *path, bool json);
-void us_output_file_write(void *v_output, const us_frame_s *frame);
-void us_output_file_destroy(void *v_output);
+void us_output_file_write(void *v_out, const us_frame_s *frame);
+void us_output_file_destroy(void *v_out);

src/dump/main.c

@@ -2,7 +2,7 @@
 #                                                                            #
 #    uStreamer - Lightweight and fast MJPEG-HTTP streamer.                   #
 #                                                                            #
-#    Copyright (C) 2018-2023  Maxim Devaev <mdevaev@gmail.com>               #
+#    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    #
@@ -24,18 +24,19 @@
 #include <stdlib.h>
 #include <stdbool.h>
 #include <unistd.h>
-#include <signal.h>
 #include <limits.h>
 #include <float.h>
 #include <getopt.h>
 #include <errno.h>
-#include <assert.h>
 
 #include "../libs/const.h"
+#include "../libs/errors.h"
 #include "../libs/tools.h"
 #include "../libs/logging.h"
 #include "../libs/frame.h"
 #include "../libs/memsink.h"
+#include "../libs/fpsi.h"
+#include "../libs/signal.h"
 #include "../libs/options.h"
 
 #include "file.h"
@@ -88,18 +89,19 @@ volatile bool _g_stop = false;
 
 
 typedef struct {
-	void *v_output;
-	void (*write)(void *v_output, const us_frame_s *frame);
-	void (*destroy)(void *v_output);
+	void *v_out;
+	void (*write)(void *v_out, const us_frame_s *frame);
+	void (*destroy)(void *v_out);
 } _output_context_s;
 
 
 static void _signal_handler(int signum);
-static void _install_signal_handlers(void);
 
 static int _dump_sink(
-	const char *sink_name, unsigned sink_timeout,
-	long long count, long double interval,
+	const char *sink_name,
+	unsigned sink_timeout,
+	long long count,
+	long double interval,
 	bool key_required,
 	_output_context_s *ctx);
 
@@ -110,10 +112,10 @@ int main(int argc, char *argv[]) {
 	US_LOGGING_INIT;
 	US_THREAD_RENAME("main");
 
-	char *sink_name = NULL;
+	const char *sink_name = NULL;
 	unsigned sink_timeout = 1;
-	char *output_path = NULL;
-	bool output_json = false;
+	const char *out_path = NULL;
+	bool out_json = false;
 	long long count = 0;
 	long double interval = 0;
 	bool key_required = false;
@@ -150,8 +152,8 @@ int main(int argc, char *argv[]) {
 		switch (ch) {
 			case _O_SINK:			OPT_SET(sink_name, optarg);
 			case _O_SINK_TIMEOUT:	OPT_NUMBER("--sink-timeout", sink_timeout, 1, 60, 0);
-			case _O_OUTPUT:			OPT_SET(output_path, optarg);
-			case _O_OUTPUT_JSON:	OPT_SET(output_json, true);
+			case _O_OUTPUT:			OPT_SET(out_path, optarg);
+			case _O_OUTPUT_JSON:	OPT_SET(out_json, true);
 			case _O_COUNT:			OPT_NUMBER("--count", count, 0, LLONG_MAX, 0);
 			case _O_INTERVAL:		OPT_LDOUBLE("--interval", interval, 0, 60);
 			case _O_KEY_REQUIRED:	OPT_SET(key_required, true);
@@ -182,18 +184,18 @@ int main(int argc, char *argv[]) {
 
 	_output_context_s ctx = {0};
 
-	if (output_path && output_path[0] != '\0') {
-		if ((ctx.v_output = (void *)us_output_file_init(output_path, output_json)) == NULL) {
+	if (out_path && out_path[0] != '\0') {
+		if ((ctx.v_out = (void*)us_output_file_init(out_path, out_json)) == NULL) {
 			return 1;
 		}
 		ctx.write = us_output_file_write;
 		ctx.destroy = us_output_file_destroy;
 	}
 
-	_install_signal_handlers();
+	us_install_signals_handler(_signal_handler, false);
 	const int retval = abs(_dump_sink(sink_name, sink_timeout, count, interval, key_required, &ctx));
-	if (ctx.v_output && ctx.destroy) {
-		ctx.destroy(ctx.v_output);
+	if (ctx.v_out && ctx.destroy) {
+		ctx.destroy(ctx.v_out);
 	}
 	return retval;
 }
@@ -206,30 +208,14 @@ static void _signal_handler(int signum) {
 	_g_stop = true;
 }
 
-static void _install_signal_handlers(void) {
-	struct sigaction sig_act = {0};
-
-	assert(!sigemptyset(&sig_act.sa_mask));
-	sig_act.sa_handler = _signal_handler;
-	assert(!sigaddset(&sig_act.sa_mask, SIGINT));
-	assert(!sigaddset(&sig_act.sa_mask, SIGTERM));
-	assert(!sigaddset(&sig_act.sa_mask, SIGPIPE));
-
-	US_LOG_DEBUG("Installing SIGINT handler ...");
-	assert(!sigaction(SIGINT, &sig_act, NULL));
-
-	US_LOG_DEBUG("Installing SIGTERM handler ...");
-	assert(!sigaction(SIGTERM, &sig_act, NULL));
-
-	US_LOG_DEBUG("Installing SIGTERM handler ...");
-	assert(!sigaction(SIGPIPE, &sig_act, NULL));
-}
-
 static int _dump_sink(
-	const char *sink_name, unsigned sink_timeout,
-	long long count, long double interval,
+	const char *sink_name,
+	unsigned sink_timeout,
+	long long count,
+	long double interval,
 	bool key_required,
-	_output_context_s *ctx) {
+	_output_context_s *ctx
+) {
 
 	int retval = -1;
 
@@ -240,49 +226,45 @@ static int _dump_sink(
 	const useconds_t interval_us = interval * 1000000;
 
 	us_frame_s *frame = us_frame_init();
+	us_fpsi_s *fpsi = us_fpsi_init("SINK", false);
 	us_memsink_s *sink = NULL;
 
-	if ((sink = us_memsink_init("input", sink_name, false, 0, false, 0, sink_timeout)) == NULL) {
+	if ((sink = us_memsink_init_opened("input", sink_name, false, 0, false, 0, sink_timeout)) == NULL) {
 		goto error;
 	}
 
-	unsigned fps = 0;
-	unsigned fps_accum = 0;
-	long long fps_second = 0;
-
 	long double last_ts = 0;
 
 	while (!_g_stop) {
 		bool key_requested;
-		const int error = us_memsink_client_get(sink, frame, &key_requested, key_required);
-		if (error == 0) {
+		const int got = us_memsink_client_get(sink, frame, &key_requested, key_required);
+		if (got == 0) {
 			key_required = false;
 
 			const long double now = us_get_now_monotonic();
-			const long long now_second = us_floor_ms(now);
 
 			char fourcc_str[8];
-			US_LOG_VERBOSE("Frame: %s - %ux%u -- online=%d, key=%d, kr=%d, gop=%u, latency=%.3Lf, backlog=%.3Lf, size=%zu",
+			US_LOG_VERBOSE("%s %.3Lf - %s %ux%u - gop=%u, key=%u, kr=%u - GRAB=%.3Lf ~~%.3Lf~~ ENC=%.3Lf ~~> LAT=%.3Lf - size=%zu",
+				(frame->online ? " ON" : "OFF"),
+				(last_ts ? now - last_ts : 0),
 				us_fourcc_to_string(frame->format, fourcc_str, 8),
-				frame->width, frame->height,
-				frame->online, frame->key, key_requested, frame->gop,
-				now - frame->grab_ts, (last_ts ? now - last_ts : 0),
+				frame->width,
+				frame->height,
+				frame->gop,
+				frame->key,
+				key_requested,
+				frame->grab_end_ts - frame->grab_begin_ts,
+				frame->encode_begin_ts - frame->grab_end_ts,
+				frame->encode_end_ts - frame->encode_begin_ts,
+				now - frame->grab_begin_ts,
 				frame->used);
+
 			last_ts = now;
 
-			US_LOG_DEBUG("       stride=%u, grab_ts=%.3Lf, encode_begin_ts=%.3Lf, encode_end_ts=%.3Lf",
-				frame->stride, frame->grab_ts, frame->encode_begin_ts, frame->encode_end_ts);
+			us_fpsi_update(fpsi, true, NULL);
 
-			if (now_second != fps_second) {
-				fps = fps_accum;
-				fps_accum = 0;
-				fps_second = now_second;
-				US_LOG_PERF_FPS("A new second has come; captured_fps=%u", fps);
-			}
-			fps_accum += 1;
-
-			if (ctx->v_output != NULL) {
-				ctx->write(ctx->v_output, frame);
+			if (ctx->v_out != NULL) {
+				ctx->write(ctx->v_out, frame);
 			}
 
 			if (count >= 0) {
@@ -295,7 +277,7 @@ static int _dump_sink(
 			if (interval_us > 0) {
 				usleep(interval_us);
 			}
-		} else if (error == -2) {
+		} else if (got == US_ERROR_NO_DATA) {
 			usleep(1000);
 		} else {
 			goto error;
@@ -306,6 +288,7 @@ static int _dump_sink(
 
 error:
 	US_DELETE(sink, us_memsink_destroy);
+	us_fpsi_destroy(fpsi);
 	us_frame_destroy(frame);
 	US_LOG_INFO("Bye-bye");
 	return retval;
@@ -316,7 +299,7 @@ static void _help(FILE *fp) {
 	SAY("\nuStreamer-dump - Dump uStreamer's memory sink to file");
 	SAY("═════════════════════════════════════════════════════");
 	SAY("Version: %s; license: GPLv3", US_VERSION);
-	SAY("Copyright (C) 2018-2023 Maxim Devaev <mdevaev@gmail.com>\n");
+	SAY("Copyright (C) 2018-2024 Maxim Devaev <mdevaev@gmail.com>\n");
 	SAY("Example:");
 	SAY("════════");
 	SAY("    ustreamer-dump --sink test --output - \\");

src/libs/array.h

@@ -2,7 +2,7 @@
 #                                                                            #
 #    uStreamer - Lightweight and fast MJPEG-HTTP streamer.                   #
 #                                                                            #
-#    Copyright (C) 2018-2023  Maxim Devaev <mdevaev@gmail.com>               #
+#    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    #
@@ -22,16 +22,16 @@
 
 #pragma once
 
-#include <assert.h>
+#include "tools.h"
 
 
 #define US_ARRAY_LEN(x_array) (sizeof(x_array) / sizeof((x_array)[0]))
 
 #define US_ARRAY_ITERATE(x_array, x_start, x_item_ptr, ...) { \
 		const int m_len = US_ARRAY_LEN(x_array); \
-		assert(x_start <= m_len); \
-		for (int m_index = x_start; m_index < m_len; ++m_index) { \
-			__typeof__((x_array)[0]) *const x_item_ptr = &x_array[m_index]; \
+		US_A(x_start <= m_len); \
+		for (int m_i = x_start; m_i < m_len; ++m_i) { \
+			__typeof__((x_array)[0]) *const x_item_ptr = &x_array[m_i]; \
 			__VA_ARGS__ \
 		} \
 	}

src/libs/base64.c

@@ -2,7 +2,7 @@
 #                                                                            #
 #    uStreamer - Lightweight and fast MJPEG-HTTP streamer.                   #
 #                                                                            #
-#    Copyright (C) 2018-2023  Maxim Devaev <mdevaev@gmail.com>               #
+#    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    #
@@ -54,8 +54,8 @@ void us_base64_encode(const u8 *data, uz size, char **encoded, uz *allocated) {
 		}
 	}
 
-	for (uint data_index = 0, encoded_index = 0; data_index < size;) {
-#		define OCTET(_name) uint _name = (data_index < size ? (u8)data[data_index++] : 0)
+	for (uint data_i = 0, encoded_i = 0; data_i < size;) {
+#		define OCTET(_name) uint _name = (data_i < size ? (u8)data[data_i++] : 0)
 		OCTET(octet_a);
 		OCTET(octet_b);
 		OCTET(octet_c);
@@ -63,7 +63,7 @@ void us_base64_encode(const u8 *data, uz size, char **encoded, uz *allocated) {
 
 		const uint triple = (octet_a << 0x10) + (octet_b << 0x08) + octet_c;
 
-#		define ENCODE(_offset) (*encoded)[encoded_index++] = _ENCODING_TABLE[(triple >> _offset * 6) & 0x3F]
+#		define ENCODE(_offset) (*encoded)[encoded_i++] = _ENCODING_TABLE[(triple >> _offset * 6) & 0x3F]
 		ENCODE(3);
 		ENCODE(2);
 		ENCODE(1);

src/libs/base64.h

@@ -2,7 +2,7 @@
 #                                                                            #
 #    uStreamer - Lightweight and fast MJPEG-HTTP streamer.                   #
 #                                                                            #
-#    Copyright (C) 2018-2023  Maxim Devaev <mdevaev@gmail.com>               #
+#    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    #

src/libs/capture.h

@@ -2,7 +2,7 @@
 #                                                                            #
 #    uStreamer - Lightweight and fast MJPEG-HTTP streamer.                   #
 #                                                                            #
-#    Copyright (C) 2018-2023  Maxim Devaev <mdevaev@gmail.com>               #
+#    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    #
@@ -22,6 +22,8 @@
 
 #pragma once
 
+#include <stdatomic.h>
+
 #include <linux/videodev2.h>
 
 #include "types.h"
@@ -29,20 +31,15 @@
 
 
 #define US_VIDEO_MIN_WIDTH		((uint)160)
-#define US_VIDEO_MAX_WIDTH		((uint)15360)
+#define US_VIDEO_MAX_WIDTH		((uint)15360) // Remember about stream->run->http_capture_state;
 
 #define US_VIDEO_MIN_HEIGHT		((uint)120)
 #define US_VIDEO_MAX_HEIGHT		((uint)8640)
 
 #define US_VIDEO_MAX_FPS		((uint)120)
 
-#define US_STANDARD_UNKNOWN		V4L2_STD_UNKNOWN
 #define US_STANDARDS_STR		"PAL, NTSC, SECAM"
-
-#define US_FORMAT_UNKNOWN		-1
-#define US_FORMATS_STR			"YUYV, YVYU, UYVY, RGB565, RGB24, BGR24, MJPEG, JPEG"
-
-#define US_IO_METHOD_UNKNOWN	-1
+#define US_FORMATS_STR			"YUYV, YVYU, UYVY, YUV420, YVU420, RGB565, RGB24, BGR24, GREY, MJPEG, JPEG"
 #define US_IO_METHODS_STR		"MMAP, USERPTR"
 
 
@@ -51,7 +48,8 @@ typedef struct {
 	struct v4l2_buffer	buf;
 	int					dma_fd;
 	bool				grabbed;
-} us_hw_buffer_s;
+	atomic_int			refs;
+} us_capture_hwbuf_s;
 
 typedef struct {
 	int					fd;
@@ -60,16 +58,16 @@ typedef struct {
 	uint				format;
 	uint				stride;
 	float				hz;
-	uint				hw_fps;
 	uint				jpeg_quality;
 	uz					raw_size;
 	uint				n_bufs;
-	us_hw_buffer_s		*hw_bufs;
+	us_capture_hwbuf_s	*bufs;
+	bool				dma;
 	enum v4l2_buf_type	capture_type;
 	bool				capture_mplane;
-	bool				capturing;
-	bool				persistent_timeout_reported;
-} us_device_runtime_s;
+	bool				streamon;
+	int					open_error_once;
+} us_capture_runtime_s;
 
 typedef enum {
 	CTL_MODE_NONE = 0,
@@ -105,33 +103,36 @@ typedef struct {
 	uint				width;
 	uint				height;
 	uint				format;
+
+	bool				format_swap_rgb;
 	uint				jpeg_quality;
 	v4l2_std_id			standard;
 	enum v4l2_memory	io_method;
 	bool				dv_timings;
 	uint				n_bufs;
-	uint				desired_fps;
+	bool				dma_export;
+	bool				dma_required;
 	uz					min_frame_size;
+	bool				allow_truncated_frames;
 	bool				persistent;
 	uint				timeout;
 	us_controls_s 		ctl;
-	us_device_runtime_s *run;
-} us_device_s;
+	us_capture_runtime_s *run;
+} us_capture_s;
 
 
-us_device_s *us_device_init(void);
-void us_device_destroy(us_device_s *dev);
+us_capture_s *us_capture_init(void);
+void us_capture_destroy(us_capture_s *cap);
 
-int us_device_parse_format(const char *str);
-v4l2_std_id us_device_parse_standard(const char *str);
-int us_device_parse_io_method(const char *str);
+int us_capture_parse_format(const char *str);
+int us_capture_parse_standard(const char *str);
+int us_capture_parse_io_method(const char *str);
 
-int us_device_open(us_device_s *dev);
-void us_device_close(us_device_s *dev);
+int us_capture_open(us_capture_s *cap);
+void us_capture_close(us_capture_s *cap);
 
-int us_device_export_to_dma(us_device_s *dev);
-int us_device_switch_capturing(us_device_s *dev, bool enable);
-int us_device_select(us_device_s *dev, bool *has_read, bool *has_write, bool *has_error);
-int us_device_grab_buffer(us_device_s *dev, us_hw_buffer_s **hw);
-int us_device_release_buffer(us_device_s *dev, us_hw_buffer_s *hw);
-int us_device_consume_event(us_device_s *dev);
+int us_capture_hwbuf_grab(us_capture_s *cap, us_capture_hwbuf_s **hw);
+int us_capture_hwbuf_release(const us_capture_s *cap, us_capture_hwbuf_s *hw);
+
+void us_capture_hwbuf_incref(us_capture_hwbuf_s *hw);
+void us_capture_hwbuf_decref(us_capture_hwbuf_s *hw);

src/libs/const.h

@@ -2,7 +2,7 @@
 #                                                                            #
 #    uStreamer - Lightweight and fast MJPEG-HTTP streamer.                   #
 #                                                                            #
-#    Copyright (C) 2018-2023  Maxim Devaev <mdevaev@gmail.com>               #
+#    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    #
@@ -25,8 +25,8 @@
 #include "types.h"
 
 
-#define US_VERSION_MAJOR 5
-#define US_VERSION_MINOR 54
+#define US_VERSION_MAJOR 6
+#define US_VERSION_MINOR 55
 
 #define US_MAKE_VERSION2(_major, _minor) #_major "." #_minor
 #define US_MAKE_VERSION1(_major, _minor) US_MAKE_VERSION2(_major, _minor)

src/libs/drm/drm.c

@@ -0,0 +1,794 @@
+/*****************************************************************************
+#                                                                            #
+#    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 "drm.h"
+
+#include <string.h>
+#include <unistd.h>
+#include <fcntl.h>
+
+#include <sys/mman.h>
+#include <sys/stat.h>
+#ifdef __linux__
+#	include <sys/sysmacros.h>
+#endif
+
+#include <linux/videodev2.h>
+
+#include <xf86drm.h>
+#include <xf86drmMode.h>
+#include <drm_fourcc.h>
+#include <libdrm/drm.h>
+
+#include "../types.h"
+#include "../errors.h"
+#include "../tools.h"
+#include "../logging.h"
+#include "../frame.h"
+#include "../frametext.h"
+#include "../capture.h"
+
+
+static void _drm_vsync_callback(int fd, uint n_frame, uint sec, uint usec, void *v_buf);
+static int _drm_check_status(us_drm_s *drm);
+static void _drm_ensure_dpms_power(us_drm_s *drm, bool on);
+static int _drm_init_buffers(us_drm_s *drm, const us_capture_s *cap);
+static int _drm_find_sink(us_drm_s *drm, uint width, uint height, float hz);
+
+static drmModeModeInfo *_find_best_mode(drmModeConnector *conn, uint width, uint height, float hz);
+static u32 _find_dpms(int fd, drmModeConnector *conn);
+static u32 _find_crtc(int fd, drmModeRes *res, drmModeConnector *conn, u32 *taken_crtcs);
+static const char *_connector_type_to_string(u32 type);
+static float _get_refresh_rate(const drmModeModeInfo *mode);
+
+
+#define _LOG_ERROR(x_msg, ...)		US_LOG_ERROR("DRM: " x_msg, ##__VA_ARGS__)
+#define _LOG_PERROR(x_msg, ...)		US_LOG_PERROR("DRM: " x_msg, ##__VA_ARGS__)
+#define _LOG_INFO(x_msg, ...)		US_LOG_INFO("DRM: " x_msg, ##__VA_ARGS__)
+#define _LOG_VERBOSE(x_msg, ...)	US_LOG_VERBOSE("DRM: " x_msg, ##__VA_ARGS__)
+#define _LOG_DEBUG(x_msg, ...)		US_LOG_DEBUG("DRM: " x_msg, ##__VA_ARGS__)
+
+
+us_drm_s *us_drm_init(void) {
+	us_drm_runtime_s *run;
+	US_CALLOC(run, 1);
+	run->fd = -1;
+	run->status_fd = -1;
+	run->dpms_state = -1;
+	run->opened = -1;
+	run->has_vsync = true;
+	run->exposing_dma_fd = -1;
+	run->ft = us_frametext_init();
+
+	us_drm_s *drm;
+	US_CALLOC(drm, 1);
+	// drm->path = "/dev/dri/card0";
+	drm->path = "/dev/dri/by-path/platform-gpu-card";
+	drm->port = "HDMI-A-2"; // OUT2 on PiKVM V4 Plus
+	drm->timeout = 5;
+	drm->blank_after = 5;
+	drm->run = run;
+	return drm;
+}
+
+void us_drm_destroy(us_drm_s *drm) {
+	us_frametext_destroy(drm->run->ft);
+	US_DELETE(drm->run, free);
+	US_DELETE(drm, free); // cppcheck-suppress uselessAssignmentPtrArg
+}
+
+int us_drm_open(us_drm_s *drm, const us_capture_s *cap) {
+	us_drm_runtime_s *const run = drm->run;
+
+	US_A(run->fd < 0);
+
+	switch (_drm_check_status(drm)) {
+		case 0: break;
+		case US_ERROR_NO_DEVICE: goto unplugged;
+		default: goto error;
+	}
+
+	_LOG_INFO("Using passthrough: %s[%s]", drm->path, drm->port);
+	_LOG_INFO("Configuring DRM device for %s ...", (cap == NULL ? "STUB" : "DMA"));
+
+	if ((run->fd = open(drm->path, O_RDWR | O_CLOEXEC | O_NONBLOCK)) < 0) {
+		_LOG_PERROR("Can't open DRM device");
+		goto error;
+	}
+	_LOG_DEBUG("DRM device fd=%d opened", run->fd);
+
+	int stub = 0; // Open the real device with DMA
+	if (cap == NULL) {
+		stub = US_DRM_STUB_USER;
+	} else if (cap->run->format != V4L2_PIX_FMT_RGB24 && cap->run->format != V4L2_PIX_FMT_BGR24) {
+		stub = US_DRM_STUB_BAD_FORMAT;
+		char fourcc_str[8];
+		us_fourcc_to_string(cap->run->format, fourcc_str, 8);
+		_LOG_ERROR("Input format %s is not supported, forcing to STUB ...", fourcc_str);
+	}
+
+#	define CHECK_CAP(x_cap) { \
+			_LOG_DEBUG("Checking %s ...", #x_cap); \
+			u64 m_check; \
+			if (drmGetCap(run->fd, x_cap, &m_check) < 0) { \
+				_LOG_PERROR("Can't check " #x_cap); \
+				goto error; \
+			} \
+			if (!m_check) { \
+				_LOG_ERROR(#x_cap " is not supported"); \
+				goto error; \
+			} \
+		}
+	CHECK_CAP(DRM_CAP_DUMB_BUFFER);
+	if (stub == 0) {
+		CHECK_CAP(DRM_CAP_PRIME);
+	}
+#	undef CHECK_CAP
+
+	const uint width = (stub > 0 ? 0 : cap->run->width);
+	const uint height = (stub > 0 ? 0 : cap->run->height);
+	const uint hz = (stub > 0 ? 0 : cap->run->hz);
+	switch (_drm_find_sink(drm, width, height, hz)) {
+		case 0: break;
+		case US_ERROR_NO_DEVICE: goto unplugged;
+		default: goto error;
+	}
+	if ((stub == 0) && (width != run->mode.hdisplay || height < run->mode.vdisplay)) {
+		// We'll try to show something instead of nothing if height != vdisplay
+		stub = US_DRM_STUB_BAD_RESOLUTION;
+		_LOG_ERROR("There is no appropriate modes for the capture, forcing to STUB ...");
+	}
+
+	if (_drm_init_buffers(drm, (stub > 0 ? NULL : cap)) < 0) {
+		goto error;
+	}
+
+	run->saved_crtc = drmModeGetCrtc(run->fd, run->crtc_id);
+	_LOG_DEBUG("Setting up CRTC ...");
+	if (drmModeSetCrtc(
+		run->fd,
+		run->crtc_id, run->bufs[0].id,
+		0, 0, // X, Y
+		&run->conn_id, 1, &run->mode
+	) < 0) {
+		_LOG_PERROR("Can't set CRTC");
+		goto error;
+	}
+
+	_LOG_INFO("Opened for %s ...", (stub > 0 ? "STUB" : "DMA"));
+	run->exposing_dma_fd = -1;
+	run->blank_at_ts = 0;
+	run->opened = stub;
+	run->once = 0;
+	return run->opened;
+
+error:
+	us_drm_close(drm);
+	return run->opened; // -1 after us_drm_close()
+
+unplugged:
+	US_ONCE_FOR(run->once, __LINE__, {
+		_LOG_ERROR("Display is not plugged");
+	});
+	us_drm_close(drm);
+	run->opened = US_ERROR_NO_DEVICE;
+	return run->opened;
+}
+
+void us_drm_close(us_drm_s *drm) {
+	us_drm_runtime_s *const run = drm->run;
+
+	if (run->exposing_dma_fd >= 0) {
+		// Нужно подождать, пока dma_fd не освободится, прежде чем прерывать процесс.
+		// Просто на всякий случай.
+		US_A(run->fd >= 0);
+		us_drm_wait_for_vsync(drm);
+		run->exposing_dma_fd = -1;
+	}
+
+	if (run->saved_crtc != NULL) {
+		_LOG_DEBUG("Restoring CRTC ...");
+		if (drmModeSetCrtc(
+			run->fd,
+			run->saved_crtc->crtc_id, run->saved_crtc->buffer_id,
+			run->saved_crtc->x, run->saved_crtc->y,
+			&run->conn_id, 1, &run->saved_crtc->mode
+		) < 0 && errno != ENOENT) {
+			_LOG_PERROR("Can't restore CRTC");
+		}
+		drmModeFreeCrtc(run->saved_crtc);
+		run->saved_crtc = NULL;
+	}
+
+	if (run->bufs != NULL) {
+		_LOG_DEBUG("Releasing buffers ...");
+		for (uint n_buf = 0; n_buf < run->n_bufs; ++n_buf) {
+			us_drm_buffer_s *const buf = &run->bufs[n_buf];
+			if (buf->fb_added && drmModeRmFB(run->fd, buf->id) < 0) {
+				_LOG_PERROR("Can't remove buffer=%u", n_buf);
+			}
+			if (buf->dumb_created) {
+				struct drm_mode_destroy_dumb destroy = {.handle = buf->handle};
+				if (drmIoctl(run->fd, DRM_IOCTL_MODE_DESTROY_DUMB, &destroy) < 0) {
+					_LOG_PERROR("Can't destroy dumb buffer=%u", n_buf);
+				}
+			}
+			if (buf->data != NULL && munmap(buf->data, buf->allocated)) {
+				_LOG_PERROR("Can't unmap buffer=%u", n_buf);
+			}
+		}
+		US_DELETE(run->bufs, free);
+		run->n_bufs = 0;
+	}
+
+	const bool say = (run->fd >= 0);
+	US_CLOSE_FD(run->status_fd);
+	US_CLOSE_FD(run->fd);
+
+	run->crtc_id = 0;
+	run->dpms_state = -1;
+	run->opened = -1;
+	run->has_vsync = true;
+	run->stub_n_buf = 0;
+
+	if (say) {
+		_LOG_INFO("Closed");
+	}
+}
+
+int us_drm_ensure_no_signal(us_drm_s *drm) {
+	us_drm_runtime_s *const run = drm->run;
+
+	US_A(run->fd >= 0);
+	US_A(run->opened > 0);
+
+	const ldf now_ts = us_get_now_monotonic();
+	if (run->blank_at_ts == 0) {
+		run->blank_at_ts = now_ts + drm->blank_after;
+	}
+	const ldf saved_ts = run->blank_at_ts; // us_drm*() rewrites it to 0
+
+	int retval;
+	if (now_ts <= run->blank_at_ts) {
+		retval = us_drm_wait_for_vsync(drm);
+		if (retval == 0) {
+			retval = us_drm_expose_stub(drm, US_DRM_STUB_NO_SIGNAL, NULL);
+		}
+	} else {
+		US_ONCE_FOR(run->once, __LINE__, {
+			_LOG_INFO("Turning off the display by timeout ...");
+		});
+		retval = us_drm_dpms_power_off(drm);
+	}
+	run->blank_at_ts = saved_ts;
+	return retval;
+}
+
+int us_drm_dpms_power_off(us_drm_s *drm) {
+	US_A(drm->run->fd >= 0);
+	switch (_drm_check_status(drm)) {
+		case 0: break;
+		case US_ERROR_NO_DEVICE: return 0; // Unplugged, nice
+		// Во время переключения DPMS монитор моргает один раз состоянием disconnected,
+		// а потом почему-то снова оказывается connected. Так что просто считаем,
+		// что отсоединенный монитор на этом этапе - это нормально.
+		default: return -1;
+	}
+	_drm_ensure_dpms_power(drm, false);
+	return 0;
+}
+
+int us_drm_wait_for_vsync(us_drm_s *drm) {
+	us_drm_runtime_s *const run = drm->run;
+
+	US_A(run->fd >= 0);
+	run->blank_at_ts = 0;
+
+	switch (_drm_check_status(drm)) {
+		case 0: break;
+		case US_ERROR_NO_DEVICE: return US_ERROR_NO_DEVICE;
+		default: return -1;
+	}
+	_drm_ensure_dpms_power(drm, true);
+
+	if (run->has_vsync) {
+		return 0;
+	}
+
+	struct timeval timeout = {.tv_sec = drm->timeout};
+	fd_set fds;
+	FD_ZERO(&fds);
+	FD_SET(run->fd, &fds);
+
+	_LOG_DEBUG("Calling select() for VSync ...");
+	const int result = select(run->fd + 1, &fds, NULL, NULL, &timeout);
+	if (result < 0) {
+		_LOG_PERROR("Can't select(%d) device for VSync", run->fd);
+		return -1;
+	} else if (result == 0) {
+		_LOG_ERROR("Device timeout while waiting VSync");
+		return -1;
+	}
+
+	drmEventContext ctx = {
+		.version = DRM_EVENT_CONTEXT_VERSION,
+		.page_flip_handler = _drm_vsync_callback,
+	};
+	_LOG_DEBUG("Handling DRM event (maybe VSync) ...");
+	if (drmHandleEvent(run->fd, &ctx) < 0) {
+		_LOG_PERROR("Can't handle DRM event");
+		return -1;
+	}
+	return 0;
+}
+
+static void _drm_vsync_callback(int fd, uint n_frame, uint sec, uint usec, void *v_buf) {
+	(void)fd;
+	(void)n_frame;
+	(void)sec;
+	(void)usec;
+	us_drm_buffer_s *const buf = v_buf;
+	*buf->ctx.has_vsync = true;
+	*buf->ctx.exposing_dma_fd = -1;
+	_LOG_DEBUG("Got VSync signal");
+}
+
+int us_drm_expose_stub(us_drm_s *drm, us_drm_stub_e stub, const us_capture_s *cap) {
+	us_drm_runtime_s *const run = drm->run;
+
+	US_A(run->fd >= 0);
+	US_A(run->opened > 0);
+	run->blank_at_ts = 0;
+
+	switch (_drm_check_status(drm)) {
+		case 0: break;
+		case US_ERROR_NO_DEVICE: return US_ERROR_NO_DEVICE;
+		default: return -1;
+	}
+	_drm_ensure_dpms_power(drm, true);
+
+#	define DRAW_MSG(x_msg) us_frametext_draw(run->ft, (x_msg), run->mode.hdisplay, run->mode.vdisplay)
+	switch (stub) {
+		case US_DRM_STUB_BAD_RESOLUTION: {
+			US_A(cap != NULL);
+			char msg[1024];
+			US_SNPRINTF(msg, 1023,
+				"=== PiKVM ==="
+				"\n \n< UNSUPPORTED RESOLUTION >"
+				"\n \n< %ux%up%.02f >"
+				"\n \nby this display",
+				cap->run->width, cap->run->height, cap->run->hz);
+			DRAW_MSG(msg);
+			break;
+		};
+		case US_DRM_STUB_BAD_FORMAT:
+			DRAW_MSG("=== PiKVM ===\n \n< UNSUPPORTED CAPTURE FORMAT >");
+			break;
+		case US_DRM_STUB_NO_SIGNAL:
+			DRAW_MSG("=== PiKVM ===\n \n< NO LIVE VIDEO >");
+			break;
+		case US_DRM_STUB_BUSY:
+			DRAW_MSG("=== PiKVM ===\n \n< ONLINE IS ACTIVE >");
+			break;
+		default:
+			DRAW_MSG("=== PiKVM ===\n \n< ??? >");
+			break;
+	}
+#	undef DRAW_MSG
+
+	us_drm_buffer_s *const buf = &run->bufs[run->stub_n_buf];
+
+	run->has_vsync = false;
+
+	_LOG_DEBUG("Copying STUB frame ...")
+	memcpy(buf->data, run->ft->frame->data, US_MIN(run->ft->frame->used, buf->allocated));
+
+	_LOG_DEBUG("Exposing STUB framebuffer n_buf=%u ...", run->stub_n_buf);
+	const int retval = drmModePageFlip(
+		run->fd, run->crtc_id, buf->id,
+		DRM_MODE_PAGE_FLIP_EVENT | DRM_MODE_PAGE_FLIP_ASYNC,
+		buf);
+	if (retval < 0) {
+		_LOG_PERROR("Can't expose STUB framebuffer n_buf=%u ...", run->stub_n_buf);
+	}
+	_LOG_DEBUG("Exposed STUB framebuffer n_buf=%u", run->stub_n_buf);
+
+	run->stub_n_buf = (run->stub_n_buf + 1) % run->n_bufs;
+	return retval;
+}
+
+int us_drm_expose_dma(us_drm_s *drm, const us_capture_hwbuf_s *hw) {
+	us_drm_runtime_s *const run = drm->run;
+	us_drm_buffer_s *const buf = &run->bufs[hw->buf.index];
+
+	US_A(run->fd >= 0);
+	US_A(run->opened == 0);
+	run->blank_at_ts = 0;
+
+	switch (_drm_check_status(drm)) {
+		case 0: break;
+		case US_ERROR_NO_DEVICE: return US_ERROR_NO_DEVICE;
+		default: return -1;
+	}
+	_drm_ensure_dpms_power(drm, true);
+
+	run->has_vsync = false;
+
+	_LOG_DEBUG("Exposing DMA framebuffer n_buf=%u ...", hw->buf.index);
+	const int retval = drmModePageFlip(
+		run->fd, run->crtc_id, buf->id,
+		DRM_MODE_PAGE_FLIP_EVENT | DRM_MODE_PAGE_FLIP_ASYNC,
+		buf);
+	if (retval < 0) {
+		_LOG_PERROR("Can't expose DMA framebuffer n_buf=%u ...", run->stub_n_buf);
+	}
+	_LOG_DEBUG("Exposed DMA framebuffer n_buf=%u", run->stub_n_buf);
+	run->exposing_dma_fd = hw->dma_fd;
+	return retval;
+}
+
+static int _drm_check_status(us_drm_s *drm) {
+	us_drm_runtime_s *run = drm->run;
+
+	if (run->status_fd < 0) {
+		_LOG_DEBUG("Trying to find status file ...");
+		struct stat st;
+		if (stat(drm->path, &st) < 0) {
+			_LOG_PERROR("Can't stat() DRM device");
+			goto error;
+		}
+		const uint mi = minor(st.st_rdev);
+		_LOG_DEBUG("DRM device minor(st_rdev)=%u", mi);
+
+		char path[128];
+		US_SNPRINTF(path, 127, "/sys/class/drm/card%u-%s/status", mi, drm->port);
+		_LOG_DEBUG("Opening status file %s ...", path);
+		if ((run->status_fd = open(path, O_RDONLY | O_CLOEXEC)) < 0) {
+			_LOG_PERROR("Can't open status file: %s", path);
+			goto error;
+		}
+		_LOG_DEBUG("Status file fd=%d opened", run->status_fd);
+	}
+
+	char status_ch;
+	if (read(run->status_fd, &status_ch, 1) != 1) {
+		_LOG_PERROR("Can't read status file");
+		goto error;
+	}
+	if (lseek(run->status_fd, 0, SEEK_SET) != 0) {
+		_LOG_PERROR("Can't rewind status file");
+		goto error;
+	}
+	_LOG_DEBUG("Current display status: %c", status_ch);
+	return (status_ch == 'd' ? US_ERROR_NO_DEVICE : 0);
+
+error:
+	US_CLOSE_FD(run->status_fd);
+	return -1;
+}
+
+static void _drm_ensure_dpms_power(us_drm_s *drm, bool on) {
+	us_drm_runtime_s *const run = drm->run;
+	if (run->dpms_id > 0 && run->dpms_state != (int)on) {
+		_LOG_INFO("Changing DPMS power mode: %d -> %u ...", run->dpms_state, on);
+		if (drmModeConnectorSetProperty(
+			run->fd, run->conn_id, run->dpms_id,
+			(on ? DRM_MODE_DPMS_ON : DRM_MODE_DPMS_OFF)
+		) < 0) {
+			_LOG_PERROR("Can't set DPMS power=%u (ignored)", on);
+		}
+	}
+	run->dpms_state = (int)on;
+}
+
+static int _drm_init_buffers(us_drm_s *drm, const us_capture_s *cap) {
+	us_drm_runtime_s *const run = drm->run;
+
+	const uint n_bufs = (cap == NULL ? 4 : cap->run->n_bufs);
+	const char *name = (cap == NULL ? "STUB" : "DMA");
+
+	_LOG_DEBUG("Initializing %u %s buffers ...", n_bufs, name);
+
+	uint format = DRM_FORMAT_RGB888;
+
+	US_CALLOC(run->bufs, n_bufs);
+	for (run->n_bufs = 0; run->n_bufs < n_bufs; ++run->n_bufs) {
+		const uint n_buf = run->n_bufs;
+		us_drm_buffer_s *const buf = &run->bufs[n_buf];
+
+		buf->ctx.has_vsync = &run->has_vsync;
+		buf->ctx.exposing_dma_fd = &run->exposing_dma_fd;
+
+		u32 handles[4] = {0};
+		u32 strides[4] = {0};
+		u32 offsets[4] = {0};
+
+		if (cap == NULL) {
+			struct drm_mode_create_dumb create = {
+				.width = run->mode.hdisplay,
+				.height = run->mode.vdisplay,
+				.bpp = 24,
+			};
+			if (drmIoctl(run->fd, DRM_IOCTL_MODE_CREATE_DUMB, &create) < 0) {
+				_LOG_PERROR("Can't create %s buffer=%u", name, n_buf);
+				return -1;
+			}
+			buf->handle = create.handle;
+			buf->dumb_created = true;
+
+			struct drm_mode_map_dumb map = {.handle = create.handle};
+			if (drmIoctl(run->fd, DRM_IOCTL_MODE_MAP_DUMB, &map) < 0) {
+				_LOG_PERROR("Can't prepare dumb buffer=%u to mapping", n_buf);
+				return -1;
+			}
+			if ((buf->data = mmap(
+				NULL, create.size,
+				PROT_READ | PROT_WRITE, MAP_SHARED,
+				run->fd, map.offset
+			)) == MAP_FAILED) {
+				_LOG_PERROR("Can't map buffer=%u", n_buf);
+				return -1;
+			}
+			memset(buf->data, 0, create.size);
+			buf->allocated = create.size;
+
+			handles[0] = create.handle;
+			strides[0] = create.pitch;
+
+		} else {
+			if (drmPrimeFDToHandle(run->fd, cap->run->bufs[n_buf].dma_fd, &buf->handle) < 0) {
+				_LOG_PERROR("Can't import DMA buffer=%u from capture device", n_buf);
+				return -1;
+			}
+			handles[0] = buf->handle;
+			strides[0] = cap->run->stride;
+
+			switch (cap->run->format) {
+				case V4L2_PIX_FMT_RGB24: format = (DRM_FORMAT_BIG_ENDIAN ? DRM_FORMAT_BGR888 : DRM_FORMAT_RGB888); break;
+				case V4L2_PIX_FMT_BGR24: format = (DRM_FORMAT_BIG_ENDIAN ? DRM_FORMAT_RGB888 : DRM_FORMAT_BGR888); break;
+			}
+		}
+
+		if (drmModeAddFB2(
+			run->fd,
+			run->mode.hdisplay, run->mode.vdisplay, format,
+			handles, strides, offsets, &buf->id, 0
+		)) {
+			_LOG_PERROR("Can't setup buffer=%u", n_buf);
+			return -1;
+		}
+		buf->fb_added = true;
+	}
+	return 0;
+}
+
+static int _drm_find_sink(us_drm_s *drm, uint width, uint height, float hz) {
+	us_drm_runtime_s *const run = drm->run;
+
+	run->crtc_id = 0;
+
+	_LOG_DEBUG("Trying to find the appropriate sink ...");
+
+	drmModeRes *res = drmModeGetResources(run->fd);
+	if (res == NULL) {
+		_LOG_PERROR("Can't get resources info");
+		goto done;
+	}
+	if (res->count_connectors <= 0) {
+		_LOG_ERROR("Can't find any connectors");
+		goto done;
+	}
+
+	for (int ci = 0; ci < res->count_connectors; ++ci) {
+		drmModeConnector *conn = drmModeGetConnector(run->fd, res->connectors[ci]);
+		if (conn == NULL) {
+			_LOG_PERROR("Can't get connector index=%d", ci);
+			goto done;
+		}
+
+		char port[32];
+		US_SNPRINTF(port, 31, "%s-%u",
+			_connector_type_to_string(conn->connector_type),
+			conn->connector_type_id);
+		if (strcmp(port, drm->port) != 0) {
+			drmModeFreeConnector(conn);
+			continue;
+		}
+		_LOG_INFO("Using connector %s: conn_type=%d, conn_type_id=%d",
+			drm->port, conn->connector_type, conn->connector_type_id);
+
+		if (conn->connection != DRM_MODE_CONNECTED) {
+			_LOG_ERROR("Connector for port %s has !DRM_MODE_CONNECTED", drm->port);
+			drmModeFreeConnector(conn);
+			goto done;
+		}
+
+		const drmModeModeInfo *best;
+		if ((best = _find_best_mode(conn, width, height, hz)) == NULL) {
+			_LOG_ERROR("Can't find any appropriate display modes");
+			drmModeFreeConnector(conn);
+			goto unplugged;
+		}
+		_LOG_INFO("Using best mode: %ux%up%.02f",
+			best->hdisplay, best->vdisplay, _get_refresh_rate(best));
+
+		if ((run->dpms_id = _find_dpms(run->fd, conn)) > 0) {
+			_LOG_INFO("Using DPMS: id=%u", run->dpms_id);
+		} else {
+			_LOG_INFO("Using DPMS: None");
+		}
+
+		u32 taken_crtcs = 0; // Unused here
+		if ((run->crtc_id = _find_crtc(run->fd, res, conn, &taken_crtcs)) == 0) {
+			_LOG_ERROR("Can't find CRTC");
+			drmModeFreeConnector(conn);
+			goto done;
+		}
+		_LOG_INFO("Using CRTC: id=%u", run->crtc_id);
+
+		run->conn_id = conn->connector_id;
+		memcpy(&run->mode, best, sizeof(drmModeModeInfo));
+
+		drmModeFreeConnector(conn);
+		break;
+	}
+
+done:
+	drmModeFreeResources(res);
+	return (run->crtc_id > 0 ? 0 : -1);
+
+unplugged:
+	drmModeFreeResources(res);
+	return US_ERROR_NO_DEVICE;
+}
+
+static drmModeModeInfo *_find_best_mode(drmModeConnector *conn, uint width, uint height, float hz) {
+	drmModeModeInfo *best = NULL;
+	drmModeModeInfo *closest = NULL;
+	drmModeModeInfo *pref = NULL;
+
+	for (int mi = 0; mi < conn->count_modes; ++mi) {
+		drmModeModeInfo *const mode = &conn->modes[mi];
+		if (mode->flags & DRM_MODE_FLAG_INTERLACE) {
+			continue; // Discard interlaced
+		}
+		const float mode_hz = _get_refresh_rate(mode);
+		if (width == 640 && height == 416 && mode->hdisplay == 640 && mode->vdisplay == 480) {
+			// A special case for some ancient DOS device with VGA converter.
+			// @CapnKirk in Discord
+			if (hz > 0 && mode_hz < hz) {
+				best = mode;
+				best->vdisplay = 416;
+				break;
+			}
+		}
+		if (mode->hdisplay == width && mode->vdisplay == height) {
+			best = mode; // Any mode with exact resolution
+			if (hz > 0 && mode_hz == hz) {
+				break; // Exact mode with same freq
+			}
+		}
+		if (mode->hdisplay == width && mode->vdisplay < height) {
+			if (closest == NULL || _get_refresh_rate(closest) != hz) {
+				closest = mode; // Something like 1920x1080p60 for 1920x1200p60 source
+			}
+		}
+		if (pref == NULL && (mode->type & DRM_MODE_TYPE_PREFERRED)) {
+			pref = mode; // Preferred mode if nothing is found
+		}
+	}
+
+	if (best == NULL) {
+		best = closest;
+	}
+	if (best == NULL) {
+		best = pref;
+	}
+	if (best == NULL) {
+		best = (conn->count_modes > 0 ? &conn->modes[0] : NULL);
+	}
+	US_A(best == NULL || best->hdisplay > 0);
+	US_A(best == NULL || best->vdisplay > 0);
+	return best;
+}
+
+static u32 _find_dpms(int fd, drmModeConnector *conn) {
+	for (int pi = 0; pi < conn->count_props; pi++) {
+		drmModePropertyPtr prop = drmModeGetProperty(fd, conn->props[pi]);
+		if (prop != NULL) {
+			if (!strcmp(prop->name, "DPMS")) {
+				const u32 id = prop->prop_id;
+				drmModeFreeProperty(prop);
+				return id;
+			}
+			drmModeFreeProperty(prop);
+		}
+	}
+	return 0;
+}
+
+static u32 _find_crtc(int fd, drmModeRes *res, drmModeConnector *conn, u32 *taken_crtcs) {
+	for (int ei = 0; ei < conn->count_encoders; ++ei) {
+		drmModeEncoder *enc = drmModeGetEncoder(fd, conn->encoders[ei]);
+		if (enc == NULL) {
+			continue;
+		}
+		for (int ci = 0; ci < res->count_crtcs; ++ci) {
+			u32 bit = (1 << ci);
+			if (!(enc->possible_crtcs & bit)) {
+				continue; // Not compatible
+			}
+			if (*taken_crtcs & bit) {
+				continue; // Already taken
+			}
+			drmModeFreeEncoder(enc);
+			*taken_crtcs |= bit;
+			return res->crtcs[ci];
+		}
+		drmModeFreeEncoder(enc);
+	}
+	return 0;
+}
+
+static const char *_connector_type_to_string(u32 type) {
+	switch (type) {
+#		define CASE_NAME(x_suffix, x_name) \
+			case DRM_MODE_CONNECTOR_##x_suffix: return x_name;
+		CASE_NAME(VGA,			"VGA");
+		CASE_NAME(DVII,			"DVI-I");
+		CASE_NAME(DVID,			"DVI-D");
+		CASE_NAME(DVIA,			"DVI-A");
+		CASE_NAME(Composite,	"Composite");
+		CASE_NAME(SVIDEO,		"SVIDEO");
+		CASE_NAME(LVDS,			"LVDS");
+		CASE_NAME(Component,	"Component");
+		CASE_NAME(9PinDIN,		"DIN");
+		CASE_NAME(DisplayPort,	"DP");
+		CASE_NAME(HDMIA,		"HDMI-A");
+		CASE_NAME(HDMIB,		"HDMI-B");
+		CASE_NAME(TV,			"TV");
+		CASE_NAME(eDP,			"eDP");
+		CASE_NAME(VIRTUAL,		"Virtual");
+		CASE_NAME(DSI,			"DSI");
+		CASE_NAME(DPI,			"DPI");
+		CASE_NAME(WRITEBACK,	"Writeback");
+		CASE_NAME(SPI,			"SPI");
+		CASE_NAME(USB,			"USB");
+		case DRM_MODE_CONNECTOR_Unknown: break;
+#		undef CASE_NAME
+	}
+	return "Unknown";
+}
+
+static float _get_refresh_rate(const drmModeModeInfo *mode) {
+	int mhz = (mode->clock * 1000000LL / mode->htotal + mode->vtotal / 2) / mode->vtotal;
+	if (mode->flags & DRM_MODE_FLAG_INTERLACE) {
+		mhz *= 2;
+	}
+	if (mode->flags & DRM_MODE_FLAG_DBLSCAN) {
+		mhz /= 2;
+	}
+	if (mode->vscan > 1) {
+		mhz /= mode->vscan;
+	}
+	return (float)mhz / 1000;
+}

src/libs/drm/drm.h

@@ -2,7 +2,7 @@
 #                                                                            #
 #    uStreamer - Lightweight and fast MJPEG-HTTP streamer.                   #
 #                                                                            #
-#    Copyright (C) 2018-2023  Maxim Devaev <mdevaev@gmail.com>               #
+#    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    #
@@ -25,24 +25,19 @@
 
 #include <xf86drmMode.h>
 
-#include "../libs/types.h"
-#include "../libs/frame.h"
-
-#include "ftext.h"
+#include "../types.h"
+#include "../frame.h"
+#include "../frametext.h"
+#include "../capture.h"
 
 
 typedef enum {
-	US_DRM_EXPOSE_FRAME = 0,
-	US_DRM_EXPOSE_NO_SIGNAL,
-	US_DRM_EXPOSE_BUSY,
-} us_drm_expose_e;
-
-typedef enum {
-	US_DRM_STATE_OK = 0,
-	US_DRM_STATE_CLOSED,
-	US_DRM_STATE_RETRY, // Not used directly
-	US_DRM_STATE_NO_DISPLAY,
-} us_drm_state_e;
+	US_DRM_STUB_USER = 1,
+	US_DRM_STUB_BAD_RESOLUTION,
+	US_DRM_STUB_BAD_FORMAT,
+	US_DRM_STUB_NO_SIGNAL,
+	US_DRM_STUB_BUSY,
+} us_drm_stub_e;
 
 typedef struct {
 	u32		id;
@@ -51,35 +46,39 @@ typedef struct {
 	uz		allocated;
 	bool	dumb_created;
 	bool	fb_added;
+	struct {
+		bool	*has_vsync;
+		int		*exposing_dma_fd;
+	} ctx;
 } us_drm_buffer_s;
 
 typedef struct {
+	int				status_fd;
 	int				fd;
-	int				conn_type;
-	int				conn_type_id;
 	u32				crtc_id;
-	drmModeModeInfo	mode;
 	u32				conn_id;
+	u32				dpms_id;
+	drmModeModeInfo	mode;
 	us_drm_buffer_s	*bufs;
 	uint			n_bufs;
 	drmModeCrtc		*saved_crtc;
-	uint			next_n_buf;
+	int				dpms_state;
+	int				opened;
+
 	bool			has_vsync;
+	int				exposing_dma_fd;
+	uint			stub_n_buf;
+	ldf				blank_at_ts;
 
-	us_ftext_s		*ft;
-
-	uint			p_width;
-	uint			p_height;
-	float			p_hz;
-
-	us_drm_state_e	state;
+	int				once;
+	us_frametext_s	*ft;
 } us_drm_runtime_s;
 
 typedef struct {
 	char	*path;
 	char	*port;
-	uint	n_bufs;
 	uint	timeout;
+	uint	blank_after;
 
 	us_drm_runtime_s *run;
 } us_drm_s;
@@ -88,5 +87,11 @@ typedef struct {
 us_drm_s *us_drm_init(void);
 void us_drm_destroy(us_drm_s *drm);
 
+int us_drm_open(us_drm_s *drm, const us_capture_s *cap);
+void us_drm_close(us_drm_s *drm);
+
+int us_drm_dpms_power_off(us_drm_s *drm);
 int us_drm_wait_for_vsync(us_drm_s *drm);
-int us_drm_expose(us_drm_s *drm, us_drm_expose_e ex, const us_frame_s *frame, float hz);
+int us_drm_expose_stub(us_drm_s *drm, us_drm_stub_e stub, const us_capture_s *cap);
+int us_drm_expose_dma(us_drm_s *drm, const us_capture_hwbuf_s *hw);
+int us_drm_ensure_no_signal(us_drm_s *drm);

src/libs/errors.h

@@ -2,7 +2,7 @@
 #                                                                            #
 #    uStreamer - Lightweight and fast MJPEG-HTTP streamer.                   #
 #                                                                            #
-#    Copyright (C) 2018-2023  Maxim Devaev <mdevaev@gmail.com>               #
+#    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    #
@@ -22,13 +22,10 @@
 
 #pragma once
 
-#include <stdint.h>
-
-#include <sys/types.h>
-
-
-extern const unsigned US_BLANK_JPEG_WIDTH;
-extern const unsigned US_BLANK_JPEG_HEIGHT;
-
-extern const size_t US_BLANK_JPEG_DATA_SIZE;
-extern const uint8_t US_BLANK_JPEG_DATA[];
+#define US_ERROR_COMMON		-1
+#define US_ERROR_NO_DEVICE	-2
+#define US_ERROR_NO_CABLE	-3
+#define US_ERROR_NO_SIGNAL	-4
+#define US_ERROR_NO_SYNC	-5
+#define US_ERROR_NO_LANES	-6
+#define US_ERROR_NO_DATA	-7

src/libs/fpsi.c

@@ -0,0 +1,109 @@
+/*****************************************************************************
+#                                                                            #
+#    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 <stdatomic.h>
+
+#include <pthread.h>
+
+#include "types.h"
+#include "tools.h"
+#include "threading.h"
+#include "logging.h"
+#include "frame.h"
+
+
+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;
+	atomic_init(&fpsi->state_ts, 0);
+	atomic_init(&fpsi->state, 0);
+	return fpsi;
+}
+
+void us_fpsi_destroy(us_fpsi_s *fpsi) {
+	free(fpsi->name);
+	free(fpsi);
+}
+
+void us_fpsi_frame_to_meta(const us_frame_s *frame, us_fpsi_meta_s *meta) {
+	meta->width = frame->width;
+	meta->height = frame->height;
+	meta->online = frame->online;
+}
+
+void us_fpsi_update(us_fpsi_s *fpsi, bool bump, const us_fpsi_meta_s *meta) {
+	if (meta != NULL) {
+		US_A(fpsi->with_meta);
+	} else {
+		US_A(!fpsi->with_meta);
+	}
+
+	const sll now_ts = us_floor_ms(us_get_now_monotonic());
+	if (atomic_load(&fpsi->state_ts) != now_ts) {
+		US_LOG_PERF_FPS("FPS: %s: %u", fpsi->name, fpsi->accum);
+
+		// Fast mutex-less store method
+		ull state = (ull)fpsi->accum & 0xFFFF;
+		if (fpsi->with_meta) {
+			US_A(meta != NULL);
+			state |= (ull)(meta->width & 0xFFFF) << 16;
+			state |= (ull)(meta->height & 0xFFFF) << 32;
+			state |= (ull)(meta->online ? 1 : 0) << 48;
+		}
+		atomic_store(&fpsi->state, state); // Сначала инфа
+		atomic_store(&fpsi->state_ts, now_ts); // Потом время, это важно
+		fpsi->accum = 0;
+	}
+	if (bump) {
+		++fpsi->accum;
+	}
+}
+
+uint us_fpsi_get(us_fpsi_s *fpsi, us_fpsi_meta_s *meta) {
+	if (meta != NULL) {
+		US_A(fpsi->with_meta);
+	}
+
+	// Между чтением инфы и времени может быть гонка,
+	// но это неважно. Если время свежее, до данные тоже
+	// будут свежмими, обратный случай не так важен.
+	const sll now_ts = us_floor_ms(us_get_now_monotonic());
+	const sll state_ts = atomic_load(&fpsi->state_ts); // Сначала время
+	const ull state = atomic_load(&fpsi->state); // Потом инфа
+
+	uint current = state & 0xFFFF;
+	if (fpsi->with_meta && meta != NULL) {
+		meta->width = (state >> 16) & 0xFFFF;
+		meta->height = (state >> 32) & 0xFFFF;
+		meta->online = (state >> 48) & 1;
+	}
+
+	if (state_ts != now_ts && (state_ts + 1) != now_ts) {
+		// Только текущая или прошлая секунда
+		current = 0;
+	}
+	return current;
+}

src/libs/fpsi.h

@@ -0,0 +1,51 @@
+/*****************************************************************************
+#                                                                            #
+#    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/>.  #
+#                                                                            #
+*****************************************************************************/
+
+
+#pragma once
+
+#include <stdatomic.h>
+
+#include "types.h"
+#include "frame.h"
+
+
+typedef struct {
+	uint	width;
+	uint	height;
+	bool	online;
+} us_fpsi_meta_s;
+
+typedef struct {
+	char			*name;
+	bool			with_meta;
+	uint			accum;
+	atomic_llong	state_ts;
+	atomic_ullong	state;
+} us_fpsi_s;
+
+
+us_fpsi_s *us_fpsi_init(const char *name, bool with_meta);
+void us_fpsi_destroy(us_fpsi_s *fpsi);
+
+void us_fpsi_frame_to_meta(const us_frame_s *frame, us_fpsi_meta_s *meta);
+void us_fpsi_update(us_fpsi_s *fpsi, bool bump, const us_fpsi_meta_s *meta);
+uint us_fpsi_get(us_fpsi_s *fpsi, us_fpsi_meta_s *meta);

src/libs/frame.c

@@ -2,7 +2,7 @@
 #                                                                            #
 #    uStreamer - Lightweight and fast MJPEG-HTTP streamer.                   #
 #                                                                            #
-#    Copyright (C) 2018-2023  Maxim Devaev <mdevaev@gmail.com>               #
+#    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    #
@@ -25,7 +25,6 @@
 #include <stddef.h>
 #include <stdlib.h>
 #include <string.h>
-#include <assert.h>
 
 #include <linux/videodev2.h>
 
@@ -36,7 +35,7 @@
 us_frame_s *us_frame_init(void) {
 	us_frame_s *frame;
 	US_CALLOC(frame, 1);
-	us_frame_realloc_data(frame, 512 * 1024);
+	us_frame_realloc_data(frame, 32 * 1024);
 	frame->dma_fd = -1;
 	return frame;
 }
@@ -74,7 +73,7 @@ void us_frame_copy(const us_frame_s *src, us_frame_s *dest) {
 bool us_frame_compare(const us_frame_s *a, const us_frame_s *b) {
 	return (
 		a->allocated && b->allocated
-		&& US_FRAME_COMPARE_META_USED_NOTS(a, b)
+		&& US_FRAME_COMPARE_GEOMETRY(a, b)
 		&& !memcmp(a->data, b->data, b->used)
 	);
 }
@@ -82,16 +81,32 @@ bool us_frame_compare(const us_frame_s *a, const us_frame_s *b) {
 uint us_frame_get_padding(const us_frame_s *frame) {
 	uint bytes_per_pixel = 0;
 	switch (frame->format) {
+		case V4L2_PIX_FMT_YUV420:
+		case V4L2_PIX_FMT_YVU420:
+		case V4L2_PIX_FMT_GREY:
+			bytes_per_pixel = 1;
+			break;
+
 		case V4L2_PIX_FMT_YUYV:
 		case V4L2_PIX_FMT_YVYU:
 		case V4L2_PIX_FMT_UYVY:
-		case V4L2_PIX_FMT_RGB565: bytes_per_pixel = 2; break;
+		case V4L2_PIX_FMT_RGB565:
+			bytes_per_pixel = 2;
+			break;
+
 		case V4L2_PIX_FMT_BGR24:
-		case V4L2_PIX_FMT_RGB24: bytes_per_pixel = 3; break;
+		case V4L2_PIX_FMT_RGB24:
+			bytes_per_pixel = 3;
+			break;
+
 		// case V4L2_PIX_FMT_H264:
 		case V4L2_PIX_FMT_MJPEG:
-		case V4L2_PIX_FMT_JPEG: bytes_per_pixel = 0; break;
-		default: assert(0 && "Unknown format");
+		case V4L2_PIX_FMT_JPEG:
+			bytes_per_pixel = 0;
+			break;
+
+		default:
+			US_RAISE("Unknown format");
 	}
 	if (bytes_per_pixel > 0 && frame->stride > frame->width) {
 		return (frame->stride - frame->width * bytes_per_pixel);
@@ -99,8 +114,12 @@ uint us_frame_get_padding(const us_frame_s *frame) {
 	return 0;
 }
 
+bool us_is_jpeg(uint format) {
+	return (format == V4L2_PIX_FMT_JPEG || format == V4L2_PIX_FMT_MJPEG);
+}
+
 const char *us_fourcc_to_string(uint format, char *buf, uz size) {
-	assert(size >= 8);
+	US_A(size >= 8);
 	buf[0] = format & 0x7F;
 	buf[1] = (format >> 8) & 0x7F;
 	buf[2] = (format >> 16) & 0x7F;

src/libs/frame.h

@@ -2,7 +2,7 @@
 #                                                                            #
 #    uStreamer - Lightweight and fast MJPEG-HTTP streamer.                   #
 #                                                                            #
-#    Copyright (C) 2018-2023  Maxim Devaev <mdevaev@gmail.com>               #
+#    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    #
@@ -22,68 +22,70 @@
 
 #pragma once
 
-#include <linux/videodev2.h>
-
 #include "types.h"
 #include "tools.h"
 
 
+#define US_FRAME_META_DECLARE \
+	uint	width; \
+	uint	height; \
+	uint	format; \
+	uint	stride; \
+	/* Stride is a bytesperline in V4L2 */ \
+	/* https://www.kernel.org/doc/html/v4.14/media/uapi/v4l/pixfmt-v4l2.html */ \
+	/* https://medium.com/@oleg.shipitko/what-does-stride-mean-in-image-processing-bba158a72bcd */ \
+	bool	online; \
+	bool	key; \
+	uint	gop; \
+	\
+	ldf		grab_begin_ts; \
+	ldf		grab_end_ts; \
+	ldf		encode_begin_ts; \
+	ldf		encode_end_ts;
+
+
 typedef struct {
 	u8		*data;
 	uz		used;
 	uz		allocated;
 	int		dma_fd;
 
-	uint	width;
-	uint	height;
-	uint	format;
-	uint	stride;
-	// Stride is a bytesperline in V4L2
-	// https://www.kernel.org/doc/html/v4.14/media/uapi/v4l/pixfmt-v4l2.html
-	// https://medium.com/@oleg.shipitko/what-does-stride-mean-in-image-processing-bba158a72bcd
-
-	bool	online;
-	bool	key;
-	uint	gop;
-
-	ldf		grab_ts;
-	ldf		encode_begin_ts;
-	ldf		encode_end_ts;
+	US_FRAME_META_DECLARE;
 } us_frame_s;
 
 
 #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->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)->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_begin_ts = (x_src)->grab_begin_ts; \
+		(x_dest)->grab_end_ts = (x_src)->grab_end_ts; \
+		(x_dest)->encode_begin_ts = (x_src)->encode_begin_ts; \
+		(x_dest)->encode_end_ts = (x_src)->encode_end_ts; \
 	}
 
-static inline void us_frame_copy_meta(const us_frame_s *src, us_frame_s *dest) {
-	US_FRAME_COPY_META(src, dest);
-}
-
-#define US_FRAME_COMPARE_META_USED_NOTS(x_a, x_b) ( \
-		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 \
+#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)->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 \
 	)
 
 
 static inline void us_frame_encoding_begin(const us_frame_s *src, us_frame_s *dest, uint format) {
-	assert(src->used > 0);
-	us_frame_copy_meta(src, dest);
+	US_A(src->used > 0);
+	US_FRAME_COPY_META(src, dest);
 	dest->encode_begin_ts = us_get_now_monotonic();
 	dest->format = format;
 	dest->stride = 0;
@@ -91,7 +93,7 @@ static inline void us_frame_encoding_begin(const us_frame_s *src, us_frame_s *de
 }
 
 static inline void us_frame_encoding_end(us_frame_s *dest) {
-	assert(dest->used > 0);
+	US_A(dest->used > 0);
 	dest->encode_end_ts = us_get_now_monotonic();
 }
 
@@ -108,8 +110,5 @@ bool us_frame_compare(const us_frame_s *a, const us_frame_s *b);
 
 uint us_frame_get_padding(const us_frame_s *frame);
 
+bool us_is_jpeg(uint format);
 const char *us_fourcc_to_string(uint format, char *buf, uz size);
-
-static inline bool us_is_jpeg(uint format) {
-	return (format == V4L2_PIX_FMT_JPEG || format == V4L2_PIX_FMT_MJPEG);
-}

src/libs/frametext.c

@@ -2,7 +2,7 @@
 #                                                                            #
 #    uStreamer - Lightweight and fast MJPEG-HTTP streamer.                   #
 #                                                                            #
-#    Copyright (C) 2018-2023  Maxim Devaev <mdevaev@gmail.com>               #
+#    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    #
@@ -20,7 +20,7 @@
 *****************************************************************************/
 
 
-#include "ftext.h"
+#include "frametext.h"
 
 #include <string.h>
 
@@ -28,32 +28,65 @@
 
 #include <linux/videodev2.h>
 
-#include "../libs/tools.h"
-#include "../libs/frame.h"
-
-#include "ftext_font.h"
+#include "tools.h"
+#include "frame.h"
+#include "frametext_font.h"
 
 
-static void _ftext_draw_line(
-	us_ftext_s *ft, const char *line,
-	uint scale_x, uint scale_y,
-	uint start_x, uint start_y);
+static void _frametext_draw_line(
+	us_frametext_s *ft,
+	const char *line,
+	uint scale_x,
+	uint scale_y,
+	uint start_x,
+	uint start_y);
 
 
-us_ftext_s *us_ftext_init(void) {
-	us_ftext_s *ft;
+us_frametext_s *us_frametext_init(void) {
+	us_frametext_s *ft;
 	US_CALLOC(ft, 1);
 	ft->frame = us_frame_init();
 	return ft;
 }
 
-void us_ftext_destroy(us_ftext_s *ft) {
+void us_frametext_destroy(us_frametext_s *ft) {
 	us_frame_destroy(ft->frame);
 	US_DELETE(ft->text, free);
 	free(ft);
 }
 
-void us_ftext_draw(us_ftext_s *ft, const char *text, uint width, uint height) {
+/*
+Every character in the font is encoded row-wise in 8 bytes.
+The least significant bit of each byte corresponds to the first pixel in a row. 
+The character 'A' (0x41 / 65) is encoded as { 0x0C, 0x1E, 0x33, 0x33, 0x3F, 0x33, 0x33, 0x00}
+
+    0x0C => 0000 1100 => ..XX....
+    0X1E => 0001 1110 => .XXXX...
+    0x33 => 0011 0011 => XX..XX..
+    0x33 => 0011 0011 => XX..XX..
+    0x3F => 0011 1111 => xxxxxx..
+    0x33 => 0011 0011 => XX..XX..
+    0x33 => 0011 0011 => XX..XX..
+    0x00 => 0000 0000 => ........
+
+To access the nth pixel in a row, right-shift by n.
+
+                         . . X X . . . .
+                         | | | | | | | |
+    (0x0C >> 0) & 1 == 0-+ | | | | | | |
+    (0x0C >> 1) & 1 == 0---+ | | | | | |
+    (0x0C >> 2) & 1 == 1-----+ | | | | |
+    (0x0C >> 3) & 1 == 1-------+ | | | |
+    (0x0C >> 4) & 1 == 0---------+ | | |
+    (0x0C >> 5) & 1 == 0-----------+ | |
+    (0x0C >> 6) & 1 == 0-------------+ |
+    (0x0C >> 7) & 1 == 0---------------+
+*/
+
+void us_frametext_draw(us_frametext_s *ft, const char *text, uint width, uint height) {
+	US_A(width > 0);
+	US_A(height > 0);
+
 	us_frame_s *const frame = ft->frame;
 
 	if (
@@ -91,9 +124,16 @@ void us_ftext_draw(us_ftext_s *ft, const char *text, uint width, uint height) {
 	if (block_width == 0 || block_height == 0) {
 		goto empty;
 	}
-	uint scale_x = frame->width / block_width / 2;
-	uint scale_y = frame->height / block_height / 3;
-	if (scale_x < scale_y / 1.5) {
+
+	// Ширина текста должна быть от 75%, до половины экрана, в зависимости от длины
+	const float div_x = US_MAX(US_MIN((100 / block_width * 2), 2.0), 1.5);
+
+	// Высоту тоже отрегулировать как-нибудь
+	const float div_y = US_MAX(US_MIN((70 / block_height * 2), 2.0), 1.5);
+
+	uint scale_x = frame->width / block_width / div_x;
+	uint scale_y = frame->height / block_height / div_y;
+	if (scale_x < scale_y / 1.5) { // Keep proportions
 		scale_y = scale_x * 1.5;
 	} else if (scale_y < scale_x * 1.5) {
 		scale_x = scale_y / 1.5;
@@ -110,7 +150,7 @@ void us_ftext_draw(us_ftext_s *ft, const char *text, uint width, uint height) {
 		const uint start_x = (frame->width >= line_width
 			? ((frame->width - line_width) / 2)
 			: 0);
-		_ftext_draw_line(ft, line, scale_x, scale_y, start_x, start_y + n_line * 8 * scale_y);
+		_frametext_draw_line(ft, line, scale_x, scale_y, start_x, start_y + n_line * 8 * scale_y);
 		++n_line;
 	}
 
@@ -118,11 +158,14 @@ empty:
 	free(str);
 }
 
-void _ftext_draw_line(
-	us_ftext_s *ft, const char *line,
-	uint scale_x, uint scale_y,
-	uint start_x, uint start_y) {
-
+void _frametext_draw_line(
+	us_frametext_s *ft,
+	const char *line,
+	uint scale_x,
+	uint scale_y,
+	uint start_x,
+	uint start_y
+) {
 	us_frame_s *const frame = ft->frame;
 
 	const size_t len = strlen(line);
@@ -139,16 +182,16 @@ void _ftext_draw_line(
 				break;
 			}
 
-			const u8 ch = US_MIN((u8)line[ch_x / 8 / scale_x], sizeof(US_FTEXT_FONT) / 8 - 1);
+			const u8 ch = US_MIN((u8)line[ch_x / 8 / scale_x], sizeof(US_FRAMETEXT_FONT) / 8 - 1);
 			const uint ch_byte = (ch_y / scale_y) % 8;
 			const uint ch_bit = (ch_x / scale_x) % 8;
-			const bool pix_on = !!(US_FTEXT_FONT[ch][ch_byte] & (1 << ch_bit));
+			const bool pix_on = !!(US_FRAMETEXT_FONT[ch][ch_byte] & (1 << ch_bit));
 
-			u8 *const b = &frame->data[offset]; // XXX: Big endian for Raspberry
-			u8 *const g = b + 1;
-			u8 *const r = g + 1;
+			u8 *const r = &frame->data[offset];
+			u8 *const g = r + 1;
+			u8 *const b = r + 2;
 
-			*r = pix_on * 0x51;
+			*r = pix_on * 0x65; // RGB/BGR-friendly
 			*g = pix_on * 0x65;
 			*b = pix_on * 0x65;
 		}

src/libs/frametext.h

@@ -2,7 +2,7 @@
 #                                                                            #
 #    uStreamer - Lightweight and fast MJPEG-HTTP streamer.                   #
 #                                                                            #
-#    Copyright (C) 2018-2023  Maxim Devaev <mdevaev@gmail.com>               #
+#    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    #
@@ -23,17 +23,17 @@
 #pragma once
 
 
-#include "../libs/types.h"
-#include "../libs/frame.h"
+#include "types.h"
+#include "frame.h"
 
 
 typedef struct {
 	char		*text;
 	us_frame_s	*frame;
-} us_ftext_s;
+} us_frametext_s;
 
 
-us_ftext_s *us_ftext_init(void);
-void us_ftext_destroy(us_ftext_s *ft);
+us_frametext_s *us_frametext_init(void);
+void us_frametext_destroy(us_frametext_s *ft);
 
-void us_ftext_draw(us_ftext_s *ft, const char *text, uint width, uint height);
+void us_frametext_draw(us_frametext_s *ft, const char *text, uint width, uint height);

src/libs/frametext_font.c

@@ -2,7 +2,7 @@
 #                                                                            #
 #    uStreamer - Lightweight and fast MJPEG-HTTP streamer.                   #
 #                                                                            #
-#    Copyright (C) 2018-2023  Maxim Devaev <mdevaev@gmail.com>               #
+#    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    #
@@ -20,11 +20,15 @@
 *****************************************************************************/
 
 
-#include "ftext_font.h"
+#include "frametext_font.h"
+
+#include "types.h"
 
 
-const u8 US_FTEXT_FONT[128][8] = {
+const u8 US_FRAMETEXT_FONT[128][8] = {
 	// https://github.com/dhepper/font8x8/blob/master/font8x8_basic.h
+	// Author: Daniel Hepper <daniel@hepper.net>
+	// License: Public Domain
 	{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, // U+0000 (nul)
 	{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, // U+0001
 	{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, // U+0002

src/libs/frametext_font.h

@@ -2,7 +2,7 @@
 #                                                                            #
 #    uStreamer - Lightweight and fast MJPEG-HTTP streamer.                   #
 #                                                                            #
-#    Copyright (C) 2018-2023  Maxim Devaev <mdevaev@gmail.com>               #
+#    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    #
@@ -22,7 +22,7 @@
 
 #pragma once
 
-#include "../libs/types.h"
+#include "types.h"
 
 
-extern const u8 US_FTEXT_FONT[128][8];
+extern const u8 US_FRAMETEXT_FONT[128][8];

src/libs/list.h

@@ -2,7 +2,7 @@
 #                                                                            #
 #    uStreamer - Lightweight and fast MJPEG-HTTP streamer.                   #
 #                                                                            #
-#    Copyright (C) 2018-2023  Maxim Devaev <mdevaev@gmail.com>               #
+#    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    #
@@ -22,12 +22,12 @@
 
 #pragma once
 
-#include <assert.h>
+#include "tools.h"
 
 
-#define US_LIST_STRUCT(...) \
-	__VA_ARGS__ *prev; \
-	__VA_ARGS__ *next;
+#define US_LIST_DECLARE \
+	void *prev; \
+	void *next;
 
 #define US_LIST_ITERATE(x_first, x_item, ...) { \
 		for (__typeof__(x_first) x_item = x_first; x_item;) { \
@@ -42,10 +42,11 @@
 			x_first = x_item; \
 		} else { \
 			__typeof__(x_first) m_last = x_first; \
-			for (; m_last->next; m_last = m_last->next); \
+			for (; m_last->next != NULL; m_last = m_last->next); \
 			x_item->prev = m_last; \
 			m_last->next = x_item; \
 		} \
+		x_item->next = NULL; \
 	}
 
 #define US_LIST_APPEND_C(x_first, x_item, x_count) { \
@@ -57,15 +58,19 @@
 		if (x_item->prev == NULL) { \
 			x_first = x_item->next; \
 		} else { \
-			x_item->prev->next = x_item->next; \
+			__typeof__(x_first) m_prev = x_item->prev; \
+			m_prev->next = x_item->next; \
 		} \
 		if (x_item->next != NULL) { \
-			x_item->next->prev = x_item->prev; \
+			__typeof__(x_first) m_next = x_item->next; \
+			m_next->prev = x_item->prev; \
 		} \
+		x_item->prev = NULL; \
+		x_item->next = NULL; \
 	}
 
 #define US_LIST_REMOVE_C(x_first, x_item, x_count) { \
 		US_LIST_REMOVE(x_first, x_item); \
-		assert((x_count) >= 1); \
+		US_A((x_count) >= 1); \
 		--(x_count); \
 	}

src/libs/logging.c

@@ -2,7 +2,7 @@
 #                                                                            #
 #    uStreamer - Lightweight and fast MJPEG-HTTP streamer.                   #
 #                                                                            #
-#    Copyright (C) 2018-2023  Maxim Devaev <mdevaev@gmail.com>               #
+#    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    #

src/libs/logging.h

@@ -2,7 +2,7 @@
 #                                                                            #
 #    uStreamer - Lightweight and fast MJPEG-HTTP streamer.                   #
 #                                                                            #
-#    Copyright (C) 2018-2023  Maxim Devaev <mdevaev@gmail.com>               #
+#    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    #
@@ -28,7 +28,6 @@
 #include <unistd.h>
 #include <errno.h>
 #include <time.h>
-#include <assert.h>
 
 #include <pthread.h>
 
@@ -75,7 +74,7 @@ extern pthread_mutex_t us_g_log_mutex;
 
 #define US_SEP_INFO(x_ch) { \
 		US_LOGGING_LOCK; \
-		for (int m_count = 0; m_count < 80; ++m_count) { \
+		for (int m_i = 0; m_i < 80; ++m_i) { \
 			fputc((x_ch), stderr); \
 		} \
 		fputc('\n', stderr); \

src/libs/memsink.c

@@ -2,7 +2,7 @@
 #                                                                            #
 #    uStreamer - Lightweight and fast MJPEG-HTTP streamer.                   #
 #                                                                            #
-#    Copyright (C) 2018-2023  Maxim Devaev <mdevaev@gmail.com>               #
+#    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    #
@@ -26,20 +26,20 @@
 #include <string.h>
 #include <fcntl.h>
 #include <errno.h>
-#include <assert.h>
 
 #include <sys/file.h>
 #include <sys/stat.h>
 #include <sys/mman.h>
 
 #include "types.h"
+#include "errors.h"
 #include "tools.h"
 #include "logging.h"
 #include "frame.h"
 #include "memsinksh.h"
 
 
-us_memsink_s *us_memsink_init(
+us_memsink_s *us_memsink_init_opened(
 	const char *name, const char *obj, bool server,
 	mode_t mode, bool rm, uint client_ttl, uint timeout) {
 
@@ -56,6 +56,11 @@ us_memsink_s *us_memsink_init(
 
 	US_LOG_INFO("Using %s-sink: %s", name, obj);
 
+	if ((sink->data_size = us_memsink_calculate_size(obj)) == 0) {
+		US_LOG_ERROR("%s-sink: Invalid object suffix", name);
+		goto error;
+	}
+
 	const mode_t mask = umask(0);
 	sink->fd = shm_open(sink->obj, (server ? O_RDWR | O_CREAT : O_RDWR), mode);
 	umask(mask);
@@ -65,12 +70,12 @@ us_memsink_s *us_memsink_init(
 		goto error;
 	}
 
-	if (sink->server && ftruncate(sink->fd, sizeof(us_memsink_shared_s)) < 0) {
+	if (sink->server && ftruncate(sink->fd, sizeof(us_memsink_shared_s) + sink->data_size) < 0) {
 		US_LOG_PERROR("%s-sink: Can't truncate shared memory", name);
 		goto error;
 	}
 
-	if ((sink->mem = us_memsink_shared_map(sink->fd)) == NULL) {
+	if ((sink->mem = us_memsink_shared_map(sink->fd, sink->data_size)) == NULL) {
 		US_LOG_PERROR("%s-sink: Can't mmap shared memory", name);
 		goto error;
 	}
@@ -83,7 +88,7 @@ error:
 
 void us_memsink_destroy(us_memsink_s *sink) {
 	if (sink->mem != NULL) {
-		if (us_memsink_shared_unmap(sink->mem) < 0) {
+		if (us_memsink_shared_unmap(sink->mem, sink->data_size) < 0) {
 			US_LOG_PERROR("%s-sink: Can't unmap shared memory", sink->name);
 		}
 	}
@@ -101,16 +106,35 @@ void us_memsink_destroy(us_memsink_s *sink) {
 }
 
 bool us_memsink_server_check(us_memsink_s *sink, const us_frame_s *frame) {
-	// Return true (the need to write to memsink) on any of these conditions:
-	//   - EWOULDBLOCK - we have an active client;
-	//   - Incorrect magic or version - need to first write;
-	//   - We have some active clients by last_client_ts;
-	//   - Frame meta differs (like size, format, but not timestamp).
+	// Если frame == NULL, то только проверяем наличие клиентов
+	// или необходимость инициализировать память.
 
-	assert(sink->server);
+	US_A(sink->server);
+
+	if (sink->mem->magic != US_MEMSINK_MAGIC || sink->mem->version != US_MEMSINK_VERSION) {
+		// Если регион памяти не был инициализирован, то нужно что-то туда положить.
+		// Блокировка не нужна, потому что только сервер пишет в эти переменные.
+		return true;
+	}
+
+	const ldf unsafe_ts = sink->mem->last_client_ts;
+	if (unsafe_ts != sink->unsafe_last_client_ts) {
+		// Клиент пишет в синке свою отметку last_client_ts при любом действии.
+		// Мы не берем блокировку здесь, а просто проверяем, является ли это число тем же самым,
+		// что было прочитано нами в предыдущих итерациях. Значению не нужно быть консистентным,
+		// и даже если мы прочитали мусор из-за гонки в памяти между чтением здеси и записью
+		// из клиента, мы все равно можем сделать вывод, есть ли у нас клиенты вообще.
+		// Если число число поменялось то у нас точно есть клиенты и дальнейшие проверки
+		// проводить не требуется. Если же число неизменно, то стоит поставить блокировку
+		// и проверить, нужно ли записать что-нибудь в память для инициализации фрейма.
+		sink->unsafe_last_client_ts = unsafe_ts;
+		atomic_store(&sink->has_clients, true);
+		return true;
+	}
 
 	if (flock(sink->fd, LOCK_EX | LOCK_NB) < 0) {
 		if (errno == EWOULDBLOCK) {
+			// Есть живой клиент, который прямо сейчас взял блокировку и читает фрейм из синка
 			atomic_store(&sink->has_clients, true);
 			return true;
 		}
@@ -118,10 +142,7 @@ bool us_memsink_server_check(us_memsink_s *sink, const us_frame_s *frame) {
 		return false;
 	}
 
-	if (sink->mem->magic != US_MEMSINK_MAGIC || sink->mem->version != US_MEMSINK_VERSION) {
-		return true;
-	}
-
+	// Проверяем, есть ли у нас живой клиент по таймауту
 	const bool has_clients = (sink->mem->last_client_ts + sink->client_ttl > us_get_now_monotonic());
 	atomic_store(&sink->has_clients, has_clients);
 
@@ -129,31 +150,39 @@ bool us_memsink_server_check(us_memsink_s *sink, const us_frame_s *frame) {
 		US_LOG_PERROR("%s-sink: Can't unlock memory", sink->name);
 		return false;
 	}
-	return (has_clients || !US_FRAME_COMPARE_META_USED_NOTS(sink->mem, frame));;
+	if (has_clients) {
+		return true;
+	}
+	if (frame != NULL && !US_FRAME_COMPARE_GEOMETRY(sink->mem, frame)) {
+		// Если есть изменения в геометрии/формате фрейма, то их тоже нобходимо сразу записать в синк
+		return true;
+	}
+	return false;
 }
 
 int us_memsink_server_put(us_memsink_s *sink, const us_frame_s *frame, bool *key_requested) {
-	assert(sink->server);
+	US_A(sink->server);
 
-	const long double now = us_get_now_monotonic();
+	const ldf now = us_get_now_monotonic();
 
-	if (frame->used > US_MEMSINK_MAX_DATA) {
+	if (frame->used > sink->data_size) {
 		US_LOG_ERROR("%s-sink: Can't put frame: is too big (%zu > %zu)",
-			sink->name, frame->used, US_MEMSINK_MAX_DATA);
-		return 0; // -2
+			sink->name, frame->used, sink->data_size);
+		return 0;
 	}
 
 	if (us_flock_timedwait_monotonic(sink->fd, 1) == 0) {
 		US_LOG_VERBOSE("%s-sink: >>>>> Exposing new frame ...", sink->name);
 
-		sink->last_id = us_get_now_id();
-		sink->mem->id = sink->last_id;
+		sink->mem->id = us_get_now_id();
 		if (sink->mem->key_requested && frame->key) {
 			sink->mem->key_requested = false;
 		}
-		*key_requested = sink->mem->key_requested;
+		if (key_requested != NULL) { // We don't need it for non-H264 sinks
+			*key_requested = sink->mem->key_requested;
+		}
 
-		memcpy(sink->mem->data, frame->data, frame->used);
+		memcpy(us_memsink_get_data(sink->mem), frame->data, frame->used);
 		sink->mem->used = frame->used;
 		US_FRAME_COPY_META(frame, sink->mem);
 
@@ -179,37 +208,46 @@ int us_memsink_server_put(us_memsink_s *sink, const us_frame_s *frame, bool *key
 	return 0;
 }
 
-int us_memsink_client_get(us_memsink_s *sink, us_frame_s *frame, bool *key_requested, bool key_required) { // cppcheck-suppress unusedFunction
-	assert(!sink->server); // Client only
+int us_memsink_client_get(us_memsink_s *sink, us_frame_s *frame, bool *key_requested, bool key_required) {
+	US_A(!sink->server); // Client only
 
 	if (us_flock_timedwait_monotonic(sink->fd, sink->timeout) < 0) {
 		if (errno == EWOULDBLOCK) {
-			return -2;
+			return US_ERROR_NO_DATA;
 		}
 		US_LOG_PERROR("%s-sink: Can't lock memory", sink->name);
 		return -1;
 	}
 
-	int retval = -2; // Not updated
+	int retval = 0;
 
-	if (sink->mem->magic == US_MEMSINK_MAGIC) {
-		if (sink->mem->version != US_MEMSINK_VERSION) {
-			US_LOG_ERROR("%s-sink: Protocol version mismatch: sink=%u, required=%u",
-				sink->name, sink->mem->version, US_MEMSINK_VERSION);
-			retval = -1;
-			goto done;
-		}
-		if (sink->mem->id != sink->last_id) { // When updated
-			sink->last_id = sink->mem->id;
-			us_frame_set_data(frame, sink->mem->data, sink->mem->used);
-			US_FRAME_COPY_META(sink->mem, frame);
-			*key_requested = sink->mem->key_requested;
-			retval = 0;
-		}
-		sink->mem->last_client_ts = us_get_now_monotonic();
-		if (key_required) {
-			sink->mem->key_requested = true;
-		}
+	if (sink->mem->magic != US_MEMSINK_MAGIC) {
+		retval = US_ERROR_NO_DATA; // Not updated
+		goto done;
+	}
+	if (sink->mem->version != US_MEMSINK_VERSION) {
+		US_LOG_ERROR("%s-sink: Protocol version mismatch: sink=%u, required=%u",
+			sink->name, sink->mem->version, US_MEMSINK_VERSION);
+		retval = -1;
+		goto done;
+	}
+
+	// Let the sink know that the client is alive
+	sink->mem->last_client_ts = us_get_now_monotonic();
+
+	if (sink->mem->id == sink->last_readed_id) {
+		retval = US_ERROR_NO_DATA; // Not updated
+		goto done;
+	}
+
+	sink->last_readed_id = sink->mem->id;
+	us_frame_set_data(frame, us_memsink_get_data(sink->mem), sink->mem->used);
+	US_FRAME_COPY_META(sink->mem, frame);
+	if (key_requested != NULL) { // We don't need it for non-H264 sinks
+		*key_requested = sink->mem->key_requested;
+	}
+	if (key_required) {
+		sink->mem->key_requested = true;
 	}
 
 done:

src/libs/memsink.h

@@ -2,7 +2,7 @@
 #                                                                            #
 #    uStreamer - Lightweight and fast MJPEG-HTTP streamer.                   #
 #                                                                            #
-#    Copyright (C) 2018-2023  Maxim Devaev <mdevaev@gmail.com>               #
+#    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    #
@@ -34,6 +34,7 @@
 typedef struct {
 	const char	*name;
 	const char	*obj;
+	uz			data_size;
 	bool		server;
 	bool		rm;
 	uint		client_ttl; // Only for server
@@ -41,12 +42,15 @@ typedef struct {
 
 	int					fd;
 	us_memsink_shared_s	*mem;
-	u64					last_id;
-	atomic_bool			has_clients; // Only for server
+
+	u64			last_readed_id; // Only for client
+
+	atomic_bool	has_clients; // Only for server results
+	ldf			unsafe_last_client_ts; // Only for server
 } us_memsink_s;
 
 
-us_memsink_s *us_memsink_init(
+us_memsink_s *us_memsink_init_opened(
 	const char *name, const char *obj, bool server,
 	mode_t mode, bool rm, uint client_ttl, uint timeout);
 

src/libs/memsinksh.c

@@ -2,7 +2,7 @@
 #                                                                            #
 #    uStreamer - Lightweight and fast MJPEG-HTTP streamer.                   #
 #                                                                            #
-#    Copyright (C) 2018-2023  Maxim Devaev <mdevaev@gmail.com>               #
+#    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    #
@@ -20,38 +20,53 @@
 *****************************************************************************/
 
 
-#include "bev.h"
+#include "memsinksh.h"
+
+#include <string.h>
+#include <strings.h>
+
+#include <sys/mman.h>
+
+#include "types.h"
+#include "tools.h"
 
 
-char *us_bufferevent_format_reason(short what) {
-	char *reason;
-	US_CALLOC(reason, 2048);
-
-	// evutil_socket_error_to_string() is not thread-safe
-	char *const perror_str = us_errno_to_string(EVUTIL_SOCKET_ERROR());
-	bool first = true;
-
-	strncat(reason, perror_str, 1023);
-	free(perror_str);
-	strcat(reason, " (");
-#	define FILL_REASON(x_bev, x_name) { \
-			if (what & x_bev) { \
-				if (first) { \
-					first = false; \
-				} else { \
-					strcat(reason, ","); \
-				} \
-				strcat(reason, x_name); \
-			} \
-		}
-
-	FILL_REASON(BEV_EVENT_READING, "reading");
-	FILL_REASON(BEV_EVENT_WRITING, "writing");
-	FILL_REASON(BEV_EVENT_ERROR, "error");
-	FILL_REASON(BEV_EVENT_TIMEOUT, "timeout");
-	FILL_REASON(BEV_EVENT_EOF, "eof"); // cppcheck-suppress unreadVariable
-#	undef FILL_REASON
-
-	strcat(reason, ")");
-	return reason;
+us_memsink_shared_s *us_memsink_shared_map(int fd, uz data_size) {
+	us_memsink_shared_s *mem = mmap(
+		NULL,
+		sizeof(us_memsink_shared_s) + data_size,
+		PROT_READ | PROT_WRITE, MAP_SHARED,
+		fd, 0);
+	if (mem == MAP_FAILED) {
+		return NULL;
+	}
+	US_A(mem != NULL);
+	return mem;
+}
+
+int us_memsink_shared_unmap(us_memsink_shared_s *mem, uz data_size) {
+	US_A(mem != NULL);
+	return munmap(mem, sizeof(us_memsink_shared_s) + data_size);
+}
+
+uz us_memsink_calculate_size(const char *obj) {
+	const char *ptr = strrchr(obj, ':');
+	if (ptr == NULL) {
+		ptr = strrchr(obj, '.');
+	}
+	if (ptr != NULL) {
+		ptr += 1;
+		if (!strcasecmp(ptr, "jpeg")) {
+			return 4 * 1024 * 1024;
+		} else if (!strcasecmp(ptr, "h264")) {
+			return 2 * 1024 * 1024;
+		} else if (!strcasecmp(ptr, "raw")) {
+			return 1920 * 1200 * 3; // RGB
+		}
+	}
+	return 0;
+}
+
+u8 *us_memsink_get_data(us_memsink_shared_s *mem) {
+	return (u8*)(mem) + sizeof(us_memsink_shared_s);
 }

src/libs/memsinksh.h

@@ -2,7 +2,7 @@
 #                                                                            #
 #    uStreamer - Lightweight and fast MJPEG-HTTP streamer.                   #
 #                                                                            #
-#    Copyright (C) 2018-2023  Maxim Devaev <mdevaev@gmail.com>               #
+#    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    #
@@ -22,63 +22,29 @@
 
 #pragma once
 
-#include <sys/mman.h>
-
 #include "types.h"
+#include "frame.h"
 
 
 #define US_MEMSINK_MAGIC	((u64)0xCAFEBABECAFEBABE)
-#define US_MEMSINK_VERSION	((u32)4)
-
-#ifndef US_CFG_MEMSINK_MAX_DATA
-#	define US_CFG_MEMSINK_MAX_DATA 33554432
-#endif
-#define US_MEMSINK_MAX_DATA ((uz)(US_CFG_MEMSINK_MAX_DATA))
+#define US_MEMSINK_VERSION	((u32)7)
 
 
 typedef struct {
 	u64		magic;
 	u32		version;
-
 	u64		id;
-
 	uz		used;
-	uint	width;
-	uint	height;
-	uint	format;
-	uint	stride;
-	bool	online;
-	bool	key;
-	uint	gop;
-
-	ldf		grab_ts;
-	ldf		encode_begin_ts;
-	ldf		encode_end_ts;
 
 	ldf		last_client_ts;
 	bool	key_requested;
 
-	u8		data[US_MEMSINK_MAX_DATA];
+	US_FRAME_META_DECLARE;
 } us_memsink_shared_s;
 
 
-INLINE us_memsink_shared_s *us_memsink_shared_map(int fd) {
-	us_memsink_shared_s *mem = mmap(
-		NULL,
-		sizeof(us_memsink_shared_s),
-		PROT_READ | PROT_WRITE,
-		MAP_SHARED,
-		fd,
-		0
-	);
-	if (mem == MAP_FAILED) {
-		return NULL;
-	}
-	assert(mem != NULL);
-	return mem;
-}
+us_memsink_shared_s *us_memsink_shared_map(int fd, uz data_size);
+int us_memsink_shared_unmap(us_memsink_shared_s *mem, uz data_size);
 
-INLINE int us_memsink_shared_unmap(us_memsink_shared_s *mem) {
-	assert(mem != NULL);
-	return munmap(mem, sizeof(us_memsink_shared_s));
-}
+uz us_memsink_calculate_size(const char *obj);
+u8 *us_memsink_get_data(us_memsink_shared_s *mem);

src/libs/options.c

@@ -2,7 +2,7 @@
 #                                                                            #
 #    uStreamer - Lightweight and fast MJPEG-HTTP streamer.                   #
 #                                                                            #
-#    Copyright (C) 2018-2023  Maxim Devaev <mdevaev@gmail.com>               #
+#    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    #
@@ -25,21 +25,21 @@
 #include <string.h>
 #include <ctype.h>
 #include <getopt.h>
-#include <assert.h>
 
 #include "types.h"
+#include "tools.h"
 
 
 void us_build_short_options(const struct option opts[], char *short_opts, uz size) {
 	memset(short_opts, 0, size);
-    for (uint short_index = 0, opt_index = 0; opts[opt_index].name != NULL; ++opt_index) {
-		assert(short_index < size - 3);
-        if (isalpha(opts[opt_index].val)) {
-            short_opts[short_index] = opts[opt_index].val;
-            ++short_index;
-            if (opts[opt_index].has_arg == required_argument) {
-                short_opts[short_index] = ':';
-                ++short_index;
+    for (uint short_i = 0, opt_i = 0; opts[opt_i].name != NULL; ++opt_i) {
+		US_A(short_i < size - 3);
+        if (isalpha(opts[opt_i].val)) {
+            short_opts[short_i] = opts[opt_i].val;
+            ++short_i;
+            if (opts[opt_i].has_arg == required_argument) {
+                short_opts[short_i] = ':';
+                ++short_i;
             }
         }
     }

src/libs/options.h

@@ -2,7 +2,7 @@
 #                                                                            #
 #    uStreamer - Lightweight and fast MJPEG-HTTP streamer.                   #
 #                                                                            #
-#    Copyright (C) 2018-2023  Maxim Devaev <mdevaev@gmail.com>               #
+#    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    #

src/libs/process.h

@@ -2,7 +2,7 @@
 #                                                                            #
 #    uStreamer - Lightweight and fast MJPEG-HTTP streamer.                   #
 #                                                                            #
-#    Copyright (C) 2018-2023  Maxim Devaev <mdevaev@gmail.com>               #
+#    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    #
@@ -25,14 +25,8 @@
 #include <signal.h>
 #include <unistd.h>
 
-
-#if defined(__linux__)
-#	define HAS_PDEATHSIG
-#elif defined(__FreeBSD__)
+#if defined(__FreeBSD__)
 #	include <sys/param.h>
-#	if __FreeBSD_version >= 1102000
-#		define HAS_PDEATHSIG
-#	endif
 #endif
 
 
@@ -49,20 +43,22 @@
 #		error setproctitle() not implemented, you can disable it using WITH_SETPROCTITLE=0
 #	endif
 #endif
-#ifdef HAS_PDEATHSIG
+
+#ifdef WITH_PDEATHSIG
 #	if defined(__linux__)
 #		include <sys/prctl.h>
-#	elif defined(__FreeBSD__)
+#	elif defined(__FreeBSD__) && (__FreeBSD_version >= 1102000)
 #		include <sys/procctl.h>
+#	else
+#		error WITH_PDEATHSIG is not supported on your system
 #	endif
 #endif
+
 #include "types.h"
 #ifdef WITH_SETPROCTITLE
 #	include "tools.h"
 #endif
-#ifdef HAS_PDEATHSIG
-#	include "logging.h"
-#endif
+#include "logging.h"
 
 
 #ifdef WITH_SETPROCTITLE
@@ -70,18 +66,18 @@ extern char **environ;
 #endif
 
 
-#ifdef HAS_PDEATHSIG
+#ifdef WITH_PDEATHSIG
 INLINE int us_process_track_parent_death(void) {
 	const pid_t parent = getppid();
 	int signum = SIGTERM;
 #	if defined(__linux__)
-	const int retval = prctl(PR_SET_PDEATHSIG, signum);
+	const int result = prctl(PR_SET_PDEATHSIG, signum);
 #	elif defined(__FreeBSD__)
-	const int retval = procctl(P_PID, 0, PROC_PDEATHSIG_CTL, &signum);
+	const int result = procctl(P_PID, 0, PROC_PDEATHSIG_CTL, &signum);
 #	else
 #		error WTF?
 #	endif
-	if (retval < 0) {
+	if (result < 0) {
 		US_LOG_PERROR("Can't set to receive SIGTERM on parent process death");
 		return -1;
 	}
@@ -107,15 +103,15 @@ INLINE void us_process_set_name_prefix(int argc, char *argv[], const char *prefi
 	US_REALLOC(cmdline, allocated);
 	cmdline[0] = '\0';
 
-	for (int index = 0; index < argc; ++index) {
-		uz arg_len = strlen(argv[index]);
+	for (int i = 0; i < argc; ++i) {
+		uz arg_len = strlen(argv[i]);
 		if (used + arg_len + 16 >= allocated) {
 			allocated += arg_len + 2048;
 			US_REALLOC(cmdline, allocated); // cppcheck-suppress memleakOnRealloc // False-positive (ok with assert)
 		}
 
 		strcat(cmdline, " ");
-		strcat(cmdline, argv[index]);
+		strcat(cmdline, argv[i]);
 		used = strlen(cmdline); // Не считаем вручную, так надежнее
 	}
 

src/libs/queue.c

@@ -2,7 +2,7 @@
 #                                                                            #
 #    uStreamer - Lightweight and fast MJPEG-HTTP streamer.                   #
 #                                                                            #
-#    Copyright (C) 2018-2023  Maxim Devaev <mdevaev@gmail.com>               #
+#    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    #
@@ -24,89 +24,88 @@
 
 #include <errno.h>
 #include <time.h>
-#include <assert.h>
 
 #include <pthread.h>
 
-#include "uslibs/types.h"
-#include "uslibs/tools.h"
-#include "uslibs/threading.h"
+#include "types.h"
+#include "tools.h"
+#include "threading.h"
 
 
 us_queue_s *us_queue_init(uint capacity) {
-	us_queue_s *queue;
-	US_CALLOC(queue, 1);
-	US_CALLOC(queue->items, capacity);
-	queue->capacity = capacity;
-	US_MUTEX_INIT(queue->mutex);
+	us_queue_s *q;
+	US_CALLOC(q, 1);
+	US_CALLOC(q->items, capacity);
+	q->capacity = capacity;
+	US_MUTEX_INIT(q->mutex);
 
 	pthread_condattr_t attrs;
-	assert(!pthread_condattr_init(&attrs));
-	assert(!pthread_condattr_setclock(&attrs, CLOCK_MONOTONIC));
-	assert(!pthread_cond_init(&queue->full_cond, &attrs));
-	assert(!pthread_cond_init(&queue->empty_cond, &attrs));
-	assert(!pthread_condattr_destroy(&attrs));
-	return queue;
+	US_A(!pthread_condattr_init(&attrs));
+	US_A(!pthread_condattr_setclock(&attrs, CLOCK_MONOTONIC));
+	US_A(!pthread_cond_init(&q->full_cond, &attrs));
+	US_A(!pthread_cond_init(&q->empty_cond, &attrs));
+	US_A(!pthread_condattr_destroy(&attrs));
+	return q;
 }
 
-void us_queue_destroy(us_queue_s *queue) {
-	US_COND_DESTROY(queue->empty_cond);
-	US_COND_DESTROY(queue->full_cond);
-	US_MUTEX_DESTROY(queue->mutex);
-	free(queue->items);
-	free(queue);
+void us_queue_destroy(us_queue_s *q) {
+	US_COND_DESTROY(q->empty_cond);
+	US_COND_DESTROY(q->full_cond);
+	US_MUTEX_DESTROY(q->mutex);
+	free(q->items);
+	free(q);
 }
 
 #define _WAIT_OR_UNLOCK(x_var, x_cond) { \
 		struct timespec m_ts; \
-		assert(!clock_gettime(CLOCK_MONOTONIC, &m_ts)); \
+		US_A(!clock_gettime(CLOCK_MONOTONIC, &m_ts)); \
 		us_ld_to_timespec(us_timespec_to_ld(&m_ts) + timeout, &m_ts); \
 		while (x_var) { \
-			const int err = pthread_cond_timedwait(&(x_cond), &queue->mutex, &m_ts); \
+			const int err = pthread_cond_timedwait(&(x_cond), &q->mutex, &m_ts); \
 			if (err == ETIMEDOUT) { \
-				US_MUTEX_UNLOCK(queue->mutex); \
+				US_MUTEX_UNLOCK(q->mutex); \
 				return -1; \
 			} \
-			assert(!err); \
+			US_A(!err); \
 		} \
 	}
 
-int us_queue_put(us_queue_s *queue, void *item, ldf timeout) {
-	US_MUTEX_LOCK(queue->mutex);
+int us_queue_put(us_queue_s *q, void *item, ldf timeout) {
+	US_MUTEX_LOCK(q->mutex);
 	if (timeout == 0) {
-		if (queue->size == queue->capacity) {
-			US_MUTEX_UNLOCK(queue->mutex);
+		if (q->size == q->capacity) {
+			US_MUTEX_UNLOCK(q->mutex);
 			return -1;
 		}
 	} else {
-		_WAIT_OR_UNLOCK(queue->size == queue->capacity, queue->full_cond);
+		_WAIT_OR_UNLOCK(q->size == q->capacity, q->full_cond);
 	}
-	queue->items[queue->in] = item;
-	++queue->size;
-	++queue->in;
-	queue->in %= queue->capacity;
-	US_MUTEX_UNLOCK(queue->mutex);
-	US_COND_BROADCAST(queue->empty_cond);
+	q->items[q->in] = item;
+	++q->size;
+	++q->in;
+	q->in %= q->capacity;
+	US_MUTEX_UNLOCK(q->mutex);
+	US_COND_BROADCAST(q->empty_cond);
 	return 0;
 }
 
-int us_queue_get(us_queue_s *queue, void **item, ldf timeout) {
-	US_MUTEX_LOCK(queue->mutex);
-	_WAIT_OR_UNLOCK(queue->size == 0, queue->empty_cond);
-	*item = queue->items[queue->out];
-	--queue->size;
-	++queue->out;
-	queue->out %= queue->capacity;
-	US_MUTEX_UNLOCK(queue->mutex);
-	US_COND_BROADCAST(queue->full_cond);
+int us_queue_get(us_queue_s *q, void **item, ldf timeout) {
+	US_MUTEX_LOCK(q->mutex);
+	_WAIT_OR_UNLOCK(q->size == 0, q->empty_cond);
+	*item = q->items[q->out];
+	--q->size;
+	++q->out;
+	q->out %= q->capacity;
+	US_MUTEX_UNLOCK(q->mutex);
+	US_COND_BROADCAST(q->full_cond);
 	return 0;
 }
 
 #undef _WAIT_OR_UNLOCK
 
-int us_queue_get_free(us_queue_s *queue) {
-	US_MUTEX_LOCK(queue->mutex);
-	const uint size = queue->size;
-	US_MUTEX_UNLOCK(queue->mutex);
-	return queue->capacity - size;
+bool us_queue_is_empty(us_queue_s *q) {
+	US_MUTEX_LOCK(q->mutex);
+	const uint size = q->size;
+	US_MUTEX_UNLOCK(q->mutex);
+	return (bool)(q->capacity - size);
 }

src/libs/queue.h

@@ -2,7 +2,7 @@
 #                                                                            #
 #    uStreamer - Lightweight and fast MJPEG-HTTP streamer.                   #
 #                                                                            #
-#    Copyright (C) 2018-2023  Maxim Devaev <mdevaev@gmail.com>               #
+#    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    #
@@ -24,8 +24,8 @@
 
 #include <pthread.h>
 
-#include "uslibs/types.h"
-#include "uslibs/tools.h"
+#include "types.h"
+#include "tools.h"
 
 
 // Based on https://github.com/seifzadeh/c-pthread-queue/blob/master/queue.h
@@ -43,22 +43,22 @@ typedef struct {
 } us_queue_s;
 
 
-#define US_QUEUE_DELETE_WITH_ITEMS(x_queue, x_free_item) { \
-		if (x_queue) { \
-			while (!us_queue_get_free(x_queue)) { \
+#define US_QUEUE_DELETE_WITH_ITEMS(x_q, x_free_item) { \
+		if (x_q) { \
+			while (!us_queue_is_empty(x_q)) { \
 				void *m_ptr; \
-				if (!us_queue_get(x_queue, &m_ptr, 0)) { \
+				if (!us_queue_get(x_q, &m_ptr, 0)) { \
 					US_DELETE(m_ptr, x_free_item); \
 				} \
 			} \
-			us_queue_destroy(x_queue); \
+			us_queue_destroy(x_q); \
 		} \
 	}
 
 
 us_queue_s *us_queue_init(uint capacity);
-void us_queue_destroy(us_queue_s *queue);
+void us_queue_destroy(us_queue_s *q);
 
-int us_queue_put(us_queue_s *queue, void *item, ldf timeout);
-int us_queue_get(us_queue_s *queue, void **item, ldf timeout);
-int us_queue_get_free(us_queue_s *queue);
+int us_queue_put(us_queue_s *q, void *item, ldf timeout);
+int us_queue_get(us_queue_s *q, void **item, ldf timeout);
+bool us_queue_is_empty(us_queue_s *q);

src/libs/ring.c

@@ -0,0 +1,84 @@
+/*****************************************************************************
+#                                                                            #
+#    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 "ring.h"
+
+#include "types.h"
+#include "tools.h"
+#include "queue.h"
+
+
+int _acquire(us_ring_s *ring, us_queue_s *q, ldf timeout);
+void _release(us_ring_s *ring, us_queue_s *q, uint ri);
+
+
+us_ring_s *us_ring_init(uint capacity) {
+	us_ring_s *ring;
+	US_CALLOC(ring, 1);
+	US_CALLOC(ring->items, capacity);
+	US_CALLOC(ring->places, capacity);
+	ring->capacity = capacity;
+	ring->producer = us_queue_init(capacity);
+	ring->consumer = us_queue_init(capacity);
+	for (uint ri = 0; ri < capacity; ++ri) {
+		ring->places[ri] = ri; // XXX: Just to avoid casting between pointer and uint
+		US_A(!us_queue_put(ring->producer, (void*)(ring->places + ri), 0));
+	}
+	return ring;
+}
+
+void us_ring_destroy(us_ring_s *ring) {
+	us_queue_destroy(ring->consumer);
+	us_queue_destroy(ring->producer);
+	free(ring->places);
+	free(ring->items);
+	free(ring);
+}
+
+int us_ring_producer_acquire(us_ring_s *ring, ldf timeout) {
+	return _acquire(ring, ring->producer, timeout);
+}
+
+void us_ring_producer_release(us_ring_s *ring, uint ri) {
+	_release(ring, ring->consumer, ri);
+}
+
+int us_ring_consumer_acquire(us_ring_s *ring, ldf timeout) {
+	return _acquire(ring, ring->consumer, timeout);
+}
+
+void us_ring_consumer_release(us_ring_s *ring, uint ri) {
+	_release(ring, ring->producer, ri);
+}
+
+int _acquire(us_ring_s *ring, us_queue_s *q, ldf timeout) {
+	(void)ring;
+	uint *place;
+	if (us_queue_get(q, (void**)&place, timeout) < 0) {
+		return -1;
+	}
+	return *place;
+}
+
+void _release(us_ring_s *ring, us_queue_s *q, uint ri) {
+	US_A(!us_queue_put(q, (void*)(ring->places + ri), 0));
+}

src/libs/ring.h

@@ -2,7 +2,7 @@
 #                                                                            #
 #    uStreamer - Lightweight and fast MJPEG-HTTP streamer.                   #
 #                                                                            #
-#    Copyright (C) 2018-2023  Maxim Devaev <mdevaev@gmail.com>               #
+#    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    #
@@ -22,50 +22,42 @@
 
 #pragma once
 
-#include <stdlib.h>
-#include <stdint.h>
-#include <stdbool.h>
-#include <stdatomic.h>
-#include <assert.h>
 
-#include <sys/types.h>
-
-#include <pthread.h>
-#include <alsa/asoundlib.h>
-#include <speex/speex_resampler.h>
-#include <opus/opus.h>
-
-#include "uslibs/tools.h"
-#include "uslibs/array.h"
-#include "uslibs/threading.h"
-
-#include "logging.h"
+#include "types.h"
 #include "queue.h"
 
 
 typedef struct {
-	snd_pcm_t			*pcm;
-	unsigned			pcm_hz;
-	unsigned			pcm_frames;
-	size_t				pcm_size;
-	snd_pcm_hw_params_t	*pcm_params;
-	SpeexResamplerState	*res;
-	OpusEncoder			*enc;
-
-	us_queue_s			*pcm_queue;
-	us_queue_s			*enc_queue;
-	uint32_t			pts;
-
-	pthread_t			pcm_tid;
-	pthread_t			enc_tid;
-	bool				tids_created;
-	atomic_bool			stop;
-} us_audio_s;
+	uz			capacity;
+	void		**items;
+	uint		*places;
+	us_queue_s	*producer;
+	us_queue_s	*consumer;
+} us_ring_s;
 
 
-bool us_audio_probe(const char *name);
+#define US_RING_INIT_WITH_ITEMS(x_ring, x_capacity, x_init_item) { \
+		(x_ring) = us_ring_init(x_capacity); \
+		for (uz m_ri = 0; m_ri < (x_ring)->capacity; ++m_ri) { \
+			(x_ring)->items[m_ri] = x_init_item(); \
+		} \
+	}
 
-us_audio_s *us_audio_init(const char *name, unsigned pcm_hz);
-void us_audio_destroy(us_audio_s *audio);
+#define US_RING_DELETE_WITH_ITEMS(x_ring, x_destroy_item) { \
+		if (x_ring) { \
+			for (uz m_ri = 0; m_ri < (x_ring)->capacity; ++m_ri) { \
+				x_destroy_item((x_ring)->items[m_ri]); \
+			} \
+			us_ring_destroy(x_ring); \
+		} \
+	}
 
-int us_audio_get_encoded(us_audio_s *audio, uint8_t *data, size_t *size, uint64_t *pts);
+
+us_ring_s *us_ring_init(uint capacity);
+void us_ring_destroy(us_ring_s *ring);
+
+int us_ring_producer_acquire(us_ring_s *ring, ldf timeout);
+void us_ring_producer_release(us_ring_s *ring, uint ri);
+
+int us_ring_consumer_acquire(us_ring_s *ring, ldf timeout);
+void us_ring_consumer_release(us_ring_s *ring, uint ri);

src/libs/signal.c

@@ -2,7 +2,7 @@
 #                                                                            #
 #    uStreamer - Lightweight and fast MJPEG-HTTP streamer.                   #
 #                                                                            #
-#    Copyright (C) 2018-2023  Maxim Devaev <mdevaev@gmail.com>               #
+#    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    #
@@ -20,54 +20,62 @@
 *****************************************************************************/
 
 
-#include "tc358743.h"
+#include "signal.h"
 
-#include <unistd.h>
-#include <fcntl.h>
+#include <string.h>
+#include <signal.h>
 
-#include <linux/videodev2.h>
-#include <linux/v4l2-controls.h>
-
-#include "uslibs/types.h"
-#include "uslibs/tools.h"
-#include "uslibs/xioctl.h"
+#if defined(__GLIBC__) && __GLIBC__ >= 2 && __GLIBC_MINOR__ >= 32
+#	define HAS_SIGABBREV_NP
+#endif
 
+#include "types.h"
+#include "tools.h"
 #include "logging.h"
 
 
-#ifndef V4L2_CID_USER_TC358743_BASE
-#	define V4L2_CID_USER_TC358743_BASE (V4L2_CID_USER_BASE + 0x1080)
-#endif
-#ifndef TC358743_CID_AUDIO_PRESENT
-#	define TC358743_CID_AUDIO_PRESENT (V4L2_CID_USER_TC358743_BASE + 1)
-#endif
-#ifndef TC358743_CID_AUDIO_SAMPLING_RATE
-#	define TC358743_CID_AUDIO_SAMPLING_RATE (V4L2_CID_USER_TC358743_BASE + 0)
-#endif
+char *us_signum_to_string(int signum) {
+#	ifdef HAS_SIGABBREV_NP
+	const char *const name = sigabbrev_np(signum);
+#	else
+	const char *const name = (
+		signum == SIGTERM ? "TERM" :
+		signum == SIGINT ? "INT" :
+		signum == SIGPIPE ? "PIPE" :
+		NULL
+	);
+#	endif
+	char *buf;
+	if (name != NULL) {
+		US_ASPRINTF(buf, "SIG%s", name);
+	} else {
+		US_ASPRINTF(buf, "SIG[%d]", signum);
+	}
+	return buf;
+}
 
+void us_install_signals_handler(us_signal_handler_f handler, bool ignore_sigpipe) {
+	struct sigaction sig_act = {0};
 
-int us_tc358743_read_info(const char *path, us_tc358743_info_s *info) {
-	US_MEMSET_ZERO(*info);
-
-	int fd = -1;
-	if ((fd = open(path, O_RDWR)) < 0) {
-		US_JLOG_PERROR("audio", "Can't open TC358743 V4L2 device");
-		return -1;
+	US_A(!sigemptyset(&sig_act.sa_mask));
+	sig_act.sa_handler = handler;
+	US_A(!sigaddset(&sig_act.sa_mask, SIGINT));
+	US_A(!sigaddset(&sig_act.sa_mask, SIGTERM));
+	if (!ignore_sigpipe) {
+	    US_A(!sigaddset(&sig_act.sa_mask, SIGPIPE));
 	}
 
-#	define READ_CID(x_cid, x_field) { \
-			struct v4l2_control m_ctl = {.id = x_cid}; \
-			if (us_xioctl(fd, VIDIOC_G_CTRL, &m_ctl) < 0) { \
-				US_JLOG_PERROR("audio", "Can't get value of " #x_cid); \
-				close(fd); \
-				return -1; \
-			} \
-			info->x_field = m_ctl.value; \
-		}
-	READ_CID(TC358743_CID_AUDIO_PRESENT,		has_audio);
-	READ_CID(TC358743_CID_AUDIO_SAMPLING_RATE,	audio_hz);
-#	undef READ_CID
+	US_LOG_DEBUG("Installing SIGINT handler ...");
+	US_A(!sigaction(SIGINT, &sig_act, NULL));
 
-	close(fd);
-	return 0;
+	US_LOG_DEBUG("Installing SIGTERM handler ...");
+	US_A(!sigaction(SIGTERM, &sig_act, NULL));
+
+	if (!ignore_sigpipe) {
+		US_LOG_DEBUG("Installing SIGPIPE handler ...");
+		US_A(!sigaction(SIGPIPE, &sig_act, NULL));
+	} else {
+		US_LOG_DEBUG("Ignoring SIGPIPE ...");
+		US_A(signal(SIGPIPE, SIG_IGN) != SIG_ERR);
+	}
 }

src/libs/signal.h

@@ -2,7 +2,7 @@
 #                                                                            #
 #    uStreamer - Lightweight and fast MJPEG-HTTP streamer.                   #
 #                                                                            #
-#    Copyright (C) 2018-2023  Maxim Devaev <mdevaev@gmail.com>               #
+#    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    #
@@ -22,14 +22,11 @@
 
 #pragma once
 
-#include <string.h>
-#include <errno.h>
-
-#include <event2/util.h>
-#include <event2/bufferevent.h>
-
-#include "../../libs/tools.h"
-#include "../../libs/logging.h"
+#include "types.h"
 
 
-char *us_bufferevent_format_reason(short what);
+typedef void (*us_signal_handler_f)(int);
+
+
+char *us_signum_to_string(int signum);
+void us_install_signals_handler(us_signal_handler_f handler, bool ignore_sigpipe);

src/libs/tc358743.c

@@ -2,7 +2,7 @@
 #                                                                            #
 #    uStreamer - Lightweight and fast MJPEG-HTTP streamer.                   #
 #                                                                            #
-#    Copyright (C) 2018-2023  Maxim Devaev <mdevaev@gmail.com>               #
+#    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    #
@@ -20,27 +20,35 @@
 *****************************************************************************/
 
 
-#include "uri.h"
+#include "tc358743.h"
+
+#include <unistd.h>
+#include <fcntl.h>
+
+#include <linux/videodev2.h>
+#include <linux/v4l2-controls.h>
+
+#include "types.h"
+#include "tools.h"
+#include "xioctl.h"
 
 
-bool us_uri_get_true(struct evkeyvalq *params, const char *key) {
-	const char *value_str = evhttp_find_header(params, key);
-	if (value_str != NULL) {
-		if (
-			value_str[0] == '1'
-			|| !evutil_ascii_strcasecmp(value_str, "true")
-			|| !evutil_ascii_strcasecmp(value_str, "yes")
-		) {
-			return true;
-		}
+int us_tc358743_xioctl_get_audio_hz(int fd, uint *audio_hz) {
+	*audio_hz = 0;
+
+	struct v4l2_control ctl = {.id = TC358743_CID_AUDIO_PRESENT};
+	if (us_xioctl(fd, VIDIOC_G_CTRL, &ctl) < 0) {
+		return -1;
 	}
-	return false;
-}
-
-char *us_uri_get_string(struct evkeyvalq *params, const char *key) {
-	const char *const value_str = evhttp_find_header(params, key);
-	if (value_str != NULL) {
-		return evhttp_encode_uri(value_str);
+	if (!ctl.value) {
+		return 0; // No audio
 	}
-	return NULL;
+
+	US_MEMSET_ZERO(ctl);
+	ctl.id = TC358743_CID_AUDIO_SAMPLING_RATE;
+	if (us_xioctl(fd, VIDIOC_G_CTRL, &ctl) < 0) {
+		return -1;
+	}
+	*audio_hz = ctl.value;
+	return 0;
 }

src/libs/tc358743.h

@@ -0,0 +1,47 @@
+/*****************************************************************************
+#                                                                            #
+#    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/>.  #
+#                                                                            #
+*****************************************************************************/
+
+
+#pragma once
+
+#include <linux/v4l2-controls.h>
+
+#include "types.h"
+
+
+#ifndef V4L2_CID_USER_TC358743_BASE
+#	define V4L2_CID_USER_TC358743_BASE (V4L2_CID_USER_BASE + 0x1080)
+#endif
+
+#ifndef TC358743_CID_AUDIO_SAMPLING_RATE
+#	define TC358743_CID_AUDIO_SAMPLING_RATE (V4L2_CID_USER_TC358743_BASE + 0)
+#endif
+
+#ifndef TC358743_CID_AUDIO_PRESENT
+#	define TC358743_CID_AUDIO_PRESENT (V4L2_CID_USER_TC358743_BASE + 1)
+#endif
+
+#ifndef TC358743_CID_LANES_ENOUGH
+#	define TC358743_CID_LANES_ENOUGH (V4L2_CID_USER_TC358743_BASE + 2)
+#endif
+
+
+int us_tc358743_xioctl_get_audio_hz(int fd, uint *audio_hz);

src/libs/threading.h

@@ -2,7 +2,7 @@
 #                                                                            #
 #    uStreamer - Lightweight and fast MJPEG-HTTP streamer.                   #
 #                                                                            #
-#    Copyright (C) 2018-2023  Maxim Devaev <mdevaev@gmail.com>               #
+#    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    #
@@ -24,7 +24,7 @@
 
 #include <stdio.h>
 #include <unistd.h>
-#include <assert.h>
+#include <signal.h>
 
 #include <sys/syscall.h>
 
@@ -46,8 +46,8 @@
 #	define US_THREAD_NAME_SIZE ((uz)16)
 #endif
 
-#define US_THREAD_CREATE(x_tid, x_func, x_arg)	assert(!pthread_create(&(x_tid), NULL, (x_func), (x_arg)))
-#define US_THREAD_JOIN(x_tid)					assert(!pthread_join((x_tid), NULL))
+#define US_THREAD_CREATE(x_tid, x_func, x_arg)	US_A(!pthread_create(&(x_tid), NULL, (x_func), (x_arg)))
+#define US_THREAD_JOIN(x_tid)					US_A(!pthread_join((x_tid), NULL))
 
 #ifdef WITH_PTHREAD_NP
 #	define US_THREAD_RENAME(x_fmt, ...) { \
@@ -56,19 +56,24 @@
 			us_thread_set_name(m_new_tname_buf); \
 		}
 #else
-#	define US_THREAD_RENAME(_fmt, ...)
+#	define US_THREAD_RENAME(x_fmt, ...)
 #endif
 
-#define US_MUTEX_INIT(x_mutex)		assert(!pthread_mutex_init(&(x_mutex), NULL))
-#define US_MUTEX_DESTROY(x_mutex)	assert(!pthread_mutex_destroy(&(x_mutex)))
-#define US_MUTEX_LOCK(x_mutex)		assert(!pthread_mutex_lock(&(x_mutex)))
-#define US_MUTEX_UNLOCK(x_mutex)	assert(!pthread_mutex_unlock(&(x_mutex)))
+#define US_THREAD_SETTLE(x_fmt, ...) { \
+		US_THREAD_RENAME((x_fmt), ##__VA_ARGS__); \
+		us_thread_block_signals(); \
+	}
 
-#define US_COND_INIT(x_cond)		assert(!pthread_cond_init(&(x_cond), NULL))
-#define US_COND_DESTROY(x_cond)		assert(!pthread_cond_destroy(&(x_cond)))
-#define US_COND_SIGNAL(x_cond)		assert(!pthread_cond_signal(&(x_cond)))
-#define US_COND_BROADCAST(x_cond)	assert(!pthread_cond_broadcast(&(x_cond)))
-#define US_COND_WAIT_FOR(x_var, x_cond, x_mutex) { while(!(x_var)) assert(!pthread_cond_wait(&(x_cond), &(x_mutex))); }
+#define US_MUTEX_INIT(x_mutex)		US_A(!pthread_mutex_init(&(x_mutex), NULL))
+#define US_MUTEX_DESTROY(x_mutex)	US_A(!pthread_mutex_destroy(&(x_mutex)))
+#define US_MUTEX_LOCK(x_mutex)		US_A(!pthread_mutex_lock(&(x_mutex)))
+#define US_MUTEX_UNLOCK(x_mutex)	US_A(!pthread_mutex_unlock(&(x_mutex)))
+
+#define US_COND_INIT(x_cond)		US_A(!pthread_cond_init(&(x_cond), NULL))
+#define US_COND_DESTROY(x_cond)		US_A(!pthread_cond_destroy(&(x_cond)))
+#define US_COND_SIGNAL(x_cond)		US_A(!pthread_cond_signal(&(x_cond)))
+#define US_COND_BROADCAST(x_cond)	US_A(!pthread_cond_broadcast(&(x_cond)))
+#define US_COND_WAIT_FOR(x_var, x_cond, x_mutex) { while(!(x_var)) US_A(!pthread_cond_wait(&(x_cond), &(x_mutex))); }
 
 
 #ifdef WITH_PTHREAD_NP
@@ -78,7 +83,7 @@ INLINE void us_thread_set_name(const char *name) {
 #	elif defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
 	pthread_set_name_np(pthread_self(), name);
 #	elif defined(__NetBSD__)
-	pthread_setname_np(pthread_self(), "%s", (void *)name);
+	pthread_setname_np(pthread_self(), "%s", (void*)name);
 #	else
 #		error us_thread_set_name() not implemented, you can disable it using WITH_PTHREAD_NP=0
 #	endif
@@ -107,7 +112,9 @@ INLINE void us_thread_get_name(char *name) { // Always required for logging
 #if defined(__linux__)
 		const pid_t tid = syscall(SYS_gettid);
 #elif defined(__FreeBSD__)
-		const pid_t tid = syscall(SYS_thr_self);
+		long id;
+		US_A(!syscall(SYS_thr_self, &id));
+		const pid_t tid = id;
 #elif defined(__OpenBSD__)
 		const pid_t tid = syscall(SYS_getthrid);
 #elif defined(__NetBSD__)
@@ -124,3 +131,11 @@ INLINE void us_thread_get_name(char *name) { // Always required for logging
 	}
 #endif
 }
+
+INLINE void us_thread_block_signals(void) {
+	sigset_t mask;
+	US_A(!sigemptyset(&mask));
+	US_A(!sigaddset(&mask, SIGINT));
+	US_A(!sigaddset(&mask, SIGTERM));
+	US_A(!pthread_sigmask(SIG_BLOCK, &mask, NULL));
+}

src/libs/tools.h

@@ -2,7 +2,7 @@
 #                                                                            #
 #    uStreamer - Lightweight and fast MJPEG-HTTP streamer.                   #
 #                                                                            #
-#    Copyright (C) 2018-2023  Maxim Devaev <mdevaev@gmail.com>               #
+#    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    #
@@ -27,6 +27,7 @@
 #include <string.h>
 #include <unistd.h>
 #include <limits.h>
+#include <locale.h> // Make C locale for strerror_l()
 #include <errno.h>
 #include <math.h>
 #include <time.h>
@@ -34,12 +35,6 @@
 
 #include <sys/file.h>
 
-#if defined(__GLIBC__) && __GLIBC__ >= 2 && __GLIBC_MINOR__ >= 32
-#	define HAS_SIGABBREV_NP
-#else
-#	include <signal.h>
-#endif
-
 #include "types.h"
 
 
@@ -56,14 +51,17 @@
 
 #define INLINE inline __attribute__((always_inline))
 
-#define US_CALLOC(x_dest, x_nmemb)		assert(((x_dest) = calloc((x_nmemb), sizeof(*(x_dest)))) != NULL)
-#define US_REALLOC(x_dest, x_nmemb)		assert(((x_dest) = realloc((x_dest), (x_nmemb) * sizeof(*(x_dest)))) != NULL)
+#define US_A(x_arg)		{ const bool m_ar = (x_arg); assert(m_ar && #x_arg); }
+#define US_RAISE(x_msg)	assert(0 && x_msg)
+
+#define US_CALLOC(x_dest, x_nmemb)		US_A(((x_dest) = calloc((x_nmemb), sizeof(*(x_dest)))) != NULL)
+#define US_REALLOC(x_dest, x_nmemb)		US_A(((x_dest) = realloc((x_dest), (x_nmemb) * sizeof(*(x_dest)))) != NULL)
 #define US_DELETE(x_dest, x_free)		{ if (x_dest) { x_free(x_dest); x_dest = NULL; } }
-#define US_CLOSE_FD(x_dest, x_close)	{ if (x_dest >= 0) { x_close(x_dest); x_dest = -1; } }
+#define US_CLOSE_FD(x_dest)				{ if (x_dest >= 0) { close(x_dest); x_dest = -1; } }
 #define US_MEMSET_ZERO(x_obj)			memset(&(x_obj), 0, sizeof(x_obj))
 
-#define US_SNPRINTF(x_dest, x_size, x_fmt, ...)	assert(snprintf((x_dest), (x_size), (x_fmt), ##__VA_ARGS__) > 0)
-#define US_ASPRINTF(x_dest, x_fmt, ...)			assert(asprintf(&(x_dest), (x_fmt), ##__VA_ARGS__) > 0)
+#define US_SNPRINTF(x_dest, x_size, x_fmt, ...)	US_A(snprintf((x_dest), (x_size), (x_fmt), ##__VA_ARGS__) > 0)
+#define US_ASPRINTF(x_dest, x_fmt, ...)			US_A(asprintf(&(x_dest), (x_fmt), ##__VA_ARGS__) > 0)
 
 #define US_MIN(x_a, x_b) ({ \
 		__typeof__(x_a) m_a = (x_a); \
@@ -77,10 +75,20 @@
 		(m_a > m_b ? m_a : m_b); \
 	})
 
+#define US_ONCE_FOR(x_once, x_value, ...) { \
+		const int m_reported = (x_value); \
+		if (m_reported != (x_once)) { \
+			__VA_ARGS__; \
+			(x_once) = m_reported; \
+		} \
+	}
+
+#define US_ONCE(...) US_ONCE_FOR(once, __LINE__, ##__VA_ARGS__)
+
 
 INLINE char *us_strdup(const char *str) {
 	char *const new = strdup(str);
-	assert(new != NULL);
+	US_A(new != NULL);
 	return new;
 }
 
@@ -110,7 +118,7 @@ INLINE u32 us_triple_u32(u32 x) {
 
 INLINE void us_get_now(clockid_t clk_id, time_t *sec, long *msec) {
 	struct timespec ts;
-	assert(!clock_gettime(clk_id, &ts));
+	US_A(!clock_gettime(clk_id, &ts));
 	*sec = ts.tv_sec;
 	*msec = round(ts.tv_nsec / 1.0e6);
 
@@ -129,7 +137,7 @@ INLINE ldf us_get_now_monotonic(void) {
 
 INLINE u64 us_get_now_monotonic_u64(void) {
 	struct timespec ts;
-	assert(!clock_gettime(CLOCK_MONOTONIC, &ts));
+	US_A(!clock_gettime(CLOCK_MONOTONIC, &ts));
 	return (u64)(ts.tv_nsec / 1000) + (u64)ts.tv_sec * 1000000;
 }
 
@@ -145,12 +153,6 @@ INLINE ldf us_get_now_real(void) {
 	return (ldf)sec + ((ldf)msec) / 1000;
 }
 
-INLINE uint us_get_cores_available(void) {
-	long cores_sysconf = sysconf(_SC_NPROCESSORS_ONLN);
-	cores_sysconf = (cores_sysconf < 0 ? 0 : cores_sysconf);
-	return US_MAX(US_MIN(cores_sysconf, 4), 1);
-}
-
 INLINE void us_ld_to_timespec(ldf ld, struct timespec *ts) {
 	ts->tv_sec = (long)ld;
 	ts->tv_nsec = (ld - ts->tv_sec) * 1000000000L;
@@ -164,6 +166,28 @@ INLINE ldf us_timespec_to_ld(const struct timespec *ts) {
 	return ts->tv_sec + ((ldf)ts->tv_nsec) / 1000000000;
 }
 
+#define NTP_UNIX_TIME_DIFF	2208988800u // Difference between Unix time and NTP time in seconds (1970 - 1900)
+#define NTP_TICKS_IN_SECOND	4294967296u // Ticks per second in NTP time
+
+INLINE u64 us_get_now_ntp(void) {
+	struct timespec ts;
+	US_A(!clock_gettime(CLOCK_REALTIME, &ts));
+	return (((u64)ts.tv_sec + NTP_UNIX_TIME_DIFF) << 32) + ((u64)ts.tv_nsec / 1000 * NTP_TICKS_IN_SECOND) / 1000000;
+}
+
+INLINE u64 us_ld_to_ntp(ldf ld) {
+	return (ld > 0 ? ld * NTP_TICKS_IN_SECOND : 0);
+}
+
+#undef NTP_TICKS_IN_SECOND
+#undef NTP_UNIX_TIME_DIFF
+
+INLINE uint us_get_cores_available(void) {
+	long cores_sysconf = sysconf(_SC_NPROCESSORS_ONLN);
+	cores_sysconf = (cores_sysconf < 0 ? 0 : cores_sysconf);
+	return US_MAX(US_MIN(cores_sysconf, 4), 1);
+}
+
 INLINE int us_flock_timedwait_monotonic(int fd, ldf timeout) {
 	const ldf deadline_ts = us_get_now_monotonic() + timeout;
 	int retval = -1;
@@ -181,34 +205,26 @@ INLINE int us_flock_timedwait_monotonic(int fd, ldf timeout) {
 }
 
 INLINE char *us_errno_to_string(int error) {
+#	if (_POSIX_C_SOURCE >= 200112L) && !defined(_GNU_SOURCE) // XSI
 	char buf[2048];
 	const uz max_len = sizeof(buf) - 1;
-#	if (_POSIX_C_SOURCE >= 200112L) && ! _GNU_SOURCE
 	if (strerror_r(error, buf, max_len) != 0) {
 		US_SNPRINTF(buf, max_len, "Errno = %d", error);
 	}
 	return us_strdup(buf);
-#	else
-	return us_strdup(strerror_r(error, buf, max_len));
-#	endif
-}
 
-INLINE char *us_signum_to_string(int signum) {
-#	ifdef HAS_SIGABBREV_NP
-	const char *const name = sigabbrev_np(signum);
-#	else
-	const char *const name = (
-		signum == SIGTERM ? "TERM" :
-		signum == SIGINT ? "INT" :
-		signum == SIGPIPE ? "PIPE" :
-		NULL
-	);
-#	endif
-	char *buf;
-	if (name != NULL) {
-		US_ASPRINTF(buf, "SIG%s", name);
-	} else {
-		US_ASPRINTF(buf, "SIG[%d]", signum);
+#	elif defined(__GLIBC__) && defined(_GNU_SOURCE) // GNU
+	char buf[2048];
+	const uz max_len = sizeof(buf) - 1;
+	return us_strdup(strerror_r(error, buf, max_len));
+
+#	else // BSD
+	locale_t locale = newlocale(LC_MESSAGES_MASK, "C", NULL);
+	if (locale) {
+		char *ptr = us_strdup(strerror_l(error, locale));
+		freelocale(locale);
+		return ptr;
 	}
-	return buf;
+	return us_strdup("!!! newlocale() error !!!");
+#	endif
 }

src/libs/types.h

@@ -2,7 +2,7 @@
 #                                                                            #
 #    uStreamer - Lightweight and fast MJPEG-HTTP streamer.                   #
 #                                                                            #
-#    Copyright (C) 2018-2023  Maxim Devaev <mdevaev@gmail.com>               #
+#    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    #
@@ -25,6 +25,8 @@
 #include <stdbool.h>
 #include <stdint.h>
 
+#include <sys/types.h>
+
 
 typedef long long sll;
 typedef ssize_t sz;

src/libs/unjpeg.c

@@ -2,7 +2,7 @@
 #                                                                            #
 #    uStreamer - Lightweight and fast MJPEG-HTTP streamer.                   #
 #                                                                            #
-#    Copyright (C) 2018-2023  Maxim Devaev <mdevaev@gmail.com>               #
+#    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    #
@@ -24,12 +24,12 @@
 
 #include <stdio.h>
 #include <setjmp.h>
-#include <assert.h>
 
 #include <jpeglib.h>
 #include <linux/videodev2.h>
 
 #include "types.h"
+#include "tools.h"
 #include "logging.h"
 #include "frame.h"
 
@@ -45,7 +45,7 @@ static void _jpeg_error_handler(j_common_ptr jpeg);
 
 
 int us_unjpeg(const us_frame_s *src, us_frame_s *dest, bool decode) {
-	assert(us_is_jpeg(src->format));
+	US_A(us_is_jpeg(src->format));
 
 	volatile int retval = 0;
 
@@ -54,7 +54,7 @@ int us_unjpeg(const us_frame_s *src, us_frame_s *dest, bool decode) {
 
 	// https://stackoverflow.com/questions/19857766/error-handling-in-libjpeg
 	_jpeg_error_manager_s jpeg_error;
-	jpeg.err = jpeg_std_error((struct jpeg_error_mgr *)&jpeg_error);
+	jpeg.err = jpeg_std_error((struct jpeg_error_mgr*)&jpeg_error);
 	jpeg_error.mgr.error_exit = _jpeg_error_handler;
 	jpeg_error.frame = src;
 	if (setjmp(jpeg_error.jmp) < 0) {
@@ -68,16 +68,16 @@ int us_unjpeg(const us_frame_s *src, us_frame_s *dest, bool decode) {
 
 	jpeg_start_decompress(&jpeg);
 
-	us_frame_copy_meta(src, dest);
-	dest->format = V4L2_PIX_FMT_RGB24;
-	dest->width = jpeg.output_width;
-	dest->height = jpeg.output_height;
-	dest->stride = jpeg.output_width * jpeg.output_components; // Row stride
-	dest->used = 0;
+	US_FRAME_COPY_META(src, dest); // cppcheck-suppress redundantAssignment
+	dest->format = V4L2_PIX_FMT_RGB24; // cppcheck-suppress redundantAssignment
+	dest->width = jpeg.output_width; // cppcheck-suppress redundantAssignment
+	dest->height = jpeg.output_height; // cppcheck-suppress redundantAssignment
+	dest->stride = jpeg.output_width * jpeg.output_components; // cppcheck-suppress redundantAssignment
+	dest->used = 0; // cppcheck-suppress redundantAssignment
 
 	if (decode) {
 		JSAMPARRAY scanlines;
-		scanlines = (*jpeg.mem->alloc_sarray)((j_common_ptr) &jpeg, JPOOL_IMAGE, dest->stride, 1);
+		scanlines = (*jpeg.mem->alloc_sarray)((j_common_ptr)&jpeg, JPOOL_IMAGE, dest->stride, 1);
 
 		us_frame_realloc_data(dest, ((dest->width * dest->height) << 1) * 2);
 		while (jpeg.output_scanline < jpeg.output_height) {
@@ -94,7 +94,7 @@ done:
 }
 
 static void _jpeg_error_handler(j_common_ptr jpeg) {
-	_jpeg_error_manager_s *jpeg_error = (_jpeg_error_manager_s *)jpeg->err;
+	_jpeg_error_manager_s *jpeg_error = (_jpeg_error_manager_s*)jpeg->err;
 	char msg[JMSG_LENGTH_MAX];
 
 	(*jpeg_error->mgr.format_message)(jpeg, msg);

src/libs/unjpeg.h

@@ -2,7 +2,7 @@
 #                                                                            #
 #    uStreamer - Lightweight and fast MJPEG-HTTP streamer.                   #
 #                                                                            #
-#    Copyright (C) 2018-2023  Maxim Devaev <mdevaev@gmail.com>               #
+#    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    #