Bump version: 5.23 → 5.24

* build docker image

* Push each image to an user github registry.
It can be used during development for testing.

* set HDMI EDID before starting ustreamer

* Update README.md

.bumpversion.cfg

@@ -1,14 +1,26 @@
 [bumpversion]
 commit = True
 tag = True
-current_version = 1.26
-parse = (?P<major>\d+)\.(?P<minor>\d+)(\.(?P<patch>\d+)(\-(?P<release>[a-z]+))?)?
+current_version = 5.24
+parse = (?P<major>\d+)\.(?P<minor>\d+)
 serialize = 
 	{major}.{minor}
 
-[bumpversion:file:src/config.h]
-search = VERSION "{current_version}"
-replace = VERSION "{new_version}"
+[bumpversion:file:src/libs/const.h]
+parse = (?P<major>\d+)
+serialize = {major}
+search = VERSION_MAJOR {current_version}
+replace = VERSION_MAJOR {new_version}
+
+[bumpversion:file:./src/libs/const.h]
+parse = <major>\d+\.(?P<minor>\d+)
+serialize = {minor}
+search = VERSION_MINOR {current_version}
+replace = VERSION_MINOR {new_version}
+
+[bumpversion:file:python/setup.py]
+search = version="{current_version}"
+replace = version="{new_version}"
 
 [bumpversion:file:pkg/arch/PKGBUILD]
 search = pkgver={current_version}
@@ -17,3 +29,11 @@ replace = pkgver={new_version}
 [bumpversion:file:pkg/openwrt/Makefile]
 search = PKG_VERSION:={current_version}
 replace = PKG_VERSION:={new_version}
+
+[bumpversion:file:man/ustreamer.1]
+search = "version {current_version}"
+replace = "version {new_version}"
+
+[bumpversion:file:man/ustreamer-dump.1]
+search = "version {current_version}"
+replace = "version {new_version}"

.dockerignore

@@ -4,3 +4,7 @@
 # Allow source code
 !Makefile
 !src/**
+!python/**
+!janus/**
+!man/**
+!pkg/docker/entry.sh

.editorconfig

@@ -0,0 +1,10 @@
+root = true
+
+[*]
+end_of_file = lf
+indent_style = tab
+indent_size = 4
+
+[*.{py,yaml}]
+indent_style = space
+indent_size = 4

.gitattributes

@@ -0,0 +1,5 @@
+/.github/ export-ignore
+/.bumpversion.cfg export-ignore
+/.dockerignore export-ignore
+/.gitattributes export-ignore
+/.gitignore export-ignore

.github/FUNDING.yml

@@ -1,4 +1,4 @@
 # These are supported funding model platforms
 
 patreon: pikvm
-custom: https://www.paypal.me/mdevaev
+custom: https://paypal.me/pikvm

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

@@ -0,0 +1,81 @@
+name: Build Alpine
+
+on:
+    push:
+        branches: [master, build_*]
+        tags: [v*]
+    pull_request:
+        branches: [master]
+
+jobs:
+  buildx:
+    runs-on: ubuntu-latest
+    steps:
+      -
+        name: Checkout
+        uses: actions/checkout@v3
+      -
+        name: Login to GitHub Container Registry
+        if: github.event_name != 'pull_request'
+        uses: docker/login-action@v2
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+      -
+        name: Login to DockerHub Container Registry
+        if: startsWith(github.ref, 'refs/tags/v')
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+      -
+        name: Docker meta
+        id: meta
+        uses: docker/metadata-action@v4
+        with:
+          images: |
+            ${{ secrets.DOCKERHUB_USERNAME }}/ustreamer,enable=${{ startsWith(github.ref, 'refs/tags/v') }}
+            ghcr.io/${{ github.repository }},enable=${{ github.event_name != 'pull_request' }}
+          tags: |
+            type=ref,event=tag
+            type=sha,format=long
+      -
+        name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
+      -
+        name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+        with:
+          driver-opts: image=moby/buildkit:master
+      -
+        name: Build and export to Docker
+        uses: docker/build-push-action@v3
+        with:
+          context: .
+          load: true
+          tags: ustreamer
+          file: pkg/docker/Dockerfile.alpine
+      -
+        name: Test
+        run: |
+          echo version: $(docker run --rm -e NO_EDID=1 -t ustreamer --version)
+          echo -e "features:\n$(docker run --rm -e NO_EDID=1 -t ustreamer --features)"
+      -
+        name: Build multi arch
+        uses: docker/build-push-action@v3
+        with:
+          context: .
+          platforms: linux/arm64,linux/amd64,linux/arm/v7
+          file: pkg/docker/Dockerfile.alpine
+      -
+        name: Push
+        if: steps.meta.outputs.tags != ''
+        uses: docker/build-push-action@v3
+        with:
+          context: .
+          platforms: linux/arm64,linux/amd64,linux/arm/v7
+          push: true
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
+          file: pkg/docker/Dockerfile.alpine

.gitignore

@@ -2,11 +2,16 @@
 /linters/.mypy_cache/
 /pkg/arch/pkg/
 /pkg/arch/src/
-/pkg/arch/v*.tar.gz
-/pkg/arch/ustreamer-*.pkg.tar.xz
-/pkg/arch/ustreamer-*.pkg.tar.zst
-/build/
-/config.mk
-/vgcore.*
+/src/build/
+/python/build/
+/janus/build/
 /ustreamer
-/*.sock
+/ustreamer-dump
+/config.mk
+vgcore.*
+*.sock
+*.so
+*.bin
+*.pkg.tar.xz
+*.pkg.tar.zst
+*.tar.gz

Makefile

@@ -1,112 +1,93 @@
 -include config.mk
 
-PROG ?= ustreamer
 DESTDIR ?=
 PREFIX ?= /usr/local
+MANPREFIX ?= $(PREFIX)/share/man
 
 CC ?= gcc
+PY ?= python3
 CFLAGS ?= -O3
 LDFLAGS ?=
 
 RPI_VC_HEADERS ?= /opt/vc/include
 RPI_VC_LIBS ?= /opt/vc/lib
 
-BUILD ?= build
+export
 
-LINTERS_IMAGE ?= $(PROG)-linters
+_LINTERS_IMAGE ?= ustreamer-linters
 
 
 # =====
-_LIBS = -lm -ljpeg -pthread -levent -levent_pthreads -luuid
-override CFLAGS += -c -std=c11 -Wall -Wextra -D_GNU_SOURCE
-_SRCS = $(shell ls src/*.c src/http/*.c src/encoders/cpu/*.c src/encoders/hw/*.c)
-
-
 define optbool
 $(filter $(shell echo $(1) | tr A-Z a-z), yes on 1)
 endef
 
 
-ifneq ($(call optbool,$(WITH_OMX)),)
-_LIBS += -lbcm_host -lvcos -lopenmaxil -L$(RPI_VC_LIBS)
-override CFLAGS += -DWITH_OMX -DOMX_SKIP64BIT -I$(RPI_VC_HEADERS)
-_SRCS += $(shell ls src/encoders/omx/*.c)
-endif
-
-
-ifneq ($(call optbool,$(WITH_GPIO)),)
-_LIBS += -lgpiod
-override CFLAGS += -DWITH_GPIO
-_SRCS += $(shell ls src/gpio/*.c)
-endif
-
-
-WITH_PTHREAD_NP ?= 1
-ifneq ($(call optbool,$(WITH_PTHREAD_NP)),)
-override CFLAGS += -DWITH_PTHREAD_NP
-endif
-
-
-WITH_SETPROCTITLE ?= 1
-ifneq ($(call optbool,$(WITH_SETPROCTITLE)),)
-ifeq ($(shell uname -s | tr A-Z a-z),linux)
-_LIBS += -lbsd
-endif
-override CFLAGS += -DWITH_SETPROCTITLE
-endif
-
-
 # =====
-all: $(PROG)
+all:
+	+ $(MAKE) apps
+ifneq ($(call optbool,$(WITH_PYTHON)),)
+	+ $(MAKE) python
+endif
+ifneq ($(call optbool,$(WITH_JANUS)),)
+	+ $(MAKE) janus
+endif
 
 
-install: $(PROG)
-	install -Dm755 $(PROG) $(DESTDIR)$(PREFIX)/bin/$(PROG)
+apps:
+	$(MAKE) -C src
+	@ ln -sf src/ustreamer.bin ustreamer
+	@ ln -sf src/ustreamer-dump.bin ustreamer-dump
+
+
+python:
+	$(MAKE) -C python
+	@ ln -sf python/build/lib.*/*.so .
+
+
+janus:
+	$(MAKE) -C janus
+	@ ln -sf janus/*.so .
+
+
+install: all
+	$(MAKE) -C src install
+ifneq ($(call optbool,$(WITH_PYTHON)),)
+	$(MAKE) -C python install
+endif
+ifneq ($(call optbool,$(WITH_JANUS)),)
+	$(MAKE) -C janus install
+endif
+	mkdir -p $(DESTDIR)$(MANPREFIX)/man1
+	for man in $(shell ls man); do \
+		install -m644 man/$$man $(DESTDIR)$(MANPREFIX)/man1/$$man; \
+		gzip -f $(DESTDIR)$(MANPREFIX)/man1/$$man; \
+	done
 
 
 install-strip: install
-	strip $(DESTDIR)$(PREFIX)/bin/$(PROG)
-
-
-uninstall:
-	rm $(DESTDIR)$(PREFIX)/bin/$(PROG)
+	$(MAKE) -C src install-strip
 
 
 regen:
-	tools/make-jpeg-h.py src/http/data/blank.jpeg src/http/data/blank_jpeg.h BLANK
-	tools/make-html-h.py src/http/data/index.html src/http/data/index_html.h INDEX
-
-
-$(PROG): $(_SRCS:%.c=$(BUILD)/%.o)
-	$(info -- LD $@)
-	@ $(CC) $^ -o $@ $(LDFLAGS) $(_LIBS)
-	$(info ===== Build complete =====)
-	$(info == CC      = $(CC))
-	$(info == LIBS    = $(_LIBS))
-	$(info == CFLAGS  = $(CFLAGS))
-	$(info == LDFLAGS = $(LDFLAGS))
-
-
-$(BUILD)/%.o: %.c
-	$(info -- CC $<)
-	@ mkdir -p $(dir $@) || true
-	@ $(CC) $< -o $@ $(CFLAGS)
+	tools/$(MAKE)-jpeg-h.py src/ustreamer/data/blank.jpeg src/ustreamer/data/blank_jpeg.c BLANK
+	tools/$(MAKE)-html-h.py src/ustreamer/data/index.html src/ustreamer/data/index_html.c INDEX
 
 
 release:
-	make clean
-	make tox
-	make push
-	make bump V=$(V)
-	make push
-	make clean
+	$(MAKE) clean
+	$(MAKE) tox
+	$(MAKE) push
+	$(MAKE) bump V=$(V)
+	$(MAKE) push
+	$(MAKE) clean
 
 
 tox: linters
 	time docker run --rm \
 			--volume `pwd`:/src:ro \
 			--volume `pwd`/linters:/src/linters:rw \
-		-t $(LINTERS_IMAGE) bash -c " \
+		-t $(_LINTERS_IMAGE) bash -c " \
 			cd /src \
 			&& tox -q -c linters/tox.ini $(if $(E),-e $(E),-p auto) \
 		"
@@ -116,7 +97,7 @@ linters:
 	docker build \
 			$(if $(call optbool,$(NC)),--no-cache,) \
 			--rm \
-			--tag $(LINTERS_IMAGE) \
+			--tag $(_LINTERS_IMAGE) \
 		-f linters/Dockerfile linters
 
 
@@ -132,9 +113,15 @@ push:
 clean-all: linters clean
 	- docker run --rm \
 			--volume `pwd`:/src \
-		-it $(LINTERS_IMAGE) bash -c "cd src && rm -rf linters/{.tox,.mypy_cache}"
+		-it $(_LINTERS_IMAGE) bash -c "cd src && rm -rf linters/{.tox,.mypy_cache}"
+
+
 clean:
 	rm -rf pkg/arch/pkg pkg/arch/src pkg/arch/v*.tar.gz pkg/arch/ustreamer-*.pkg.tar.{xz,zst}
-	rm -rf $(PROG) $(BUILD) vgcore.* *.sock
+	rm -f ustreamer ustreamer-dump *.so
+	$(MAKE) -C src clean
+	$(MAKE) -C python clean
+	$(MAKE) -C janus clean
 
-.PHONY: linters
+
+.PHONY: python janus linters

README.md

@@ -4,27 +4,29 @@
 
 [[Русская версия]](README.ru.md)
 
-µStreamer is a lightweight and very quick server to stream [MJPG](https://en.wikipedia.org/wiki/Motion_JPEG) video from any V4L2 device to the net. All new browsers have native support of this video format, as well as most video players such as mplayer, VLC etc.
-µStreamer is a part of the [Pi-KVM](https://github.com/pikvm/pikvm) project designed to stream [VGA](https://www.amazon.com/dp/B0126O0RDC) and [HDMI](https://auvidea.com/b101-hdmi-to-csi-2-bridge-15-pin-fpc/) screencast hardware data with the highest resolution and FPS possible.
+µStreamer is a lightweight and very quick server to stream [MJPEG](https://en.wikipedia.org/wiki/Motion_JPEG) video from any V4L2 device to the net. All new browsers have native support of this video format, as well as most video players such as mplayer, VLC etc.
+µStreamer is a part of the [PiKVM](https://github.com/pikvm/pikvm) project designed to stream [VGA](https://www.amazon.com/dp/B0126O0RDC) and [HDMI](https://auvidea.com/b101-hdmi-to-csi-2-bridge-15-pin-fpc/) screencast hardware data with the highest resolution and FPS possible.
 
 µStreamer is very similar to [mjpg-streamer](https://github.com/jacksonliam/mjpg-streamer) with ```input_uvc.so``` and ```output_http.so``` plugins, however, there are some major differences. The key ones are:
 
 | **Feature** | **µStreamer** | **mjpg-streamer** |
 |----------|---------------|-------------------|
-| Multithreaded JPEG encoding | ![#00aa00](https://placehold.it/15/00aa00/000000?text=+) Yes | ![#f03c15](https://placehold.it/15/f03c15/000000?text=+) No |
-| [OpenMAX IL](https://www.khronos.org/openmaxil) hardware acceleration<br>on Raspberry Pi | ![#00aa00](https://placehold.it/15/00aa00/000000?text=+) Yes | ![#f03c15](https://placehold.it/15/f03c15/000000?text=+) No |
-| Behavior when the device<br>is disconnected while streaming | ![#00aa00](https://placehold.it/15/00aa00/000000?text=+) Shows a black screen<br>with ```NO SIGNAL``` on it<br>until reconnected | ![#f03c15](https://placehold.it/15/f03c15/000000?text=+) 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 | ![#00aa00](https://placehold.it/15/00aa00/000000?text=+) Yes | ![#ffaa00](https://placehold.it/15/ffaa00/000000?text=+) Partially yes <sup>1</sup> |
-| Option to skip frames when streaming<br>static images by HTTP to save the traffic | ![#00aa00](https://placehold.it/15/00aa00/000000?text=+) Yes <sup>2</sup> | ![#f03c15](https://placehold.it/15/f03c15/000000?text=+) No |
-| Streaming via UNIX domain socket | ![#00aa00](https://placehold.it/15/00aa00/000000?text=+) Yes | ![#f03c15](https://placehold.it/15/f03c15/000000?text=+) No |
-| Debug logs without recompiling,<br>performance statistics log,<br>access to HTTP streaming parameters | ![#00aa00](https://placehold.it/15/00aa00/000000?text=+) Yes | ![#f03c15](https://placehold.it/15/f03c15/000000?text=+) No |
-| Option to serve files<br>with a built-in HTTP server | ![#00aa00](https://placehold.it/15/00aa00/000000?text=+) Yes | ![#ffaa00](https://placehold.it/15/ffaa00/000000?text=+) Regular files only |
-| Signaling about the stream state<br>on GPIO using [libgpiod](https://git.kernel.org/pub/scm/libs/libgpiod/libgpiod.git/about) | ![#00aa00](https://placehold.it/15/00aa00/000000?text=+) Yes | ![#f03c15](https://placehold.it/15/f03c15/000000?text=+) No |
-| Access to webcam controls (focus, servos)<br>and settings such as brightness via HTTP | ![#f03c15](https://placehold.it/15/f03c15/000000?text=+) No | ![#00aa00](https://placehold.it/15/00aa00/000000?text=+) Yes |
+| 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> |
+| [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 | ✔ | ✘ |
+| Systemd socket activation | ✔ | ✘ |
+| Debug logs without recompiling,<br>performance statistics log,<br>access to HTTP streaming parameters | ✔ | ✘ |
+| Option to serve files<br>with a built-in HTTP server | ✔ | ☹ Regular files only |
+| Signaling about the stream state<br>on GPIO using [libgpiod](https://git.kernel.org/pub/scm/libs/libgpiod/libgpiod.git/about) | ✔ | ✘ |
+| Access to webcam controls (focus, servos)<br>and settings such as brightness via HTTP | ✘ | ✔ |
+| 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.
-  
+
   * ```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()```.
 
 -----
@@ -33,13 +35,14 @@ If you're going to live-stream from your backyard webcam and need to control it,
 
 -----
 # Building
-You'll need  ```make```, ```gcc```, ```libevent``` with ```pthreads``` support, ```libjpeg8```/```libjpeg-turbo```, ```libuuid``` and ```libbsd``` (only for Linux).
+You'll need  ```make```, ```gcc```, ```libevent``` with ```pthreads``` support, ```libjpeg9```/```libjpeg-turbo``` and ```libbsd``` (only for Linux).
 
 * Arch: `sudo pacman -S libevent libjpeg-turbo libutil-linux libbsd`.
-* Raspbian: `sudo apt install libevent-dev libjpeg8-dev uuid-dev libbsd-dev`. Add `libraspberrypi-dev` for `WITH_OMX=1` and `libgpiod` for `WITH_GPIO=1`.
-* Debian: `sudo apt install build-essential libevent-dev libjpeg62-turbo-dev uuid-dev libbsd-dev`.
+* Raspbian: `sudo apt install libevent-dev libjpeg8-dev libbsd-dev`. Add `libgpiod-dev` for `WITH_GPIO=1` and `libsystemd-dev` for `WITH_SYSTEMD=1`.
+* Debian/Ubuntu: `sudo apt install build-essential libevent-dev libjpeg-dev libbsd-dev`.
+* Alpine: `sudo apk add libevent-dev libbsd-dev libjpeg-turbo-dev musl-dev`. Build with `WITH_PTHREAD_NP=0`.
 
-On Raspberry Pi you can build the program with OpenMAX IL. To do this pass option ```WITH_OMX=1``` to ```make```. To enable GPIO support install [libgpiod](https://git.kernel.org/pub/scm/libs/libgpiod/libgpiod.git/about) and pass option ```WITH_GPIO=1```. If the compiler reports about a missing function ```pthread_get_name_np()``` (or similar), add option ```WITH_PTHREAD_NP=0``` (it's enabled by default). For the similar error with ```setproctitle()``` add option ```WITH_SETPROCTITLE=0```.
+To enable GPIO support install [libgpiod](https://git.kernel.org/pub/scm/libs/libgpiod/libgpiod.git/about) and pass option ```WITH_GPIO=1```. If the compiler reports about a missing function ```pthread_get_name_np()``` (or similar), add option ```WITH_PTHREAD_NP=0``` (it's enabled by default). For the similar error with ```setproctitle()``` add option ```WITH_SETPROCTITLE=0```.
 
 ```
 $ git clone --depth=1 https://github.com/pikvm/ustreamer
@@ -48,11 +51,14 @@ $ make
 $ ./ustreamer --help
 ```
 
-AUR has a package for Arch Linux: https://aur.archlinux.org/packages/ustreamer. It should compile automatically with OpenMAX IL on Raspberry Pi, if the corresponding headers are present in ```/opt/vc/include```.  
+AUR has a package for Arch Linux: https://aur.archlinux.org/packages/ustreamer.
+
 FreeBSD port: https://www.freshports.org/multimedia/ustreamer.
 
 -----
 # Usage
+**For M2M hardware encoding on Raspberry Pi, you need at least 5.15.32 kernel. OpenMAX and MMAL support on older kernels is deprecated and removed.**
+
 Without arguments, ```ustreamer``` will try to open ```/dev/video0``` with 640x480 resolution and start streaming on  ```http://127.0.0.1:8080```. You can override this behavior using parameters ```--device```, ```--host``` and ```--port```. For example, to stream to the world, run:
 ```
 # ./ustreamer --device=/dev/video1 --host=0.0.0.0 --port=80
@@ -64,8 +70,8 @@ The recommended way of running µStreamer with [Auvidea B101](https://www.raspbe
 ```bash
 $ ./ustreamer \
     --format=uyvy \ # Device input format
-    --encoder=omx \ # Hardware encoding with OpenMAX
-    --workers=3 \ # Maximum workers for OpenMAX
+    --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)
     --dv-timings \ # Use DV-timings
     --drop-same-frames=30 # Save the traffic
@@ -75,14 +81,86 @@ $ ./ustreamer \
 
 You can always view the full list of options with ```ustreamer --help```.
 
+# Docker (Raspberry Pi 4 HDMI)
+## Preparations
+
+Add following lines to /boot/firmware/usercfg.txt:
+```
+gpu_mem=128
+dtoverlay=tc358743
+```
+Check size of CMA:
+```bash
+$ dmesg | grep cma-reserved
+[    0.000000] Memory: 7700524K/8244224K available (11772K kernel code, 1278K rwdata, 4320K rodata, 4096K init, 1077K bss, 281556K reserved, 262144K cma-reserved)
+```
+If it is smaller than 128M add following to /boot/firmware/cmdline.txt:
+```
+cma=128M
+```
+Save changes and reboot.
+## Launch
+Start container:
+```bash
+$ docker run --device /dev/video0:/dev/video0 -p 8080:8080 pikvm/ustreamer:latest
+```
+Then access the web interface at port 8080 (e.g. http://raspberrypi.local:8080).
+## EDID
+Container will set HDMI EDID before starging ustreamer. Use `-e NO_EDID=1` to not set EDID. Use `-e EDID_HEX=xx` to specify custom EDID data.
+
+-----
+# Raspberry Pi Camera Example
+Example usage for the Raspberry Pi v1 camera:
+```bash
+$ sudo modprobe bcm2835-v4l2
+$ ./ustreamer --host :: -m jpeg --device-timeout=5 --buffers=3 -r 2592x1944
+```
+
+:exclamation: Please note that newer camera models have a different maximum resolution. You can see the supported resolutions at the [PiCamera documentation](https://picamera.readthedocs.io/en/release-1.13/fov.html#sensor-modes).
+
+:exclamation: If you get a poor framerate, it could be that the camera is switched to photo mode, which produces a low framerate (but a higher quality picture). This is because `bcm2835-v4l2` switches to photo mode at resolutions higher than `1280x720`. To work around this, pass the `max_video_width` and `max_video_height` module parameters like so:
+
+```bash
+$ modprobe bcm2835-v4l2 max_video_width=2592 max_video_height=1944
+```
+
+-----
+# Integrations
+
+## Janus
+µStreamer supports bandwidth-efficient streaming using [H.264 compression](https://en.wikipedia.org/wiki/Advanced_Video_Coding) and the Janus WebRTC server. See the [Janus integration guide](docs/h264.md) for full details.
+
+## Nginx
+When uStreamer is behind an Nginx proxy, it's buffering behavior introduces latency into the video stream. It's possible to disable Nginx's buffering to eliminate the additional latency:
+
+```nginx
+location /stream {
+    postpone_output 0;
+    proxy_buffering off;
+    proxy_ignore_headers X-Accel-Buffering;
+    proxy_pass http://ustreamer;
+}
+```
+
+-----
+# Tips & tricks for v4l2
+v4l2 utilities provide the tools to manage USB webcam setting and information. Scripts can be use to make adjustments and run manually or with cron. Running in cron for example to change the exposure settings at certain times of day. The package is available in all Linux distributions and is usually called `v4l-utils`.
+
+* List of available video devices: `v4l2-ctl --list-devices`.
+* List available control settings: `v4l2-ctl -d /dev/video0 --list-ctrls`.
+* List available video formats: `v4l2-ctl -d /dev/video0 --list-formats-ext`.
+* Read the current setting: `v4l2-ctl -d /dev/video0 --get-ctrl=exposure_auto`.
+* Change the setting value: `v4l2-ctl -d /dev/video0 --set-ctrl=exposure_auto=1`.
+
+[Here](https://www.kurokesu.com/main/2016/01/16/manual-usb-camera-settings-in-linux/) you can find more examples. Documentation is available in [`man v4l2-ctl`](https://www.mankier.com/1/v4l2-ctl).
+
 -----
 # See also
 * [Running uStreamer via systemd service](https://github.com/pikvm/ustreamer/issues/16).
-* [uStreamer Ansible Role](https://github.com/mtlynch/ansible-role-ustreamer): Use [Ansible](https://docs.ansible.com/ansible/latest/index.html) to compile uStreamer and install it as a systemd service automatically.
 
 -----
 # License
-Copyright (C) 2018 by Maxim Devaev mdevaev@gmail.com
+Copyright (C) 2018-2022 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

README.ru.md

@@ -5,26 +5,28 @@
 [[English version]](README.md)
 
 
-µStreamer - это маленький и очень быстрый сервер, который позволяет организовать трансляцию видео в формате [MJPG](https://en.wikipedia.org/wiki/Motion_JPEG) с любого устройства V4L2 в сеть. Этот формат нативно поддерживается всеми современными браузерами и большинством приложений для просмотра видео (mplayer, VLC и так далее). µStreamer был разработан в рамках проекта [Pi-KVM](https://github.com/pikvm/pikvm) специально для стриминга с устройств видеозахвата [VGA](https://www.amazon.com/dp/B0126O0RDC) и [HDMI](https://auvidea.com/b101-hdmi-to-csi-2-bridge-15-pin-fpc/) с максимально возможным разрешением и FPS, которые только позволяет железо.
+µStreamer - это маленький и очень быстрый сервер, который позволяет организовать трансляцию видео в формате [MJPEG](https://en.wikipedia.org/wiki/Motion_JPEG) с любого устройства V4L2 в сеть. Этот формат нативно поддерживается всеми современными браузерами и большинством приложений для просмотра видео (mplayer, VLC и так далее). µStreamer был разработан в рамках проекта [PiKVM](https://github.com/pikvm/pikvm) специально для стриминга с устройств видеозахвата [VGA](https://www.amazon.com/dp/B0126O0RDC) и [HDMI](https://auvidea.com/b101-hdmi-to-csi-2-bridge-15-pin-fpc/) с максимально возможным разрешением и FPS, которые только позволяет железо.
 
 Функционально µStreamer очень похож на [mjpg-streamer](https://github.com/jacksonliam/mjpg-streamer) при использовании им плагинов ```input_uvc.so``` и ```output_http.so```, однако имеет ряд серьезных отличий. Основные приведены в этой таблице:
 
 | **Фича** | **µStreamer** | **mjpg-streamer** |
 |----------|---------------|-------------------|
-| Многопоточное кодирование JPEG | ![#00aa00](https://placehold.it/15/00aa00/000000?text=+) Есть | ![#f03c15](https://placehold.it/15/f03c15/000000?text=+) Нет |
-| Аппаратное кодирование с помощью [OpenMAX IL](https://www.khronos.org/openmaxil) на Raspberry Pi | ![#00aa00](https://placehold.it/15/00aa00/000000?text=+) Есть | ![#f03c15](https://placehold.it/15/f03c15/000000?text=+) Нет |
-| Поведение при физическом отключении<br>устройства от сервера во время работы | ![#00aa00](https://placehold.it/15/00aa00/000000?text=+) Транслирует черный экран<br>с надписью ```NO SIGNAL```,<br>пока устройство не будет подключено снова | ![#f03c15](https://placehold.it/15/f03c15/000000?text=+) Прерывает трансляцию <sup>1</sup> |
-| Поддержка [DV-таймингов](https://linuxtv.org/downloads/v4l-dvb-apis-new/userspace-api/v4l/dv-timings.html) - возможности<br>изменения  параметров разрешения<br>трансляции на лету по сигналу<br>источника (устройства видеозахвата) | ![#00aa00](https://placehold.it/15/00aa00/000000?text=+) Есть | ![#ffaa00](https://placehold.it/15/ffaa00/000000?text=+) Условно есть <sup>1</sup> |
-| Возможность пропуска фреймов при передаче<br>статического изображения по HTTP<br>для экономии трафика | ![#00aa00](https://placehold.it/15/00aa00/000000?text=+) Есть <sup>2</sup> | ![#f03c15](https://placehold.it/15/f03c15/000000?text=+) Нет |
-| Стрим через UNIX domain socket | ![#00aa00](https://placehold.it/15/00aa00/000000?text=+) Есть | ![#f03c15](https://placehold.it/15/f03c15/000000?text=+) Нет |
-| Дебаг-логи без перекомпиляции,<br>логгирование статистики производительности,<br>возможность получения параметров<br>трансляции по HTTP | ![#00aa00](https://placehold.it/15/00aa00/000000?text=+) Есть | ![#f03c15](https://placehold.it/15/f03c15/000000?text=+) Нет |
-| Возможность сервить файлы встроенным<br>HTTP-сервером  | ![#00aa00](https://placehold.it/15/00aa00/000000?text=+) Есть | ![#ffaa00](https://placehold.it/15/ffaa00/000000?text=+) Нет каталогов |
-| Вывод сигналов о состоянии стрима на GPIO<br>с помощью [libgpiod](https://git.kernel.org/pub/scm/libs/libgpiod/libgpiod.git/about) | ![#00aa00](https://placehold.it/15/00aa00/000000?text=+) Есть | ![#f03c15](https://placehold.it/15/f03c15/000000?text=+) Нет |
-| Поддержка контролов веб-камер (фокус,<br> движение сервами) и всяких настроек,<br> типа яркости, через HTTP | ![#f03c15](https://placehold.it/15/f03c15/000000?text=+) Нет | ![#00aa00](https://placehold.it/15/00aa00/000000?text=+) Есть |
+| Многопоточное кодирование JPEG | ✔ | ✘ |
+| Аппаратное кодирование на Raspberry Pi | ✔ | ✘ |
+| Поведение при физическом отключении<br>устройства от сервера во время работы | ✔ Транслирует черный экран<br>с надписью ```NO SIGNAL```,<br>пока устройство не будет подключено снова | ✘ Прерывает трансляцию <sup>1</sup> |
+| Поддержка [DV-таймингов](https://linuxtv.org/downloads/v4l-dvb-apis-new/userspace-api/v4l/dv-timings.html) - возможности<br>изменения  параметров разрешения<br>трансляции на лету по сигналу<br>источника (устройства видеозахвата) | ✔ | ☹ Условно есть <sup>1</sup> |
+| Возможность пропуска фреймов при передаче<br>статического изображения по HTTP<br>для экономии трафика | ✔ <sup>2</sup> | ✘ |
+| Стрим через UNIX domain socket | ✔ | ✘ |
+| Systemd socket activation | ✔ | ✘ |
+| Дебаг-логи без перекомпиляции,<br>логгирование статистики производительности,<br>возможность получения параметров<br>трансляции по HTTP | ✔ | ✘ |
+| Возможность сервить файлы встроенным<br>HTTP-сервером  | ✔ | ☹ Нет каталогов |
+| Вывод сигналов о состоянии стрима на GPIO<br>с помощью [libgpiod](https://git.kernel.org/pub/scm/libs/libgpiod/libgpiod.git/about) | ✔ | ✘ |
+| Поддержка контролов веб-камер (фокус,<br> движение сервами) и всяких настроек,<br> типа яркости, через HTTP | ✘ | ✔ |
+| Совместимость с API mjpg-streamer'а | ✔ | :) |
 
 Сносочки:
   * ```1``` Еще до написания µStreamer, я запилил [патч](https://github.com/jacksonliam/mjpg-streamer/pull/164), добавляющий в mjpg-streamer поддержку DV-таймингов и предотвращающий его зависание при отключении устройства. Однако патч, увы, далек от совершенства и я не гарантирую его стопроцентную работоспособность, поскольку код mjpg-streamer чрезвычайно запутан и очень плохо структурирован. Учитывая это, а также то, что в дальнейшем мне потребовались многопоточность и аппаратное кодирование JPEG, было принято решение написать свой стрим-сервер с нуля, чтобы не тратить силы на поддержку лишнего легаси.
-  
+
   * ```2``` Это фича позволяет в несколько раз снизить объем исходящего трафика при трансляции HDMI, однако немного увеличивает загрузку процессора. Суть в том, что HDMI - полностью цифровой интерфейс, и новый захваченный фрейм может быть идентичен предыдущему в точности до байта. В этом случае нет нужды передавать одну и ту же картинку по сети несколько раз в секунду. При использовании опции `--drop-same-frames=20`, µStreamer будет дропать все одинаковые фреймы, но не более 20 подряд. Новый фрейм сравнивается с предыдущим сначала по длине, а затем помощью ```memcmp()```.
 
 -----
@@ -33,13 +35,13 @@
 
 -----
 # Сборка
-Для сборки вам понадобятся ```make```, ```gcc```, ```libevent``` с поддержкой ```pthreads```, ```libjpeg8```/```libjpeg-turbo```, ```libuuid``` и ```libbsd``` (только для Linux).
+Для сборки вам понадобятся ```make```, ```gcc```, ```libevent``` с поддержкой ```pthreads```, ```libjpeg8```/```libjpeg-turbo``` и ```libbsd``` (только для Linux).
 
 * Arch: `sudo pacman -S libevent libjpeg-turbo libutil-linux libbsd`.
-* Raspbian: `sudo apt install libevent-dev libjpeg8-dev uuid-dev libbsd-dev`.  Добавьте `libraspberrypi-dev` для сборки с `WITH_OMX=1` и `libgpiod` для `WITH_GPIO=1`.
-* Debian: `sudo apt install build-essential libevent-dev libjpeg62-turbo-dev uuid-dev libbsd-dev`.
+* Raspbian: `sudo apt install libevent-dev libjpeg8-dev libbsd-dev`.  Добавьте `libgpiod` для `WITH_GPIO=1` и `libsystemd-dev` для `WITH_SYSTEMD=1`.
+* Debian/Ubuntu: `sudo apt install build-essential libevent-dev libjpeg-dev libbsd-dev`.
 
-На Raspberry Pi программу можно собрать с поддержкой OpenMAX IL. Для этого передайте ```make``` параметр ```WITH_OMX=1```. Для включения сборки с поддержкой GPIO установите [libgpiod](https://git.kernel.org/pub/scm/libs/libgpiod/libgpiod.git/about) и добавьте параметр ```WITH_GPIO=1```. Если при сборке компилятор ругается на отсутствие функции ```pthread_get_name_np()``` или другой подобной, добавьте параметр ```WITH_PTHREAD_NP=0``` (по умолчанию он включен). При аналогичной ошибке с функцией ```setproctitle()``` добавьте параметр ```WITH_SETPROCTITLE=0```.
+Для включения сборки с поддержкой GPIO установите [libgpiod](https://git.kernel.org/pub/scm/libs/libgpiod/libgpiod.git/about) и добавьте параметр ```WITH_GPIO=1```. Если при сборке компилятор ругается на отсутствие функции ```pthread_get_name_np()``` или другой подобной, добавьте параметр ```WITH_PTHREAD_NP=0``` (по умолчанию он включен). При аналогичной ошибке с функцией ```setproctitle()``` добавьте параметр ```WITH_SETPROCTITLE=0```.
 
 ```
 $ git clone --depth=1 https://github.com/pikvm/ustreamer
@@ -48,11 +50,14 @@ $ make
 $ ./ustreamer --help
 ```
 
-Для Arch Linux в AUR есть готовый пакет: https://aur.archlinux.org/packages/ustreamer. На Raspberry Pi програма автоматически собирается с поддержкой OpenMAX IL, если обнаружит нужные хедеры в ```/opt/vc/include```.  
+Для Arch Linux в AUR есть готовый пакет: https://aur.archlinux.org/packages/ustreamer.
+
 Порт для FreeBSD: https://www.freshports.org/multimedia/ustreamer.
 
 -----
 # Использование
+**Для аппаратного кодирования M2M на Raspberry Pi, вам нужно ядро минимальной версии 5.15.32. Поддержка OpenMAX и MMAL для более старых ядер объявлена устаревшей и была удалена.**
+
 Будучи запущенным без аргументов, ```ustreamer``` попробует открыть устройство ```/dev/video0``` с разрешением 640x480 и начать трансляцию на ```http://127.0.0.1:8080```. Это поведение может быть изменено с помощью опций ```--device```, ```--host``` и ```--port```. Пример вещания на всю сеть по 80-м порту:
 ```
 # ./ustreamer --device=/dev/video1 --host=0.0.0.0 --port=80
@@ -64,8 +69,8 @@ $ ./ustreamer --help
 ```bash
 $ ./ustreamer \
     --format=uyvy \ # Настройка входного формата устройства
-    --encoder=omx \ # Использование аппаратного кодирования с помощью OpenMAX
-    --workers=3 \ # Максимум воркеров для OpenMAX
+    --encoder=m2m-image \ # Аппаратное кодирование с помощью драйвера V4L2 M2M
+    --workers=3 \ # Максимум воркеров
     --persistent \ # Не переинициализировать устройство при таймауте (например, когда был отключен HDMI-кабель)
     --dv-timings \ # Включение DV-таймингов
     --drop-same-frames=30 # Экономим трафик
@@ -75,14 +80,56 @@ $ ./ustreamer \
 
 За полным списком опций обращайтесь ко встроенной справке: ```ustreamer --help```.
 
+-----
+# Камера Raspberry Pi
+Пример использования камеры Raspberry Pi v1:
+```bash
+$ sudo modprobe bcm2835-v4l2
+$ ./ustreamer --host :: -m jpeg --device-timeout=5 --buffers=3 -r 2592x1944
+```
+
+:exclamation: Обратите внимание что боле новые модели камеры имеют другое максимальное разрешение. Список поддерживаемых разрешений можно найти в [документации PiCamera](https://picamera.readthedocs.io/en/release-1.13/fov.html#sensor-modes).
+
+:exclamation: Если камера выдает низкий фреймрейт, возможно что она работает в фото-режиме, где производит более низкий фпс, но более качественную кратинку. Это происходит потому что `bcm2835-v4l2` переключает камеру в фото-режим на разрешениях выше `1280x720`. Чтобы обойти это, передайте параметры `max_video_width` и `max_video_height` при загрузке модуля, например:
+
+```bash
+$ modprobe bcm2835-v4l2 max_video_width=2592 max_video_height=1944
+```
+
+-----
+# Интеграция
+
+## Nginx
+Если uStreamer находится на Nginx, то последний будет буферизировать поток и создавать дополнительную задержку в стриме. Чтобы задержки не было, буферизацию можно отключить:
+
+```nginx
+location /stream {
+    postpone_output 0;
+    proxy_buffering off;
+    proxy_ignore_headers X-Accel-Buffering;
+    proxy_pass http://ustreamer;
+}
+```
+
+-----
+# Утилиты V4L2
+V4L2 предоставляет ряд официальных утилит для управления USB-вебкамерами и получения информации об устройствах. С их помощью можно писать всякие настроечные скрипты и запускать их по крону, если, например, вам требуется изменять настройки экспозиции в зависимости от времени суток. Пакет с этими утилитами доступен на всех дистрибутивах Linux и обычно называется `v4l-utils`.
+
+* Вывести список видеоустройств: `v4l2-ctl --list-devices`.
+* Вывести список доступных контролов устройства: `v4l2-ctl -d /dev/video0 --list-ctrls`.
+* Вывести список доступных форматов видео: `v4l2-ctl -d /dev/video0 --list-formats-ext`.
+* Показать текущее значение контрола: `v4l2-ctl -d /dev/video0 --get-ctrl=exposure_auto`.
+* Изменить значение контрола: `v4l2-ctl -d /dev/video0 --set-ctrl=exposure_auto=1`.
+
+Больше примеров вы можете найти [здесь](https://www.kurokesu.com/main/2016/01/16/manual-usb-camera-settings-in-linux/), а документацию в [`man v4l2-ctl`](https://www.mankier.com/1/v4l2-ctl).
+
 -----
 # Смотрите также
 * [Запуск с помощью systemd-сервиса](https://github.com/pikvm/ustreamer/issues/16).
-* [uStreamer Ansible Role](https://github.com/mtlynch/ansible-role-ustreamer): Использование [Ansible](https://docs.ansible.com/ansible/latest/index.html) для сборки и установки стримера как systemd-сервиса.
 
 -----
 # Лицензия
-Copyright (C) 2018 by Maxim Devaev mdevaev@gmail.com
+Copyright (C) 2018-2022 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

docs/h264.md

@@ -0,0 +1,231 @@
+# Streaming H.264 Video over WebRTC with Janus
+
+µStreamer supports bandwidth-efficient streaming using [H.264 compression](https://en.wikipedia.org/wiki/Advanced_Video_Coding) and the Janus WebRTC server.
+
+This guide explains how to configure µStreamer to provide an H.264 video stream and consume it within a web application using WebRTC.
+
+## Components
+
+In addition to µStreamer, H.264 streaming involves the following components:
+
+- [**Janus**](https://janus.conf.meetecho.com/): A general-purpose WebRTC server.
+- [**µStreamer Janus Plugin**](https://github.com/pikvm/ustreamer/tree/master/janus): A Janus plugin that allows Janus to consume a video stream from µStreamer via shared memory.
+- [**Janus JavaScript Client**](https://janus.conf.meetecho.com/docs/JS.html): A frontend library that communicates with the Janus server and the µStreamer Janus plugin.
+
+## Control Flow
+
+To connect to a µStreamer video stream over WebRTC, an application must establish the following control flow:
+
+1. The backend server starts the µStreamer service.
+1. The backend server starts the Janus WebRTC server with the µStreamer Janus plugin.
+1. The client-side JavaScript application establishes a connection to the Janus server.
+1. The client-side JavaScript application instructs the Janus server to attach the µStreamer Janus plugin and start the video stream.
+1. The client-side JavaScript application renders the video stream in the web browser.
+
+## Server Setup
+
+### Prerequisites
+
+To integrate with Janus, µStreamer has the following prerequisites:
+
+- The system packages that µStreamer depends on (see the [main build instructions](../README.md#building)).
+- The Janus WebRTC server with WebSockets transport enabled (see the [Janus documentation](https://github.com/meetecho/janus-gateway)).
+
+### Fixing Janus C Headers
+
+To compile µStreamer with the Janus option, (see [“Installation”](#installation)), you need to make the Janus header files available within µStreamer's build context.
+
+First, create a symbolic link from `/usr/include` to the Janus install directory. By default, Janus installs to `/opt/janus`.
+
+```sh
+ln -s /opt/janus/include/janus /usr/include/janus
+```
+
+Janus uses `#include` paths that make it difficult for third-party libraries to build against its headers. To fix this, modify the `#include` directive in `janus/plugins/plugin.h` to prepend a `../` to the included file name (`#include "refcount.h"` → `#include "../refcount.h"`).
+
+```sh
+sed \
+  --in-place \
+  --expression 's|^#include "refcount.h"$|#include "../refcount.h"|g' \
+  /usr/include/janus/plugins/plugin.h
+```
+
+### Installation
+
+First, compile µStreamer with the Janus plugin option (`WITH_JANUS`).
+
+```sh
+git clone --depth=1 https://github.com/pikvm/ustreamer
+cd ustreamer
+make WITH_JANUS=1
+```
+
+The `WITH_JANUS` option compiles the µStreamer Janus plugin and outputs it to `janus/libjanus_ustreamer.so`. Move this file to the plugin directory of your Janus installation.
+
+```sh
+mv \
+  janus/libjanus_ustreamer.so \
+  /opt/janus/lib/janus/plugins/libjanus_ustreamer.so
+```
+
+Finally, specify a qualifier for the shared memory object so that the µStreamer Janus plugin can read  µStreamer's video data.
+
+```sh
+cat > /opt/janus/lib/janus/configs/janus.plugin.ustreamer.jcfg <<EOF
+memsink: {
+  object = "demo::ustreamer::h264"
+}
+EOF
+```
+
+### Start µStreamer and the Janus WebRTC Server
+
+For µStreamer to share the video stream with the µStreamer Janus plugin, µStreamer must run with the following command-line flags:
+
+- `--h264-sink` with the qualifier of the shared memory object you specified above (`demo::ustreamer::h264`)
+- `--h264-sink-mode` with the permissions bitmask for the shared memory object (e.g., `660`)
+- `--h264-sink-rm` to clean up the shared memory object when the µStreamer process exits
+
+To load the µStreamer Janus plugin and configuration, the Janus WebRTC server must run with the following command-line flags:
+
+- `--configs-folder` with the path to the Janus configuration directory (e.g., `/opt/janus/lib/janus/configs/`)
+- `--plugins-folder` with the path to the Janus plugin directory (e.g., `/opt/janus/lib/janus/plugins/`)
+
+## Client Setup
+
+Once an application's backend server is running µStreamer and Janus, a browser-based JavaScript application can consume the server's video stream.
+
+### Prerequisites
+
+The client needs to load the following JavaScript libraries:
+
+- [WebRTC Adapter library](https://webrtc.github.io/adapter/adapter-8.1.0.js) (`webrtc-adapter.js`, version `8.1.0`)
+- [Janus Gateway JavaScript library](https://raw.githubusercontent.com/meetecho/janus-gateway/v1.0.0/html/janus.js) (`janus.js`, version `1.0.0`)
+
+### Control Flow
+
+The client-side JavaScript application uses the following control flow:
+
+1. The client loads and initializes the Janus client library.
+1. The client establishes a WebSockets connection to the Janus server.
+1. The client instructs the Janus server to attach the µStreamer Janus plugin.
+1. On success, the client obtains a plugin handle through which it can send requests directly to the µStreamer Janus plugin. The client processes responses via the `attach` callbacks:
+   - `onmessage` for general messages
+   - `onremotetrack` for the H.264 video stream
+1. The client issues a `watch` request to the µStreamer Janus plugin, which initiates the H.264 stream in the plugin itself.
+   - It takes a few seconds for uStreamer's video stream to become available to Janus. The first `watch` request may fail, so the client must retry the `watch` request.
+1. The client and server negotiate the underlying parameters of the WebRTC session. This procedure is called JavaScript Session Establishment Protocol (JSEP). The server makes a `jsepOffer` to the client, and the client responds with a `jsepAnswer`.
+1. The client issues a `start` request to the µStreamer Janus plugin to indicate that the client wants to begin consuming the video stream.
+1. The µStreamer Janus plugin delivers the H.264 video stream to the client via WebRTC.
+1. The Janus client library invokes the `onremotetrack` callback. The client attaches the video stream to the `<video>` element, rendering the video stream in the browser window.
+
+### Sample Code
+
+```html
+<!DOCTYPE html>
+<html>
+<head>
+  <meta charset="utf-8">
+  <title>µStreamer H.264 demo</title>
+  <script src="https://webrtc.github.io/adapter/adapter-8.1.0.js"></script>
+  <!-- janus.js is the JavaScript client library of Janus, as specified above in
+       the prerequisites section of the client setup. You might need to change
+       the `src` path, depending on where you serve this file from. -->
+  <script src="janus.js"></script>
+  <style>
+    video {
+      height: 100%;
+      width: 100%;
+      object-fit: contain;
+    }
+  </style>
+</head>
+<body>
+  <video id="webrtc-output" autoplay playsinline muted></video>
+  <script type="text/javascript">
+    // Initialize Janus library.
+    Janus.init({
+      // Turn on debug logs in the browser console.
+      debug: true,
+
+      // Configure Janus to use standard browser APIs internally.
+      dependencies: Janus.useDefaultDependencies(),
+    });
+
+    // Establish a WebSockets connection to the server.
+    const janus = new Janus({
+      // Specify the URL of the Janus server’s WebSockets endpoint.
+      server: `ws://${window.location.hostname}:8188/`,
+
+      // Callback function if the client connects successfully.
+      success: attachUStreamerPlugin,
+
+      // Callback function if the client fails to connect.
+      error: console.error,
+    });
+
+    let uStreamerPluginHandle = null;
+
+    function attachUStreamerPlugin() {
+      // Instruct the server to attach the µStreamer Janus plugin.
+      janus.attach({
+        // Qualifier of the plugin.
+        plugin: "janus.plugin.ustreamer",
+
+        // Callback function, for when the server attached the plugin
+        // successfully.
+        success: function (pluginHandle) {
+          uStreamerPluginHandle = pluginHandle;
+          // Instruct the µStreamer Janus plugin to initiate the video stream.
+          uStreamerPluginHandle.send({ message: { request: "watch" } });
+        },
+
+        // Callback function if the server fails to attach the plugin.
+        error: console.error,
+
+        // Callback function for processing messages from the Janus server.
+        onmessage: function (msg, jsepOffer) {
+          // 503 indicates that the plugin is not ready to stream yet. Retry the
+          // watch request until the video stream is available.
+          if (msg.error_code === 503) {
+            uStreamerPluginHandle.send({ message: { request: "watch" } });
+            return;
+          }
+
+          // If there is a JSEP offer, respond to it. This starts the WebRTC
+          // connection.
+          if (jsepOffer) {
+            uStreamerPluginHandle.createAnswer({
+              jsep: jsepOffer,
+              // Prevent the client from sending audio and video, as this would
+              // trigger a permission dialog in the browser.
+              media: { audioSend: false, videoSend: false },
+              success: function (jsepAnswer) {
+                uStreamerPluginHandle.send({
+                  message: { request: "start" },
+                  jsep: jsepAnswer,
+                });
+              },
+              error: console.error,
+            });
+          }
+        },
+
+        // Callback function, for when the video stream arrives.
+        onremotetrack: function (mediaStreamTrack, mediaId, isAdded) {
+          if (isAdded) {
+            // Attach the received media track to the video element. Cloning the
+            // mediaStreamTrack creates a new object with a distinct, globally
+            // unique stream identifier.
+            const videoElement = document.getElementById("webrtc-output");
+            const stream = new MediaStream();
+            stream.addTrack(mediaStreamTrack.clone());
+            videoElement.srcObject = stream;
+          }
+        },
+      });
+    }
+  </script>
+</body>
+</html>
+```

janus/Makefile

@@ -0,0 +1,54 @@
+DESTDIR ?=
+PREFIX ?= /usr/local
+
+CC ?= gcc
+CFLAGS ?= -O3
+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)
+
+_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
+
+
+WITH_PTHREAD_NP ?= 1
+ifneq ($(call optbool,$(WITH_PTHREAD_NP)),)
+override _CFLAGS += -DWITH_PTHREAD_NP
+endif
+
+
+# =====
+$(_PLUGIN): $(_SRCS:%.c=$(_BUILD)/%.o)
+	$(info == SO $@)
+	@ $(CC) $^ -o $@ $(_LDFLAGS)
+
+
+$(_BUILD)/%.o: %.c
+	$(info -- CC $<)
+	@ mkdir -p $(dir $@) || true
+	@ $(CC) $< -o $@ $(_CFLAGS)
+
+
+
+install: $(_PLUGIN)
+	mkdir -p $(DESTDIR)$(PREFIX)/lib/ustreamer/janus
+	install -m755 $(_PLUGIN) $(DESTDIR)$(PREFIX)/lib/ustreamer/janus/$(PLUGIN)
+
+
+clean:
+	rm -rf $(_PLUGIN) $(_BUILD)
+
+
+_OBJS = $(_SRCS:%.c=$(_BUILD)/%.o)
+-include $(_OBJS:%.o=%.d)

janus/src/audio.c

@@ -0,0 +1,242 @@
+/*****************************************************************************
+#                                                                            #
+#    uStreamer - Lightweight and fast MJPEG-HTTP streamer.                   #
+#                                                                            #
+#    Copyright (C) 2018-2022  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);
+
+
+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/audio.h

@@ -0,0 +1,69 @@
+/*****************************************************************************
+#                                                                            #
+#    uStreamer - Lightweight and fast MJPEG-HTTP streamer.                   #
+#                                                                            #
+#    Copyright (C) 2018-2022  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 <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 "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;
+
+
+us_audio_s *us_audio_init(const char *name, unsigned pcm_hz);
+void us_audio_destroy(us_audio_s *audio);
+
+int us_audio_get_encoded(us_audio_s *audio, uint8_t *data, size_t *size, uint64_t *pts);

janus/src/client.c

@@ -0,0 +1,119 @@
+/*****************************************************************************
+#                                                                            #
+#    uStreamer - Lightweight and fast MJPEG-HTTP streamer.                   #
+#                                                                            #
+#    Copyright (C) 2018-2022  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 "client.h"
+
+
+static void *_video_thread(void *v_client);
+static void *_audio_thread(void *v_client);
+static void *_common_thread(void *v_client, bool video);
+
+
+us_janus_client_s *us_janus_client_init(janus_callbacks *gw, janus_plugin_session *session, bool has_audio) {
+	us_janus_client_s *client;
+	US_CALLOC(client, 1);
+	client->gw = gw;
+	client->session = session;
+	atomic_init(&client->transmit, true);
+
+	atomic_init(&client->stop, false);
+
+	client->video_queue = us_queue_init(1024);
+	US_THREAD_CREATE(client->video_tid, _video_thread, client);
+
+	if (has_audio) {
+		client->audio_queue = us_queue_init(64);
+		US_THREAD_CREATE(client->audio_tid, _audio_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);
+	if (client->audio_queue != NULL) {
+		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);
+	if (client->audio_queue != NULL) {
+		US_THREAD_JOIN(client->audio_tid);
+		US_QUEUE_DELETE_WITH_ITEMS(client->audio_queue, us_rtp_destroy);
+	}
+	free(client);
+}
+
+void us_janus_client_send(us_janus_client_s *client, const us_rtp_s *rtp) {
+	if (
+		!atomic_load(&client->transmit)
+		|| (!rtp->video && client->audio_queue == NULL)
+	) {
+		return;
+	}
+	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);
+	}
+}
+
+static void *_video_thread(void *v_client) {
+	return _common_thread(v_client, true);
+}
+
+static void *_audio_thread(void *v_client) {
+	return _common_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
+
+	while (!atomic_load(&client->stop)) {
+		us_rtp_s *rtp;
+		if (!us_queue_get(queue, (void **)&rtp, 0.1)) {
+			if (rtp == NULL) {
+				break;
+			}
+			if (atomic_load(&client->transmit)) {
+				janus_plugin_rtp packet = {0};
+				packet.video = rtp->video;
+				packet.buffer = (char *)rtp->datagram;
+				packet.length = rtp->used;
+				janus_plugin_rtp_extensions_reset(&packet.extensions);
+				// FIXME: Это очень эффективный способ уменьшить задержку, но WebRTC стек в хроме и фоксе
+				// слишком корявый, чтобы обработать это, из-за чего на кейфреймах начинаются заикания.
+				//   - https://github.com/Glimesh/janus-ftl-plugin/issues/101
+				if (rtp->zero_playout_delay) {
+					packet.extensions.min_delay = 0;
+					packet.extensions.max_delay = 0;
+				}
+				client->gw->relay_rtp(client->session, &packet);
+			}
+			us_rtp_destroy(rtp);
+		}
+	}
+	return NULL;
+}

janus/src/client.h

@@ -1,8 +1,8 @@
 /*****************************************************************************
 #                                                                            #
-#    uStreamer - Lightweight and fast MJPG-HTTP streamer.                    #
+#    uStreamer - Lightweight and fast MJPEG-HTTP streamer.                   #
 #                                                                            #
-#    Copyright (C) 2018  Maxim Devaev <mdevaev@gmail.com>                    #
+#    Copyright (C) 2018-2022  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,30 +22,40 @@
 
 #pragma once
 
-#include <stddef.h>
+#include <stdlib.h>
 #include <stdbool.h>
+#include <stdatomic.h>
+#include <string.h>
+
+#include <pthread.h>
+#include <janus/plugins/plugin.h>
+
+#include "uslibs/tools.h"
+#include "uslibs/threading.h"
+#include "uslibs/list.h"
+
+#include "logging.h"
+#include "queue.h"
+#include "rtp.h"
 
 
-struct picture_t {
-	unsigned char	*data;
-	size_t			used;
-	size_t			allocated;
-	unsigned		width;
-	unsigned		height;
-	long double		grab_ts;
-	long double		encode_begin_ts;
-	long double		encode_end_ts;
-};
+typedef struct us_janus_client_sx {
+	janus_callbacks			*gw;
+    janus_plugin_session	*session;
+    atomic_bool				transmit;
+
+	pthread_t	video_tid;
+	pthread_t	audio_tid;
+	atomic_bool	stop;
+
+	us_queue_s		*video_queue;
+	us_queue_s		*audio_queue;
+
+    US_LIST_STRUCT(struct us_janus_client_sx);
+} us_janus_client_s;
 
 
-struct picture_t *picture_init(void);
-void picture_destroy(struct picture_t *picture);
+us_janus_client_s *us_janus_client_init(janus_callbacks *gw, janus_plugin_session *session, bool has_audio);
+void us_janus_client_destroy(us_janus_client_s *client);
 
-size_t picture_get_generous_size(unsigned width, unsigned height);
-
-void picture_realloc_data(struct picture_t *picture, size_t size);
-void picture_set_data(struct picture_t *picture, const unsigned char *data, size_t size);
-void picture_append_data(struct picture_t *picture, const unsigned char *data, size_t size);
-
-void picture_copy(const struct picture_t *src, struct picture_t *dest);
-bool picture_compare(const struct picture_t *a, const struct picture_t *b);
+void us_janus_client_send(us_janus_client_s *client, const us_rtp_s *rtp);

janus/src/config.c

@@ -0,0 +1,99 @@
+/*****************************************************************************
+#                                                                            #
+#    uStreamer - Lightweight and fast MJPEG-HTTP streamer.                   #
+#                                                                            #
+#    Copyright (C) 2018-2022  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 "config.h"
+
+
+static char *_get_value(janus_config *jcfg, const char *section, const char *option);
+static bool _get_bool(janus_config *jcfg, const char *section, const char *option, bool def);
+
+
+us_config_s *us_config_init(const char *config_dir_path) {
+	us_config_s *config;
+	US_CALLOC(config, 1);
+
+	char *config_file_path;
+	janus_config *jcfg = NULL;
+
+	US_ASPRINTF(config_file_path, "%s/%s.jcfg", config_dir_path, US_PLUGIN_PACKAGE);
+	US_JLOG_INFO("config", "Reading config file '%s' ...", config_file_path);
+
+	jcfg = janus_config_parse(config_file_path);
+	if (jcfg == NULL) {
+		US_JLOG_ERROR("config", "Can't read config");
+		goto error;
+	}
+	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)");
+		goto error;
+	}
+	if ((config->video_zero_playout_delay = _get_bool(jcfg, "video", "zero_playout_delay", false)) == true) {
+		US_JLOG_INFO("config", "Enabled the experimental Playout-Delay=0 RTP extension for VIDEO");
+	}
+	if ((config->audio_dev_name = _get_value(jcfg, "audio", "device")) != NULL) {
+		US_JLOG_INFO("config", "Enabled the experimental AUDIO feature");
+		if ((config->tc358743_dev_path = _get_value(jcfg, "audio", "tc358743")) == NULL) {
+			US_JLOG_INFO("config", "Missing config value: audio.tc358743");
+			goto error;
+		}
+	}
+
+	goto ok;
+	error:
+		us_config_destroy(config);
+		config = NULL;
+	ok:
+		US_DELETE(jcfg, janus_config_destroy);
+		free(config_file_path);
+		return config;
+}
+
+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->tc358743_dev_path, free);
+	free(config);
+}
+
+static char *_get_value(janus_config *jcfg, const char *section, const char *option) {
+	janus_config_category *section_obj = janus_config_get_create(jcfg, NULL, janus_config_type_category, section);
+	janus_config_item *option_obj = janus_config_get(jcfg, section_obj, janus_config_type_item, option);
+	if (option_obj == NULL || option_obj->value == NULL || option_obj->value[0] == '\0') {
+		return NULL;
+	}
+	return us_strdup(option_obj->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;
+	if (tmp != NULL) {
+		value = (!strcasecmp(tmp, "1") || !strcasecmp(tmp, "true") || !strcasecmp(tmp, "yes"));
+		free(tmp);
+	}
+	return value;
+}

janus/src/config.h

@@ -0,0 +1,47 @@
+/*****************************************************************************
+#                                                                            #
+#    uStreamer - Lightweight and fast MJPEG-HTTP streamer.                   #
+#                                                                            #
+#    Copyright (C) 2018-2022  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 <stdlib.h>
+#include <string.h>
+
+#include <janus/config.h>
+#include <janus/plugins/plugin.h>
+
+#include "uslibs/tools.h"
+
+#include "const.h"
+#include "logging.h"
+
+
+typedef struct {
+	char	*video_sink_name;
+	bool	video_zero_playout_delay;
+
+	char	*audio_dev_name;
+	char	*tc358743_dev_path;
+} us_config_s;
+
+
+us_config_s *us_config_init(const char *config_dir_path);
+void us_config_destroy(us_config_s *config);

janus/src/const.h

@@ -1,8 +1,8 @@
 /*****************************************************************************
 #                                                                            #
-#    uStreamer - Lightweight and fast MJPG-HTTP streamer.                    #
+#    uStreamer - Lightweight and fast MJPEG-HTTP streamer.                   #
 #                                                                            #
-#    Copyright (C) 2018  Maxim Devaev <mdevaev@gmail.com>                    #
+#    Copyright (C) 2018-2022  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,5 @@
 
 #pragma once
 
-#ifndef VERSION
-#	define VERSION "1.26"
-#endif
+#define US_PLUGIN_NAME		"ustreamer"
+#define US_PLUGIN_PACKAGE	"janus.plugin.ustreamer"

janus/src/logging.h

@@ -0,0 +1,38 @@
+/*****************************************************************************
+#                                                                            #
+#    uStreamer - Lightweight and fast MJPEG-HTTP streamer.                   #
+#                                                                            #
+#    Copyright (C) 2018-2022  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 <janus/plugins/plugin.h>
+
+#include "uslibs/tools.h"
+
+#include "const.h"
+
+
+#define US_JLOG_INFO(x_prefix, x_msg, ...)	JANUS_LOG(LOG_INFO, "== %s/%-9s -- " x_msg "\n", US_PLUGIN_NAME, x_prefix, ##__VA_ARGS__)
+#define US_JLOG_WARN(x_prefix, x_msg, ...)	JANUS_LOG(LOG_WARN, "== %s/%-9s -- " x_msg "\n", US_PLUGIN_NAME, x_prefix, ##__VA_ARGS__)
+#define US_JLOG_ERROR(x_prefix, x_msg, ...)	JANUS_LOG(LOG_ERR, "== %s/%-9s -- " x_msg "\n", US_PLUGIN_NAME, x_prefix, ##__VA_ARGS__)
+
+#define US_JLOG_PERROR(x_prefix, x_msg, ...) { \
+		char *const m_perror_str = us_errno_to_string(errno); \
+		JANUS_LOG(LOG_ERR, "[%s/%-9s] " x_msg ": %s\n", US_PLUGIN_NAME, x_prefix, ##__VA_ARGS__, m_perror_str); \
+		free(m_perror_str); \
+	}

janus/src/memsinkfd.c

@@ -0,0 +1,70 @@
+/*****************************************************************************
+#                                                                            #
+#    uStreamer - Lightweight and fast MJPEG-HTTP streamer.                   #
+#                                                                            #
+#    Copyright (C) 2018-2022  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 "memsinkfd.h"
+
+
+int us_memsink_fd_wait_frame(int fd, us_memsink_shared_s* mem, uint64_t last_id) {
+	const long double deadline_ts = us_get_now_monotonic() + 1; // wait_timeout
+	long double now;
+	do {
+		const int result = us_flock_timedwait_monotonic(fd, 1); // lock_timeout
+		now = us_get_now_monotonic();
+		if (result < 0 && errno != EWOULDBLOCK) {
+			US_JLOG_PERROR("video", "Can't lock memsink");
+			return -1;
+		} else if (result == 0) {
+			if (mem->magic == US_MEMSINK_MAGIC && mem->version == US_MEMSINK_VERSION && mem->id != last_id) {
+				return 0;
+			}
+			if (flock(fd, LOCK_UN) < 0) {
+				US_JLOG_PERROR("video", "Can't unlock memsink");
+				return -1;
+			}
+		}
+		usleep(1000); // lock_polling
+	} while (now < deadline_ts);
+	return -2;
+}
+
+us_frame_s *us_memsink_fd_get_frame(int fd, us_memsink_shared_s *mem, uint64_t *frame_id) {
+	us_frame_s *frame = us_frame_init();
+	us_frame_set_data(frame, mem->data, mem->used);
+	US_FRAME_COPY_META(mem, frame);
+	*frame_id = mem->id;
+	mem->last_client_ts = us_get_now_monotonic();
+
+	bool ok = true;
+	if (frame->format != V4L2_PIX_FMT_H264) {
+		US_JLOG_ERROR("video", "Got non-H264 frame from memsink");
+		ok = false;
+	}
+	if (flock(fd, LOCK_UN) < 0) {
+		US_JLOG_PERROR("video", "Can't unlock memsink");
+		ok = false;
+	}
+	if (!ok) {
+		us_frame_destroy(frame);
+		frame = NULL;
+	}
+	return frame;
+}

janus/src/memsinkfd.h

@@ -0,0 +1,38 @@
+/*****************************************************************************
+#                                                                            #
+#    uStreamer - Lightweight and fast MJPEG-HTTP streamer.                   #
+#                                                                            #
+#    Copyright (C) 2018-2022  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 <stdint.h>
+#include <unistd.h>
+
+#include <linux/videodev2.h>
+
+#include "uslibs/tools.h"
+#include "uslibs/frame.h"
+#include "uslibs/memsinksh.h"
+
+#include "logging.h"
+
+
+int us_memsink_fd_wait_frame(int fd, us_memsink_shared_s* mem, uint64_t last_id);
+us_frame_s *us_memsink_fd_get_frame(int fd, us_memsink_shared_s *mem, uint64_t *frame_id);

janus/src/plugin.c

@@ -0,0 +1,504 @@
+/*****************************************************************************
+#                                                                            #
+#    uStreamer - Lightweight and fast MJPEG-HTTP streamer.                   #
+#                                                                            #
+#    Copyright (C) 2018-2022  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 <stdint.h>
+#include <stdbool.h>
+#include <stdatomic.h>
+#include <stdlib.h>
+#include <inttypes.h>
+#include <unistd.h>
+#include <fcntl.h>
+#include <assert.h>
+
+#include <sys/mman.h>
+#include <sys/stat.h>
+
+#include <pthread.h>
+#include <jansson.h>
+#include <janus/plugins/plugin.h>
+
+#include "uslibs/const.h"
+#include "uslibs/tools.h"
+#include "uslibs/threading.h"
+#include "uslibs/list.h"
+#include "uslibs/memsinksh.h"
+
+#include "const.h"
+#include "logging.h"
+#include "queue.h"
+#include "client.h"
+#include "audio.h"
+#include "tc358743.h"
+#include "rtp.h"
+#include "rtpv.h"
+#include "rtpa.h"
+#include "memsinkfd.h"
+#include "config.h"
+
+
+static us_config_s	*_g_config = NULL;
+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_rtpv_s			*_g_rtpv = NULL;
+static us_rtpa_s			*_g_rtpa = NULL;
+
+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_mutex_t	_g_video_lock = PTHREAD_MUTEX_INITIALIZER;
+static pthread_mutex_t	_g_audio_lock = PTHREAD_MUTEX_INITIALIZER;
+static atomic_bool		_g_ready = false;
+static atomic_bool		_g_stop = false;
+static atomic_bool		_g_has_watchers = 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_ALL		{ _LOCK_VIDEO; _LOCK_AUDIO; }
+#define _UNLOCK_ALL		{ _UNLOCK_AUDIO; _UNLOCK_VIDEO; }
+
+#define _READY			atomic_load(&_g_ready)
+#define _STOP			atomic_load(&_g_stop)
+#define _HAS_WATCHERS	atomic_load(&_g_has_watchers)
+
+
+janus_plugin *create(void);
+
+
+#define _IF_NOT_REPORTED(...) { \
+		const unsigned _error_code = __LINE__; \
+		if (error_reported != _error_code) { __VA_ARGS__; error_reported = _error_code; } \
+	}
+
+static void *_video_rtp_thread(UNUSED void *arg) {
+	US_THREAD_RENAME("us_video_rtp");
+	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) {
+			_LOCK_VIDEO;
+			us_rtpv_wrap(_g_rtpv, frame);
+			_UNLOCK_VIDEO;
+			us_frame_destroy(frame);
+		}
+	}
+	return NULL;
+}
+
+static void *_video_sink_thread(UNUSED void *arg) {
+	US_THREAD_RENAME("us_video_sink");
+	atomic_store(&_g_video_sink_tid_created, true);
+
+	uint64_t frame_id = 0;
+	unsigned error_reported = 0;
+
+	while (!_STOP) {
+		if (!_HAS_WATCHERS) {
+			_IF_NOT_REPORTED({ US_JLOG_INFO("video", "No active watchers, memsink disconnected"); });
+			usleep(_g_watchers_polling);
+			continue;
+		}
+
+		int fd = -1;
+		us_memsink_shared_s *mem = NULL;
+
+		if ((fd = shm_open(_g_config->video_sink_name, O_RDWR, 0)) <= 0) {
+			_IF_NOT_REPORTED({ US_JLOG_PERROR("video", "Can't open memsink"); });
+			goto close_memsink;
+		}
+
+		if ((mem = us_memsink_shared_map(fd)) == NULL) {
+			_IF_NOT_REPORTED({ US_JLOG_PERROR("video", "Can't map memsink"); });
+			goto close_memsink;
+		}
+
+		error_reported = 0;
+
+		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);
+				if (frame == NULL) {
+					goto close_memsink;
+				}
+				if (us_queue_put(_g_video_queue, frame, 0) != 0) {
+					_IF_NOT_REPORTED({ US_JLOG_PERROR("video", "Video queue is full"); });
+					us_frame_destroy(frame);
+				}
+			} else if (result == -1) {
+				goto close_memsink;
+			}
+		}
+
+		close_memsink:
+			if (mem != NULL) {
+				US_JLOG_INFO("video", "Memsink closed");
+				us_memsink_shared_unmap(mem);
+			}
+			if (fd >= 0) {
+				close(fd);
+			}
+			sleep(1); // error_delay
+	}
+	return NULL;
+}
+
+static void *_audio_thread(UNUSED void *arg) {
+	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);
+
+	unsigned error_reported = 0;
+
+	while (!_STOP) {
+		if (!_HAS_WATCHERS) {
+			usleep(_g_watchers_polling);
+			continue;
+		}
+
+		us_tc358743_info_s info = {0};
+		us_audio_s *audio = NULL;
+
+		if (us_tc358743_read_info(_g_config->tc358743_dev_path, &info) < 0) {
+			goto close_audio;
+		}
+		if (!info.has_audio) {
+			_IF_NOT_REPORTED({ US_JLOG_INFO("audio", "No audio presented from the host"); });
+			goto close_audio;
+		}
+		_IF_NOT_REPORTED({ US_JLOG_INFO("audio", "Detected host audio"); });
+		if ((audio = us_audio_init(_g_config->audio_dev_name, info.audio_hz)) == NULL) {
+			goto close_audio;
+		}
+
+		error_reported = 0;
+
+		while (!_STOP && _HAS_WATCHERS) {
+			if (
+				us_tc358743_read_info(_g_config->tc358743_dev_path, &info) < 0
+				|| !info.has_audio
+				|| audio->pcm_hz != info.audio_hz
+			) {
+				goto close_audio;
+			}
+
+			size_t size = US_RTP_DATAGRAM_SIZE - US_RTP_HEADER_SIZE;
+			uint8_t data[size];
+			uint64_t pts;
+			const int result = us_audio_get_encoded(audio, data, &size, &pts);
+			if (result == 0) {
+				_LOCK_AUDIO;
+				us_rtpa_wrap(_g_rtpa, data, size, pts);
+				_UNLOCK_AUDIO;
+			} else if (result == -1) {
+				goto close_audio;
+			}
+		}
+
+		close_audio:
+			US_DELETE(audio, us_audio_destroy);
+			sleep(1); // error_delay
+	}
+	return NULL;
+}
+
+#undef _IF_NOT_REPORTED
+
+static void _relay_rtp_clients(const us_rtp_s *rtp) {
+	US_LIST_ITERATE(_g_clients, client, {
+		us_janus_client_send(client, rtp);
+	});
+}
+
+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 
+	// sysctl -w net.core.wmem_default=500000 
+	// sysctl -w net.core.rmem_max=1000000 
+	// sysctl -w net.core.wmem_max=1000000
+
+	US_JLOG_INFO("main", "Initializing PiKVM uStreamer plugin %s ...", US_VERSION);
+	if (gw == NULL || config_dir_path == NULL || ((_g_config = us_config_init(config_dir_path)) == NULL)) {
+		return -1;
+	}
+	_g_gw = gw;
+
+	_g_video_queue = us_queue_init(1024);
+	_g_rtpv = us_rtpv_init(_relay_rtp_clients, _g_config->video_zero_playout_delay);
+	if (_g_config->audio_dev_name != NULL) {
+		_g_rtpa = us_rtpa_init(_relay_rtp_clients);
+		US_THREAD_CREATE(_g_audio_tid, _audio_thread, NULL);
+	}
+	US_THREAD_CREATE(_g_video_rtp_tid, _video_rtp_thread, NULL);
+	US_THREAD_CREATE(_g_video_sink_tid, _video_sink_thread, NULL);
+
+	atomic_store(&_g_ready, true);
+	return 0;
+}
+
+static void _plugin_destroy(void) {
+	US_JLOG_INFO("main", "Destroying plugin ...");
+
+	atomic_store(&_g_stop, true);
+#	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);
+#	undef JOIN
+
+	US_LIST_ITERATE(_g_clients, client, {
+		US_LIST_REMOVE(_g_clients, client);
+		us_janus_client_destroy(client);
+	});
+
+	US_QUEUE_DELETE_WITH_ITEMS(_g_video_queue, 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;
+	US_JLOG_INFO("main", "Creating session %p ...", session);
+	us_janus_client_s *const client = us_janus_client_init(_g_gw, session, (_g_config->audio_dev_name != NULL));
+	US_LIST_APPEND(_g_clients, client);
+	atomic_store(&_g_has_watchers, true);
+	_UNLOCK_ALL;
+}
+
+static void _plugin_destroy_session(janus_plugin_session* session, int *err) {
+	_IF_DISABLED({ *err = -1; return; });
+	_LOCK_ALL;
+	bool found = false;
+	bool has_watchers = false;
+	US_LIST_ITERATE(_g_clients, client, {
+		if (client->session == session) {
+			US_JLOG_INFO("main", "Removing session %p ...", session);
+			US_LIST_REMOVE(_g_clients, client);
+			us_janus_client_destroy(client);
+			found = true;
+		} else {
+			has_watchers = (has_watchers || atomic_load(&client->transmit));
+		}
+	});
+	if (!found) {
+		US_JLOG_WARN("main", "No session %p", session);
+		*err = -2;
+	}
+	atomic_store(&_g_has_watchers, has_watchers);
+	_UNLOCK_ALL;
+}
+
+static json_t *_plugin_query_session(janus_plugin_session *session) {
+	_IF_DISABLED({ return NULL; });
+	json_t *info = NULL;
+	_LOCK_ALL;
+	US_LIST_ITERATE(_g_clients, client, {
+		if (client->session == session) {
+			info = json_string("session_found");
+			break;
+		}
+	});
+	_UNLOCK_ALL;
+	return info;
+}
+
+static void _set_transmit(janus_plugin_session *session, UNUSED const char *msg, bool transmit) {
+	_IF_DISABLED({ return; });
+	_LOCK_ALL;
+	bool found = false;
+	bool has_watchers = false;
+	US_LIST_ITERATE(_g_clients, client, {
+		if (client->session == session) {
+			atomic_store(&client->transmit, transmit);
+			// US_JLOG_INFO("main", "%s session %p", msg, session);
+			found = true;
+		}
+		has_watchers = (has_watchers || atomic_load(&client->transmit));
+	});
+	if (!found) {
+		US_JLOG_WARN("main", "No session %p", session);
+	}
+	atomic_store(&_g_has_watchers, has_watchers);
+	_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); \
+		}
+
+	if (session == NULL || msg == NULL) {
+		free(transaction);
+		FREE_MSG_JSEP;
+		return janus_plugin_result_new(JANUS_PLUGIN_ERROR, (msg ? "No session" : "No message"), NULL);
+	}
+
+#	define PUSH_ERROR(x_error, x_reason) { \
+			/*US_JLOG_ERROR("main", "Message error in session %p: %s", session, x_reason);*/ \
+			json_t *m_event = json_object(); \
+			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); \
+			json_decref(m_event); \
+		}
+
+	json_t *const request_obj = json_object_get(msg, "request");
+	if (request_obj == NULL) {
+		PUSH_ERROR(400, "Request missing");
+		goto ok_wait;
+	}
+
+	const char *const request_str = json_string_value(request_obj);
+	if (request_str == NULL) {
+		PUSH_ERROR(400, "Request not a string");
+		goto ok_wait;
+	}
+	// US_JLOG_INFO("main", "Message: %s", request_str);
+
+#	define PUSH_STATUS(x_status, x_jsep) { \
+			json_t *const m_event = json_object(); \
+			json_object_set_new(m_event, "ustreamer", json_string("event")); \
+			json_t *const m_result = json_object(); \
+			json_object_set_new(m_result, "status", json_string(x_status)); \
+			json_object_set_new(m_event, "result", m_result); \
+			_g_gw->push_event(session, create(), transaction, m_event, x_jsep); \
+			json_decref(m_event); \
+		}
+
+	if (!strcmp(request_str, "start")) {
+		PUSH_STATUS("started", NULL);
+
+	} else if (!strcmp(request_str, "stop")) {
+		PUSH_STATUS("stopped", NULL);
+
+	} else if (!strcmp(request_str, "watch")) {
+		char *sdp;
+		{
+			char *const video_sdp = us_rtpv_make_sdp(_g_rtpv);
+			if (video_sdp == NULL) {
+				PUSH_ERROR(503, "Haven't received SPS/PPS from memsink yet");
+				goto ok_wait;
+			}
+			char *const audio_sdp = (_g_rtpa ? 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, audio_sdp, video_sdp
+			);
+			free(audio_sdp);
+			free(video_sdp);
+		}
+		json_t *const offer_jsep = json_pack("{ssss}", "type", "offer", "sdp", sdp);
+		free(sdp);
+		PUSH_STATUS("started", offer_jsep);
+		json_decref(offer_jsep);
+
+	} else {
+		PUSH_ERROR(405, "Not implemented");
+	}
+
+	ok_wait:
+		FREE_MSG_JSEP;
+		return janus_plugin_result_new(JANUS_PLUGIN_OK_WAIT, NULL, NULL);
+
+#	undef PUSH_STATUS
+#	undef PUSH_ERROR
+#	undef FREE_MSG_JSEP
+}
+
+
+// ***** Plugin *****
+
+static int _plugin_get_api_compatibility(void)		{ return JANUS_PLUGIN_API_VERSION; }
+static int _plugin_get_version(void)				{ return US_VERSION_U; }
+static const char *_plugin_get_version_string(void)	{ return US_VERSION; }
+static const char *_plugin_get_description(void)	{ return "PiKVM uStreamer Janus plugin for H.264 video"; }
+static const char *_plugin_get_name(void)			{ return US_PLUGIN_NAME; }
+static const char *_plugin_get_author(void)			{ return "Maxim Devaev <mdevaev@gmail.com>"; }
+static const char *_plugin_get_package(void)		{ return US_PLUGIN_PACKAGE; }
+
+static void _plugin_incoming_rtp(UNUSED janus_plugin_session *handle, UNUSED janus_plugin_rtp *packet) {
+	// Just a stub to avoid logging spam about the plugin's purpose
+}
+
+janus_plugin *create(void) {
+#	pragma GCC diagnostic push
+#	pragma GCC diagnostic ignored "-Woverride-init"
+	static janus_plugin plugin = JANUS_PLUGIN_INIT(
+		.init = _plugin_init,
+		.destroy = _plugin_destroy,
+
+		.create_session = _plugin_create_session,
+		.destroy_session = _plugin_destroy_session,
+		.query_session = _plugin_query_session,
+
+		.setup_media = _plugin_setup_media,
+		.hangup_media = _plugin_hangup_media,
+
+		.handle_message = _plugin_handle_message,
+
+		.get_api_compatibility = _plugin_get_api_compatibility,
+		.get_version = _plugin_get_version,
+		.get_version_string = _plugin_get_version_string,
+		.get_description = _plugin_get_description,
+		.get_name = _plugin_get_name,
+		.get_author = _plugin_get_author,
+		.get_package = _plugin_get_package,
+
+		.incoming_rtp = _plugin_incoming_rtp,
+	);
+#	pragma GCC diagnostic pop
+	return &plugin;
+}

janus/src/queue.c

@@ -0,0 +1,102 @@
+/*****************************************************************************
+#                                                                            #
+#    uStreamer - Lightweight and fast MJPEG-HTTP streamer.                   #
+#                                                                            #
+#    Copyright (C) 2018-2022  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 "queue.h"
+
+
+us_queue_s *us_queue_init(unsigned capacity) {
+	us_queue_s *queue;
+	US_CALLOC(queue, 1);
+	US_CALLOC(queue->items, capacity);
+	queue->capacity = capacity;
+	US_MUTEX_INIT(queue->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;
+}
+
+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);
+}
+
+#define _WAIT_OR_UNLOCK(x_var, x_cond) { \
+		struct timespec m_ts; \
+		assert(!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); \
+			if (err == ETIMEDOUT) { \
+				US_MUTEX_UNLOCK(queue->mutex); \
+				return -1; \
+			} \
+			assert(!err); \
+		} \
+	}
+
+int us_queue_put(us_queue_s *queue, void *item, long double timeout) {
+	US_MUTEX_LOCK(queue->mutex);
+	if (timeout == 0) {
+		if (queue->size == queue->capacity) {
+			US_MUTEX_UNLOCK(queue->mutex);
+			return -1;
+		}
+	} else {
+		_WAIT_OR_UNLOCK(queue->size == queue->capacity, queue->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);
+	return 0;
+}
+
+int us_queue_get(us_queue_s *queue, void **item, long double 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);
+	return 0;
+}
+
+#undef _WAIT_OR_UNLOCK
+
+int us_queue_get_free(us_queue_s *queue) {
+	US_MUTEX_LOCK(queue->mutex);
+	const unsigned size = queue->size;
+	US_MUTEX_UNLOCK(queue->mutex);
+	return queue->capacity - size;
+}

janus/src/queue.h

@@ -1,8 +1,8 @@
 /*****************************************************************************
 #                                                                            #
-#    uStreamer - Lightweight and fast MJPG-HTTP streamer.                    #
+#    uStreamer - Lightweight and fast MJPEG-HTTP streamer.                   #
 #                                                                            #
-#    Copyright (C) 2018  Maxim Devaev <mdevaev@gmail.com>                    #
+#    Copyright (C) 2018-2022  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,27 +22,47 @@
 
 #pragma once
 
-#include <string.h>
+#include <errno.h>
+#include <time.h>
+#include <assert.h>
 
-#include <IL/OMX_Core.h>
-#include <IL/OMX_Component.h>
+#include <pthread.h>
+
+#include "uslibs/tools.h"
+#include "uslibs/threading.h"
 
 
-#define OMX_INIT_STRUCTURE(_var) { \
-		memset(&(_var), 0, sizeof(_var)); \
-		(_var).nSize = sizeof(_var); \
-		(_var).nVersion.nVersion = OMX_VERSION; \
-		(_var).nVersion.s.nVersionMajor = OMX_VERSION_MAJOR; \
-		(_var).nVersion.s.nVersionMinor = OMX_VERSION_MINOR; \
-		(_var).nVersion.s.nRevision = OMX_VERSION_REVISION; \
-		(_var).nVersion.s.nStep = OMX_VERSION_STEP; \
+// Based on https://github.com/seifzadeh/c-pthread-queue/blob/master/queue.h
+
+typedef struct {
+	void			**items;
+	unsigned		size;
+	unsigned		capacity;
+	unsigned		in;
+	unsigned		out;
+
+	pthread_mutex_t	mutex;
+	pthread_cond_t	full_cond;
+	pthread_cond_t	empty_cond;
+} us_queue_s;
+
+
+#define US_QUEUE_DELETE_WITH_ITEMS(x_queue, x_free_item) { \
+		if (x_queue) { \
+			while (!us_queue_get_free(x_queue)) { \
+				void *m_ptr; \
+				if (!us_queue_get(x_queue, &m_ptr, 0)) { \
+					US_DELETE(m_ptr, x_free_item); \
+				} \
+			} \
+			us_queue_destroy(x_queue); \
+		} \
 	}
 
 
-int component_enable_port(OMX_HANDLETYPE *component, OMX_U32 port);
-int component_disable_port(OMX_HANDLETYPE *component, OMX_U32 port);
+us_queue_s *us_queue_init(unsigned capacity);
+void us_queue_destroy(us_queue_s *queue);
 
-int component_get_portdef(OMX_HANDLETYPE *component, OMX_PARAM_PORTDEFINITIONTYPE *portdef, OMX_U32 port);
-int component_set_portdef(OMX_HANDLETYPE *component, OMX_PARAM_PORTDEFINITIONTYPE *portdef);
-
-int component_set_state(OMX_HANDLETYPE *component, OMX_STATETYPE state);
+int us_queue_put(us_queue_s *queue, void *item, long double timeout);
+int us_queue_get(us_queue_s *queue, void **item, long double timeout);
+int us_queue_get_free(us_queue_s *queue);

janus/src/rtp.c

@@ -0,0 +1,64 @@
+/*****************************************************************************
+#                                                                            #
+#    uStreamer - Lightweight and fast MJPEG-HTTP streamer.                   #
+#                                                                            #
+#    This source file is partially based on this code:                       #
+#      - https://github.com/catid/kvm/blob/master/kvm_pipeline/src           #
+#                                                                            #
+#    Copyright (C) 2018-2022  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 "rtp.h"
+
+
+us_rtp_s *us_rtp_init(unsigned payload, bool video, bool zero_playout_delay) {
+	us_rtp_s *rtp;
+	US_CALLOC(rtp, 1);
+	rtp->payload = payload;
+	rtp->video = video;
+	rtp->zero_playout_delay = zero_playout_delay; // See client.c
+	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_write_header(us_rtp_s *rtp, uint32_t pts, bool marked) {
+	uint32_t word0 = 0x80000000;
+	if (marked) {
+		word0 |= 1 << 23;
+	}
+	word0 |= (rtp->payload & 0x7F) << 16;
+	word0 |= rtp->seq;
+	++rtp->seq;
+
+#	define WRITE_BE_U32(_offset, _value) *((uint32_t *)(rtp->datagram + _offset)) = __builtin_bswap32(_value)
+	WRITE_BE_U32(0, word0);
+	WRITE_BE_U32(4, pts);
+	WRITE_BE_U32(8, rtp->ssrc);
+#	undef WRITE_BE_U32
+}

janus/src/rtp.h

@@ -0,0 +1,57 @@
+/*****************************************************************************
+#                                                                            #
+#    uStreamer - Lightweight and fast MJPEG-HTTP streamer.                   #
+#                                                                            #
+#    Copyright (C) 2018-2022  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 <stdlib.h>
+#include <stdint.h>
+#include <stdbool.h>
+
+#include <sys/types.h>
+
+#include "uslibs/tools.h"
+
+
+// https://stackoverflow.com/questions/47635545/why-webrtc-chose-rtp-max-packet-size-to-1200-bytes
+#define US_RTP_DATAGRAM_SIZE	1200
+#define US_RTP_HEADER_SIZE		12
+
+
+typedef struct {
+	unsigned	payload;
+	bool		video;
+	bool		zero_playout_delay;
+	uint32_t	ssrc;
+
+	uint16_t	seq;
+	uint8_t		datagram[US_RTP_DATAGRAM_SIZE];
+	size_t		used;
+} us_rtp_s;
+
+typedef void (*us_rtp_callback_f)(const us_rtp_s *rtp);
+
+
+us_rtp_s *us_rtp_init(unsigned payload, bool video, bool zero_playout_delay);
+us_rtp_s *us_rtp_dup(const us_rtp_s *rtp);
+void us_rtp_destroy(us_rtp_s *rtp);
+
+void us_rtp_write_header(us_rtp_s *rtp, uint32_t pts, bool marked);

janus/src/rtpa.c

@@ -0,0 +1,66 @@
+/*****************************************************************************
+#                                                                            #
+#    uStreamer - Lightweight and fast MJPEG-HTTP streamer.                   #
+#                                                                            #
+#    Copyright (C) 2018-2022  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 "rtpa.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, false);
+	rtpa->callback = callback;
+	return rtpa;
+}
+
+void us_rtpa_destroy(us_rtpa_s *rtpa) {
+	us_rtp_destroy(rtpa->rtp);
+	free(rtpa);
+}
+
+char *us_rtpa_make_sdp(us_rtpa_s *rtpa) {
+#	define PAYLOAD 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,
+		PAYLOAD, PAYLOAD, PAYLOAD, PAYLOAD, PAYLOAD, // PAYLOAD,
+		rtpa->rtp->ssrc
+	);
+#	undef PAYLOAD
+	return sdp;
+}
+
+void us_rtpa_wrap(us_rtpa_s *rtpa, const uint8_t *data, size_t size, uint32_t pts) {
+    if (size + US_RTP_HEADER_SIZE <= US_RTP_DATAGRAM_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;
+        rtpa->callback(rtpa->rtp);
+	}
+}

janus/src/rtpa.h

@@ -0,0 +1,48 @@
+/*****************************************************************************
+#                                                                            #
+#    uStreamer - Lightweight and fast MJPEG-HTTP streamer.                   #
+#                                                                            #
+#    Copyright (C) 2018-2022  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 <stdlib.h>
+#include <stdint.h>
+#include <stdbool.h>
+#include <inttypes.h>
+
+#include <sys/types.h>
+
+#include "uslibs/tools.h"
+#include "uslibs/threading.h"
+
+#include "rtp.h"
+
+
+typedef struct {
+	us_rtp_s			*rtp;
+	us_rtp_callback_f	callback;
+} us_rtpa_s;
+
+
+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 uint8_t *data, size_t size, uint32_t pts);

janus/src/rtpv.c

@@ -0,0 +1,213 @@
+/*****************************************************************************
+#                                                                            #
+#    uStreamer - Lightweight and fast MJPEG-HTTP streamer.                   #
+#                                                                            #
+#    This source file is partially based on this code:                       #
+#      - https://github.com/catid/kvm/blob/master/kvm_pipeline/src           #
+#                                                                            #
+#    Copyright (C) 2018-2022  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 "rtpv.h"
+
+
+void _rtpv_process_nalu(us_rtpv_s *rtpv, const uint8_t *data, size_t size, uint32_t pts, bool marked);
+
+static ssize_t _find_annexb(const uint8_t *data, size_t size);
+
+
+us_rtpv_s *us_rtpv_init(us_rtp_callback_f callback, bool zero_playout_delay) {
+	us_rtpv_s *rtpv;
+	US_CALLOC(rtpv, 1);
+	rtpv->rtp = us_rtp_init(96, true, zero_playout_delay);
+	rtpv->callback = callback;
+	rtpv->sps = us_frame_init();
+	rtpv->pps = us_frame_init();
+	US_MUTEX_INIT(rtpv->mutex);
+	return rtpv;
+}
+
+void us_rtpv_destroy(us_rtpv_s *rtpv) {
+	US_MUTEX_DESTROY(rtpv->mutex);
+	us_frame_destroy(rtpv->pps);
+	us_frame_destroy(rtpv->sps);
+	us_rtp_destroy(rtpv->rtp);
+	free(rtpv);
+}
+
+char *us_rtpv_make_sdp(us_rtpv_s *rtpv) {
+	US_MUTEX_LOCK(rtpv->mutex);
+
+	if (rtpv->sps->used == 0 || rtpv->pps->used == 0) {
+		US_MUTEX_UNLOCK(rtpv->mutex);
+		return NULL;
+	}
+
+	char *sps = NULL;
+	char *pps = NULL;
+	us_base64_encode(rtpv->sps->data, rtpv->sps->used, &sps, NULL);
+	us_base64_encode(rtpv->pps->data, rtpv->pps->used, &pps, NULL);
+
+	US_MUTEX_UNLOCK(rtpv->mutex);
+
+#	define PAYLOAD rtpv->rtp->payload
+	// https://tools.ietf.org/html/rfc6184
+	// https://github.com/meetecho/janus-gateway/issues/2443
+	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=fmtp:%u sprop-sps=%s" RN
+		"a=fmtp:%u sprop-pps=%s" 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
+		"%s" // playout-delay
+		"a=sendonly" RN,
+		PAYLOAD, PAYLOAD, PAYLOAD, PAYLOAD,
+		PAYLOAD, sps,
+		PAYLOAD, pps,
+		PAYLOAD, PAYLOAD, PAYLOAD,
+		rtpv->rtp->ssrc,
+		(rtpv->rtp->zero_playout_delay ? "a=extmap:1 http://www.webrtc.org/experiments/rtp-hdrext/playout-delay" RN : "")
+	);
+#	undef PAYLOAD
+
+	free(sps);
+	free(pps);
+	return sdp;
+}
+
+#define _PRE 3 // Annex B prefix length
+
+void us_rtpv_wrap(us_rtpv_s *rtpv, const us_frame_s *frame) {
+	// There is a complicated logic here but everything works as it should:
+	//   - https://github.com/pikvm/ustreamer/issues/115#issuecomment-893071775
+
+	assert(frame->format == V4L2_PIX_FMT_H264);
+
+	const uint32_t pts = us_get_now_monotonic_u64() * 9 / 100; // PTS units are in 90 kHz
+	ssize_t last_offset = -_PRE;
+
+	while (true) { // Find and iterate by nalus
+		const size_t next_start = last_offset + _PRE;
+		ssize_t offset = _find_annexb(frame->data + next_start, frame->used - next_start);
+		if (offset < 0) {
+			break;
+		}
+		offset += next_start;
+
+		if (last_offset >= 0) {
+			const uint8_t *const data = frame->data + last_offset + _PRE;
+			size_t size = offset - last_offset - _PRE;
+			if (data[size - 1] == 0) { // Check for extra 00
+				--size;
+			}
+			_rtpv_process_nalu(rtpv, data, size, pts, false);
+		}
+
+		last_offset = offset;
+	}
+
+	if (last_offset >= 0) {
+		const uint8_t *const data = frame->data + last_offset + _PRE;
+		size_t size = frame->used - last_offset - _PRE;
+		_rtpv_process_nalu(rtpv, data, size, pts, true);
+	}
+}
+
+void _rtpv_process_nalu(us_rtpv_s *rtpv, const uint8_t *data, size_t size, uint32_t pts, bool marked) {
+	const unsigned ref_idc = (data[0] >> 5) & 3;
+	const unsigned type = data[0] & 0x1F;
+
+	us_frame_s *ps = NULL;
+	switch (type) {
+		case 7: ps = rtpv->sps; break;
+		case 8: ps = rtpv->pps; break;
+	}
+	if (ps != NULL) {
+		US_MUTEX_LOCK(rtpv->mutex);
+		us_frame_set_data(ps, data, size);
+		US_MUTEX_UNLOCK(rtpv->mutex);
+	}
+
+#	define DG rtpv->rtp->datagram
+
+	if (size + US_RTP_HEADER_SIZE <= US_RTP_DATAGRAM_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);
+		return;
+	}
+
+	const size_t fu_overhead = US_RTP_HEADER_SIZE + 2; // FU-A overhead
+
+	const uint8_t *src = data + 1;
+	ssize_t remaining = size - 1;
+
+	bool first = true;
+	while (remaining > 0) {
+		ssize_t frag_size = US_RTP_DATAGRAM_SIZE - fu_overhead;
+		const bool last = (remaining <= frag_size);
+		if (last) {
+			frag_size = remaining;
+		}
+
+		us_rtp_write_header(rtpv->rtp, pts, (marked && last));
+
+		DG[US_RTP_HEADER_SIZE] = 28 | (ref_idc << 5);
+
+		uint8_t fu = type;
+		if (first) {
+			fu |= 0x80;
+		}
+		if (last) {
+			fu |= 0x40;
+		}
+		DG[US_RTP_HEADER_SIZE + 1] = fu;
+
+		memcpy(DG + fu_overhead, src, frag_size);
+		rtpv->rtp->used = fu_overhead + frag_size;
+		rtpv->callback(rtpv->rtp);
+
+		src += frag_size;
+		remaining -= frag_size;
+		first = false;
+	}
+
+#	undef DG
+}
+
+static ssize_t _find_annexb(const uint8_t *data, size_t size) {
+	// Parses buffer for 00 00 01 start codes
+	if (size >= _PRE) {
+		for (size_t index = 0; index <= size - _PRE; ++index) {
+			if (data[index] == 0 && data[index + 1] == 0 && data[index + 2] == 1) {
+				return index;
+			}
+		}
+	}
+	return -1;
+}
+
+#undef _PRE

janus/src/rtpv.h

@@ -1,8 +1,8 @@
 /*****************************************************************************
 #                                                                            #
-#    uStreamer - Lightweight and fast MJPG-HTTP streamer.                    #
+#    uStreamer - Lightweight and fast MJPEG-HTTP streamer.                   #
 #                                                                            #
-#    Copyright (C) 2018  Maxim Devaev <mdevaev@gmail.com>                    #
+#    Copyright (C) 2018-2022  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,37 +22,36 @@
 
 #pragma once
 
+#include <stdlib.h>
 #include <stdbool.h>
-#include <stdatomic.h>
+#include <stdint.h>
+#include <inttypes.h>
+#include <assert.h>
+
+#include <sys/types.h>
+#include <linux/videodev2.h>
 
 #include <pthread.h>
 
-#include "picture.h"
-#include "device.h"
-#include "encoder.h"
+#include "uslibs/tools.h"
+#include "uslibs/threading.h"
+#include "uslibs/frame.h"
+#include "uslibs/base64.h"
+
+#include "rtp.h"
 
 
-struct process_t {
-	atomic_bool stop;
-	atomic_bool slowdown;
-};
-
-struct stream_t {
-	struct picture_t	*picture;
-	bool				online;
-	unsigned			captured_fps;
-	atomic_bool			updated;
+typedef struct {
+	us_rtp_s			*rtp;
+	us_rtp_callback_f	callback;
+	us_frame_s			*sps; // Actually not a frame, just a bytes storage
+	us_frame_s			*pps;
 	pthread_mutex_t		mutex;
-
-	struct process_t	*proc;
-	struct device_t		*dev;
-	struct encoder_t	*encoder;
-};
+} us_rtpv_s;
 
 
-struct stream_t *stream_init(struct device_t *dev, struct encoder_t *encoder);
-void stream_destroy(struct stream_t *stream);
+us_rtpv_s *us_rtpv_init(us_rtp_callback_f callback, bool zero_playout_delay);
+void us_rtpv_destroy(us_rtpv_s *rtpv);
 
-void stream_loop(struct stream_t *stream);
-void stream_loop_break(struct stream_t *stream);
-void stream_switch_slowdown(struct stream_t *stream, bool slowdown);
+char *us_rtpv_make_sdp(us_rtpv_s *rtpv);
+void us_rtpv_wrap(us_rtpv_s *rtpv, const us_frame_s *frame);

janus/src/tc358743.c

@@ -0,0 +1,64 @@
+/*****************************************************************************
+#                                                                            #
+#    uStreamer - Lightweight and fast MJPEG-HTTP streamer.                   #
+#                                                                            #
+#    Copyright (C) 2018-2022  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 "tc358743.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
+
+
+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;
+	}
+
+#	define READ_CID(x_cid, x_field) { \
+			struct v4l2_control m_ctl = {0}; \
+			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
+
+	close(fd);
+	return 0;
+}

janus/src/tc358743.h

@@ -1,8 +1,8 @@
 /*****************************************************************************
 #                                                                            #
-#    uStreamer - Lightweight and fast MJPG-HTTP streamer.                    #
+#    uStreamer - Lightweight and fast MJPEG-HTTP streamer.                   #
 #                                                                            #
-#    Copyright (C) 2018  Maxim Devaev <mdevaev@gmail.com>                    #
+#    Copyright (C) 2018-2022  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,19 +22,25 @@
 
 #pragma once
 
-#include "device.h"
-#include "encoder.h"
-#include "http/server.h"
+#include <unistd.h>
+#include <fcntl.h>
+#include <stdbool.h>
+
+#include <sys/types.h>
+
+#include <linux/videodev2.h>
+#include <linux/v4l2-controls.h>
+
+#include "uslibs/tools.h"
+#include "uslibs/xioctl.h"
+
+#include "logging.h"
 
 
-struct options_t {
-	int		argc;
-	char	**argv;
-	char	**argv_copy;
-};
+typedef struct {
+	bool		has_audio;
+	unsigned	audio_hz;
+} us_tc358743_info_s;
 
 
-struct options_t *options_init(int argc, char *argv[]);
-void options_destroy(struct options_t *options);
-
-int options_parse(struct options_t *options, struct device_t *dev, struct encoder_t *encoder, struct http_server_t *server);
+int us_tc358743_read_info(const char *path, us_tc358743_info_s *info);

janus/src/uslibs/array.h

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

janus/src/uslibs/base64.c

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

janus/src/uslibs/base64.h

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

janus/src/uslibs/const.h

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

janus/src/uslibs/frame.c

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

janus/src/uslibs/frame.h

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

janus/src/uslibs/list.h

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

janus/src/uslibs/memsinksh.h

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

janus/src/uslibs/threading.h

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

janus/src/uslibs/tools.h

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

janus/src/uslibs/xioctl.h

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

linters/Dockerfile

@@ -1,11 +1,12 @@
-FROM archlinux/base
+FROM archlinux/archlinux:base-devel
 
-RUN echo "Server = http://mirror.yandex.ru/archlinux/\$repo/os/\$arch" > /etc/pacman.d/mirrorlist
+RUN mkdir -p /etc/pacman.d/hooks \
+	&& ln -s /dev/null /etc/pacman.d/hooks/30-systemd-tmpfiles.hook
+
+RUN echo 'Server = https://mirror.rackspace.com/archlinux/$repo/os/$arch' > /etc/pacman.d/mirrorlist
 
 RUN pacman -Syu --noconfirm \
 	&& pacman -S --needed --noconfirm \
-		base \
-		base-devel \
 		vim \
 		git \
 		libjpeg \
@@ -16,6 +17,10 @@ RUN pacman -Syu --noconfirm \
 		python-pip \
 		python-tox \
 		cppcheck \
-	&& (pacman -Sc --noconfirm || true)
+		npm \
+	&& (pacman -Sc --noconfirm || true) \
+	&& rm -rf /var/cache/pacman/pkg/*
+
+RUN npm install htmlhint -g
 
 CMD /bin/bash

linters/cppcheck.h

@@ -0,0 +1,6 @@
+#define CHAR_BIT 8
+#define WITH_GPIO
+#define JANUS_PLUGIN_INIT(...) { __VA_ARGS__ }
+#define EVTHREAD_USE_PTHREADS_IMPLEMENTED 1
+#define CLOCK_MONOTONIC_RAW 1
+#define CLOCK_MONOTONIC_FAST 1

linters/mypy.ini

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

linters/pylint.ini

@@ -15,21 +15,15 @@ disable =
 	locally-disabled,
 	fixme,
 	missing-docstring,
-	no-init,
-	no-self-use,
 	superfluous-parens,
-	abstract-class-not-used,
-	abstract-class-little-used,
 	duplicate-code,
-	bad-continuation,
-	bad-whitespace,
-	star-args,
 	broad-except,
 	redundant-keyword-arg,
 	wrong-import-order,
 	too-many-ancestors,
 	no-else-return,
 	len-as-condition,
+	unspecified-encoding,
 
 [REPORTS]
 msg-template = {symbol} -- {path}:{line}({obj}): {msg}
@@ -38,9 +32,6 @@ msg-template = {symbol} -- {path}:{line}({obj}): {msg}
 max-line-length = 160
 
 [BASIC]
-# List of builtins function names that should not be used, separated by a comma
-bad-functions =
-
 # Good variable names which should always be accepted, separated by a comma
 good-names = _, __, x, y, ws, make-html-h, make-jpeg-h
 

linters/tox.ini

@@ -1,46 +1,52 @@
 [tox]
-envlist = cppcheck, flake8, pylint, mypy, vulture
+envlist = cppcheck, flake8, pylint, mypy, vulture, htmlhint
 skipsdist = true
 
 [testenv]
-basepython = python3.8
+basepython = python3.10
 changedir = /src
 
 [testenv:cppcheck]
 whitelist_externals = cppcheck
 commands = cppcheck \
+			-j4 \
 			--force \
-			--std=c11 \
+			--std=c17 \
 			--error-exitcode=1 \
 			--quiet \
 			--enable=warning,unusedFunction,portability,performance,style \
 			--suppress=assignmentInAssert \
 			--suppress=variableScope \
 			--inline-suppr \
-			-DCHAR_BIT=8 \
-		src
+			--library=python \
+			--include=linters/cppcheck.h \
+		src python/*.? janus/*.?
 
 [testenv:flake8]
 whitelist_externals = bash
-commands = bash -c 'flake8 --config=linters/flake8.ini tools/*.py'
+commands = bash -c 'flake8 --config=linters/flake8.ini tools/*.py' python/*.py
 deps =
 	flake8
 	flake8-quotes
 
 [testenv:pylint]
 whitelist_externals = bash
-commands = bash -c 'pylint --rcfile=linters/pylint.ini --output-format=colorized --reports=no tools/*.py'
+commands = bash -c 'pylint --rcfile=linters/pylint.ini --output-format=colorized --reports=no tools/*.py python/*.py'
 deps =
 	pylint
 
 [testenv:mypy]
 whitelist_externals = bash
-commands = bash -c 'mypy --config-file=linters/mypy.ini tools/*.py'
+commands = bash -c 'mypy --config-file=linters/mypy.ini tools/*.py python/*.py'
 deps =
 	mypy
 
 [testenv:vulture]
 whitelist_externals = bash
-commands = bash -c 'vulture tools/*.py'
+commands = bash -c 'vulture tools/*.py python/*.py'
 deps =
 	vulture
+
+[testenv:htmlhint]
+whitelist_externals = htmlhint
+commands = htmlhint src/ustreamer/http/data/*.html

man/ustreamer-dump.1

@@ -0,0 +1,91 @@
+.\" 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.24" "January 2021"
+
+.SH NAME
+ustreamer-dump \- Dump uStreamer's memory sink to file
+
+.SH SYNOPSIS
+.B ustreamer-dump
+.RI [OPTIONS]
+
+.SH DESCRIPTION
+µStreamer-dump (\fBustreamer-dump\fP) writes a local stream from ustreamer to a file or redirect it to other utilities (such as \fBffmpeg\fR).
+
+.SH USAGE
+\fBustreamer\fR requires at least the \fB\-\-sink\fR option to operate.
+
+To output ustreamers sink "test" to ffmpeg, and into a file called test.mp4:
+
+\fBustreamer-dump \e\fR
+.RS
+\fB\-\-sink=test \e\fR # Use ustreamer sink "test"
+.nf
+\fB\-\-output\ \- \e\fR # Output to stdout
+\fB|\ ffmpeg\ \-use_wallclock_as_timestamps\ 1\ \-i\ pipe:\ \-c:v\ libx264\ test\.mp4\fR
+
+.SH OPTIONS
+.SS "Sink options"
+.TP
+.BR \-s ", " \-\-sink\ \fIname
+Memory sink ID. No default.
+.TP
+.BR \-t ", " \-\-sink\-timeout\ \fIsec
+Timeout for the upcoming frame. Default: 1.
+.TP
+.BR \-o ", " \-\-output\ \fIfilename
+Filename to dump output to. Use '-' for stdout. Default: just consume the sink.
+.TP
+.BR \-j ", " \-\-output-json
+Format output as JSON. Required option --output. Default: disabled.
+.TP
+.BR \-c ", " \-\-count\ \fIN
+Limit the number of frames. Default: 0 (infinite).
+.TP
+.BR \-i ", "\-\-interval\ \fIsec
+Delay between reading frames (float). Default: 0.
+
+.SS "Logging options"
+.TP
+.BR \-\-log\-level\ \fIN
+Verbosity level of messages from 0 (info) to 3 (debug). Enabling debugging messages can slow down the program.
+Available levels: 0 (info), 1 (performance), 2 (verbose), 3 (debug).
+Default: 0.
+.TP
+.BR \-\-perf
+Enable performance messages (same as \-\-log\-level=1). Default: disabled.
+.TP
+.BR \-\-verbose
+Enable verbose messages and lower (same as \-\-log\-level=2). Default: disabled.
+.TP
+.BR \-\-debug
+Enable debug messages and lower (same as \-\-log\-level=3). Default: disabled.
+.TP
+.BR \-\-force\-log\-colors
+Force color logging. Default: colored if stderr is a TTY.
+.TP
+.BR \-\-no\-log\-colors
+Disable color logging. Default: ditto.
+
+.SS "Help options"
+.TP
+.BR \-h ", " \-\-help
+Print this text and exit.
+.TP
+.BR \-v ", " \-\-version
+Print version and exit.
+
+.SH "SEE ALSO"
+.BR ustreamer (1)
+
+.SH BUGS
+Please file any bugs and issues at \fIhttps://github.com/pikvm/ustreamer/issues\fR
+
+.SH AUTHOR
+Maxim Devaev <mdevaev@gmail.com>
+
+.SH HOMEPAGE
+\fIhttps://pikvm.org/\fR
+
+.SH COPYRIGHT
+GNU General Public License v3.0

man/ustreamer.1

@@ -0,0 +1,336 @@
+.\" 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.24" "November 2020"
+
+.SH NAME
+ustreamer \- stream MJPEG video from any V4L2 device to the network
+
+.SH SYNOPSIS
+.B ustreamer
+.RI [OPTIONS]
+
+.SH DESCRIPTION
+µStreamer (\fBustreamer\fP) is a lightweight and very quick server to stream MJPEG video from any V4L2 device to the network. All new browsers have native support of this video format, as well as most video players such as mplayer, VLC etc. µStreamer is a part of the PiKVM project designed to stream VGA and HDMI screencast hardware data with the highest resolution and FPS possible.
+
+.SH USAGE
+Without arguments, \fBustreamer\fR will try to open \fB/dev/video0\fR with 640x480 resolution and start streaming on \fBhttp://127\.0\.0\.1:8080\fR\. You can override this behavior using parameters \fB\-\-device\fR, \fB\-\-host\fR and \fB\-\-port\fR\. For example, to stream to the world, run: \fBustreamer --device=/dev/video1 --host=0.0.0.0 --port=80\fR
+
+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:
+
+\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
+.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)
+.nf
+\fB\-\-dv\-timings \e\fR # Use DV\-timings
+.nf
+\fB\-\-drop\-same\-frames=30\fR # Save the traffic\fR
+.RE
+.P
+Please note that to use \fB\-\-drop\-same\-frames\fR for different browsers you need to use some specific URL \fB/stream\fR parameters (see URL \fB/\fR for details)\.
+.P
+You can always view the full list of options with \fBustreamer \-\-help\fR\. Some features may not be available on your platform. To find out which features are enabled, use \fBustreamer \-\-features\fR.
+
+.SH OPTIONS
+.SS "Capturing options"
+.TP
+.BR \-d\ \fI/dev/path ", " \-\-device\ \fI/dev/path
+Path to V4L2 device. Default: /dev/video0.
+.TP
+.BR \-i\ \fIN ", " \-\-input\ \fIN
+Input channel. Default: 0.
+.TP
+.BR \-r\ \fIWxH ", " \-\-resolution\ \fIWxH
+Initial image resolution. Default: 640x480.
+.TP
+.BR \-m\ \fIfmt ", " \-\-format\ \fIfmt
+Image format.
+Available: YUYV, UYVY, RGB565, RGB24, JPEG; default: YUYV.
+.TP
+.BR \-a\ \fIstd ", " \-\-tv\-standard\ \fIstd
+Force TV standard.
+Available: PAL, NTSC, SECAM; default: disabled.
+.TP
+.BR \-I\ \fImethod ", " \-\-io\-method\ \fImethod
+Set V4L2 IO method (see kernel documentation). Changing of this parameter may increase the performance. Or not.
+Available: MMAP, USERPTR; default: MMAP.
+.TP
+.BR \-f\ \fIN ", " \-\-desired\-fps\ \fIN
+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.
+.TP
+.BR \-n ", " \-\-persistent
+Don't re\-initialize device on timeout. 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.
+Default: 2 (the number of CPU cores (but not more than 4) + 1).
+.TP
+.BR \-w\ \fIN ", " \-\-workers\ \fIN
+The number of worker threads but not more than buffers.
+Default: 1 (the number of CPU cores (but not more than 4)).
+.TP
+.BR \-q\ \fIN ", " \-\-quality\ \fIN
+Set quality of JPEG encoding from 1 to 100 (best). Default: 80.
+Note: If HW encoding is used (JPEG source format selected), this parameter attempts to configure the camera or capture device hardware's internal encoder. It does not re\-encode MJPEG to MJPEG to change the quality level for sources that already output MJPEG.
+.TP
+.BR \-c\ \fItype ", " \-\-encoder\ \fItype
+Use specified encoder. It may affect the number of workers.
+
+CPU ─ Software MJPEG encoding (default).
+
+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'.
+.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.
+.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.
+.TP
+.BR \-\-device\-timeout\ \fIsec
+Timeout for device querying. Default: 1.
+.TP
+.BR \-\-device\-error\-delay\ \fIsec
+Delay before trying to connect to the device again after an error (timeout for example). Default: 1.
+.TP
+.BR \-\-m2m\-device\ \fI/dev/path
+Path to V4L2 mem-to-mem encoder device. Default: auto-select.
+
+.SS "Image control options"
+.TP
+.BR \-\-image\-default
+Reset all image settings below to default. Default: no change.
+.TP
+.BR \-\-brightness\ \fIN ", " \fIauto ", " \fIdefault
+Set brightness. Default: no change.
+.TP
+.BR \-\-contrast\ \fIN ", " \fIdefault
+Set contrast. Default: no change.
+.TP
+.BR \-\-saturation\ \fIN ", " \fIdefault
+Set saturation. Default: no change.
+.TP
+.BR \-\-hue\ \fIN ", " \fIauto ", " \fIdefault
+Set hue. Default: no change.
+.TP
+.BR \-\-gamma\ \fIN ", " \fIdefault
+Set gamma. Default: no change.
+.TP
+.BR \-\-sharpness\ \fIN ", " \fIdefault
+Set sharpness. Default: no change.
+.TP
+.BR \-\-backlight\-compensation\ \fIN ", " \fIdefault
+Set backlight compensation. Default: no change.
+.TP
+.BR \-\-white\-balance\ \fIN ", " \fIauto ", " \fIdefault
+Set white balance. Default: no change.
+.TP
+.BR \-\-gain\ \fIN ", " \fIauto ", " \fIdefault
+Set gain. Default: no change.
+.TP
+.BR \-\-color\-effect\ \fIN ", " \fIdefault
+Set color effect. Default: no change.
+.TP
+.BR \-\-flip\-vertical\ \fI1 ", " \fI0 ", " \fIdefault
+Set vertical flip. Default: no change.
+.TP
+.BR \-\-flip\-horizontal\ \fI1 ", " \fI0 ", " \fIdefault
+Set horizontal flip. Default: no change.
+
+.SS "HTTP server options"
+.TP
+.BR \-s\ \fIaddress ", " \-\-host\ \fIaddress
+Listen on Hostname or IP. Default: 127.0.0.1.
+.TP
+.BR \-p\ \fIN ", " \-\-port\ \fIN
+Bind to this TCP port. Default: 8080.
+.TP
+.BR \-U\ \fIpath ", " \-\-unix\ \fIpath
+Bind to UNIX domain socket. Default: disabled.
+.TP
+.BR \-D ", " \-\-unix\-rm
+Try to remove old unix socket file before binding. default: disabled.
+.TP
+.BR \-M\ \fImode ", " \-\-unix\-mode\ \fImode
+Set UNIX socket file permissions (like 777). Default: disabled.
+.TP
+.BR \-S ", " \-\-systemd
+Bind to systemd socket for socket activation. Required \fBWITH_SYSTEMD\fR feature. Default: disabled.
+.TP
+.BR \-\-user\ \fIname
+HTTP basic auth user. Default: disabled.
+.TP
+.BR \-\-passwd\ \fIstr
+HTTP basic auth passwd. Default: empty.
+.TP
+.BR \-\-static\ \fIpath
+Path to dir with static files instead of embedded root index page. Symlinks are not supported for security reasons. Default: disabled.
+.TP
+.BR \-e\ \fIN ", " \-\-drop\-same\-frames\ \fIN
+Don't send identical frames to clients, but no more than specified number. It can significantly reduce the outgoing traffic, but will increase the CPU loading. Don't use this option with analog signal sources or webcams, it's useless. Default: disabled.
+.TP
+.BR \-R\ \fIWxH ", " \-\-fake\-resolution\ \fIWxH
+Override image resolution for the /state. Default: disabled.
+.TP
+.BR \-\-tcp\-nodelay
+Set TCP_NODELAY flag to the client /stream socket. Only for TCP socket.
+Default: disabled.
+.TP
+.BR \-\-allow\-origin\ \fIstr
+Set Access\-Control\-Allow\-Origin header. Default: disabled.
+.TP
+.BR \-\-instance\-id\ \fIstr
+A short string identifier to be displayed in the /state handle. It must satisfy regexp ^[a-zA-Z0-9\./+_-]*$. Default: an empty string.
+.TP
+.BR \-\-server\-timeout\ \fIsec
+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.
+.TP
+.BR \-\-sink\-mode\ \fImode
+Set JPEG sink permissions (like 777). Default: 660.
+.TP
+.BR \-\-sink\-rm
+Remove shared memory on stop. Default: disabled.
+.TP
+.BR \-\-sink\-client\-ttl\ \fIsec
+Client TTL. Default: 10.
+.TP
+.BR \-\-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.
+.TP
+.BR \-\-h264\-sink\-mode\ \fImode
+Set H264 sink permissions (like 777). Default: 660.
+.TP
+.BR \-\-h264\-sink\-rm
+Remove shared memory on stop. Default: disabled.
+.TP
+.BR \-\-h264\-sink\-client\-ttl\ \fIsec
+Client TTL. Default: 10.
+.TP
+.BR \-\-h264\-sink\-timeout\ \fIsec
+Timeout for lock. Default: 1.
+.TP
+.BR \-\-h264\-bitrate\ \fIkbps
+H264 bitrate in Kbps. Default: 5000.
+.TP
+.BR \-\-h264\-gop\ \fIN
+Intarval between keyframes. Default: 30.
+.TP
+.BR \-\-h264\-m2m\-device\ \fI/dev/path
+Path to V4L2 mem-to-mem encoder device. Default: auto-select.
+
+
+.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.
+.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).
+.TP
+.BR \-\-process\-name\-prefix\ \fIstr
+Set process name prefix which will be displayed in the process list like '\fIstr: ustreamer \-\-blah\-blah\-blah'\fR. Required \fBWITH_SETPROCTITLE\fR feature. Default: disabled.
+.TP
+.BR \-\-notify\-parent
+Send SIGUSR2 to the parent process when the stream parameters are changed. Checking changes is performed for the online flag and image resolution. Required \fBWITH_SETPROCTITLE\fR feature.
+
+.SS "GPIO options"
+Available only if \fBWITH_GPIO\fR feature enabled.
+.TP
+.BR \-\-gpio\-device\ \fI/dev/path
+Path to GPIO character device. Default: /dev/gpiochip0.
+.TP
+.BR \-\-gpio\-consumer\-prefix\ \fIstr
+Consumer prefix for GPIO outputs. Default: ustreamer.
+.TP
+.BR \-\-gpio\-prog\-running\ \fIpin
+Set 1 on GPIO pin while µStreamer is running. Default: disabled.
+.TP
+.BR \-\-gpio\-stream\-online\ \fIpin
+Set 1 while streaming. Default: disabled.
+.TP
+.BR \-\-gpio\-has\-http\-clients\ \fIpin
+Set 1 while stream has at least one client. Default: disabled.
+
+.SS "Logging options"
+.TP
+.BR \-\-log\-level\ \fIN
+Verbosity level of messages from 0 (info) to 3 (debug). Enabling debugging messages can slow down the program.
+Available levels: 0 (info), 1 (performance), 2 (verbose), 3 (debug).
+Default: 0.
+.TP
+.BR \-\-perf
+Enable performance messages (same as \-\-log\-level=1). Default: disabled.
+.TP
+.BR \-\-verbose
+Enable verbose messages and lower (same as \-\-log\-level=2). Default: disabled.
+.TP
+.BR \-\-debug
+Enable debug messages and lower (same as \-\-log\-level=3). Default: disabled.
+.TP
+.BR \-\-force\-log\-colors
+Force color logging. Default: colored if stderr is a TTY.
+.TP
+.BR \-\-no\-log\-colors
+Disable color logging. Default: ditto.
+
+.SS "Help options"
+.TP
+.BR \-h ", " \-\-help
+Print this text and exit.
+.TP
+.BR \-v ", " \-\-version
+Print version and exit.
+.TP
+.BR \-\-features
+Print list of supported features.
+
+.SH "SEE ALSO"
+.BR ustreamer-dump (1)
+
+.SH BUGS
+Please file any bugs and issues at \fIhttps://github.com/pikvm/ustreamer/issues\fR
+
+.SH AUTHOR
+Maxim Devaev <mdevaev@gmail.com>
+
+.SH HOMEPAGE
+\fIhttps://pikvm.org/\fR
+
+.SH COPYRIGHT
+GNU General Public License v3.0
+

pkg/arch/PKGBUILD

@@ -3,32 +3,46 @@
 
 
 pkgname=ustreamer
-pkgver=1.26
+pkgver=5.24
 pkgrel=1
-pkgdesc="Lightweight and fast MJPG-HTTP streamer"
+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 libutil-linux libbsd libgpiod)
-# optional: raspberrypi-firmware for OMX encoder
-makedepends=(gcc make)
+depends=(libjpeg libevent libbsd libgpiod systemd)
+makedepends=(gcc make systemd)
 source=(${pkgname}::"git+https://github.com/pikvm/ustreamer#commit=v${pkgver}")
 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)
+fi
+if [ -e /usr/include/janus/plugins/plugin.h ];then
+	depends+=(janus-gateway alsa-lib opus)
+	makedepends+=(janus-gateway alsa-lib opus)
+	_options="$_options WITH_JANUS=1"
+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
 	cp -r $pkgname $pkgname-build
 	cd $pkgname-build
-
-	local _options="WITH_GPIO=1"
-	[ -e /opt/vc/include/IL/OMX_Core.h ] && _options="$_options WITH_OMX=1"
-
 	make $_options CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" $MAKEFLAGS
 }
 
 package() {
 	cd "$srcdir/$pkgname-build"
-	make DESTDIR="$pkgdir" PREFIX=/usr install
+	make $_options CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" DESTDIR="$pkgdir" PREFIX=/usr install
 }

pkg/docker/Dockerfile.alpine

@@ -0,0 +1,34 @@
+FROM alpine:3.16 as build
+RUN apk add --no-cache \
+		alpine-sdk \
+		linux-headers \
+		libjpeg-turbo-dev \
+		libevent-dev \
+		libbsd-dev \
+		libgpiod-dev
+
+WORKDIR /build/ustreamer/
+COPY . .
+RUN make -j5 WITH_GPIO=1
+
+FROM alpine:3.16 as run
+
+RUN apk add --no-cache \
+		libevent \
+		libjpeg-turbo \
+		libevent \
+		libgpiod \
+		libbsd \
+		v4l-utils
+
+WORKDIR /ustreamer
+COPY --from=build /build/ustreamer/src/ustreamer.bin ustreamer
+
+RUN wget https://raw.githubusercontent.com/pikvm/kvmd/master/configs/kvmd/tc358743-edid.hex -O /edid.hex
+COPY pkg/docker/entry.sh /
+
+EXPOSE 8080
+ENTRYPOINT ["/entry.sh"]
+CMD ["--dv-timings", "--format", "UYVY"]
+
+# vim: syntax=dockerfile

pkg/docker/Dockerfile.arm.cross

@@ -7,13 +7,12 @@ RUN apt-get update \
 		gcc \
 		libjpeg8-dev \
 		libbsd-dev \
-		libraspberrypi-dev \
 		libgpiod-dev \
 	&& rm -rf /var/lib/apt/lists/*
 
 WORKDIR /build/ustreamer/
 COPY . .
-RUN make -j5 WITH_OMX=1 WITH_GPIO=1
+RUN make -j5 WITH_GPIO=1
 RUN ["cross-build-end"]
 
 FROM balenalib/raspberrypi3-debian:run as RUN
@@ -25,7 +24,6 @@ RUN apt-get update \
 		libevent-2.1 \
 		libevent-pthreads-2.1-6 \
 		libjpeg8 \
-		uuid \
 		libbsd0 \
 		libgpiod2 \
 	&& rm -rf /var/lib/apt/lists/*

pkg/docker/Dockerfile.arm.native

@@ -5,13 +5,12 @@ RUN apt-get update \
 		gcc \
 		libjpeg8-dev \
 		libbsd-dev \
-		libraspberrypi-dev \
 		libgpiod-dev \
 	&& rm -rf /var/lib/apt/lists/*
 
 WORKDIR /build/ustreamer/
 COPY . .
-RUN make -j5 WITH_OMX=1 WITH_GPIO=1
+RUN make -j5 WITH_GPIO=1
 
 FROM balenalib/raspberrypi3-debian:run as RUN
 
@@ -20,7 +19,6 @@ RUN apt-get update \
 		libevent-2.1 \
 		libevent-pthreads-2.1-6 \
 		libjpeg8 \
-		uuid \
 		libbsd0 \
 		libgpiod2 \
 	&& rm -rf /var/lib/apt/lists/*

pkg/docker/Dockerfile.x64.native

@@ -8,7 +8,6 @@ RUN apt-get update \
 		git \
 		libevent-dev \
 		libjpeg62-turbo-dev \
-		uuid-dev \
 		libbsd-dev \
 		libgpiod-dev \
 	&& rm -rf /var/lib/apt/lists/*
@@ -25,7 +24,6 @@ RUN apt-get update \
 		libevent-2.1 \
 		libevent-pthreads-2.1-6 \
 		libjpeg62-turbo \
-		uuid \
 		libbsd0 \
 		libgpiod2 \
 	&& rm -rf /var/lib/apt/lists/*

pkg/docker/entry.sh

@@ -0,0 +1,14 @@
+#!/bin/sh
+
+set -e
+
+[ -z "$NO_EDID" ] && {
+	[ -n "$EDID_HEX" ] && echo "$EDID_HEX" > /edid.hex
+	while true; do
+		v4l2-ctl --device=/dev/video0 --set-edid=file=/edid.hex --fix-edid-checksums --info-edid && break
+		echo 'Failed to set EDID. Reetrying...'
+		sleep 1
+	done
+}
+
+./ustreamer --host=0.0.0.0 $@

pkg/gentoo/ustreamer-9999.ebuild

@@ -1,28 +1,30 @@
 # Copyright 2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
- 
+
 EAPI=7
- 
+
 inherit git-r3
- 
-DESCRIPTION="uStreamer - Lightweight and fast MJPG-HTTP streamer"
+
+DESCRIPTION="uStreamer - Lightweight and fast MJPEG-HTTP streamer"
 HOMEPAGE="https://github.com/pikvm/ustreamer"
 EGIT_REPO_URI="https://github.com/pikvm/ustreamer.git"
- 
+
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64"
 IUSE=""
- 
+
 DEPEND="
 	>=dev-libs/libevent-2.1.8
 	>=media-libs/libjpeg-turbo-1.5.3
-	>=sys-apps/util-linux-2.33
 	>=dev-libs/libbsd-0.9.1
 "
 RDEPEND="${DEPEND}"
 BDEPEND=""
- 
+
 src_install() {
-	dobin ustreamer 
+	dobin ustreamer
+	dobin ustreamer-dump
+	doman man/ustreamer.1
+	doman man/ustreamer-dump.1
 }

pkg/openwrt/Makefile

@@ -6,7 +6,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ustreamer
-PKG_VERSION:=1.26
+PKG_VERSION:=5.24
 PKG_RELEASE:=1
 PKG_MAINTAINER:=Maxim Devaev <mdevaev@gmail.com>
 
@@ -25,17 +25,18 @@ define Package/ustreamer
   SECTION:=multimedia
   CATEGORY:=Multimedia
   TITLE:=uStreamer
-  DEPENDS:=+libpthread +libjpeg +libv4l +libuuid +libbsd +libevent2 +libevent2-core +libevent2-extra +libevent2-pthreads
+  DEPENDS:=+libpthread +libjpeg +libv4l +libbsd +libevent2 +libevent2-core +libevent2-extra +libevent2-pthreads
   URL:=https://github.com/pikvm/ustreamer
 endef
 
 define Package/ustreamer/description
- µStreamer - Lightweight and fast MJPG-HTTP streamer
+ µStreamer - Lightweight and fast MJPEG-HTTP streamer
 endef
 
 define Package/ustreamer/install
 	$(INSTALL_DIR) $(1)/usr/bin
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/ustreamer $(1)/usr/bin/
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/ustreamer-dump $(1)/usr/bin/
 	$(INSTALL_DIR) $(1)/etc/config
 	$(CP) ./files/ustreamer.config $(1)/etc/config/ustreamer
 	$(INSTALL_DIR) $(1)/etc/init.d

python/Makefile

@@ -0,0 +1,20 @@
+-include ../config.mk
+
+DESTDIR ?=
+PREFIX ?= /usr/local
+
+PY ?= python3
+
+
+# =====
+all:
+	$(info == PY_BUILD ustreamer-*.so)
+	@ $(PY) setup.py build
+
+
+install:
+	$(PY) setup.py install --prefix=$(PREFIX) --root=$(if $(DESTDIR),$(DESTDIR),/)
+
+
+clean:
+	rm -rf build

python/setup.py

@@ -0,0 +1,35 @@
+import os
+
+from setuptools import Extension
+from setuptools import setup
+
+
+# =====
+def _find_sources(suffix: str) -> list[str]:
+    sources: list[str] = []
+    for (root_path, _, names) in os.walk("src"):
+        for name in names:
+            if name.endswith(suffix):
+                sources.append(os.path.join(root_path, name))
+    return sources
+
+
+if __name__ == "__main__":
+    setup(
+        name="ustreamer",
+        version="5.24",
+        description="uStreamer tools",
+        author="Maxim Devaev",
+        author_email="mdevaev@gmail.com",
+        url="https://github.com/pikvm/ustreamer",
+        ext_modules=[
+            Extension(
+                "ustreamer",
+                libraries=["rt", "m", "pthread"],
+                extra_compile_args=["-std=c17", "-D_GNU_SOURCE"],
+                undef_macros=["NDEBUG"],
+                sources=_find_sources(".c"),
+                depends=_find_sources(".h"),
+            ),
+        ],
+    )

python/src/uslibs/frame.c

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

python/src/uslibs/frame.h

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

python/src/uslibs/memsinksh.h

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

python/src/uslibs/tools.h

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

python/src/ustreamer.c

@@ -0,0 +1,315 @@
+#include <stdio.h>
+#include <stdint.h>
+#include <stdbool.h>
+#include <stdlib.h>
+#include <string.h>
+#include <fcntl.h>
+#include <errno.h>
+
+#include <sys/types.h>
+#include <sys/file.h>
+#include <sys/stat.h>
+#include <sys/mman.h>
+
+#include <Python.h>
+
+#include "uslibs/tools.h"
+#include "uslibs/frame.h"
+#include "uslibs/memsinksh.h"
+
+
+typedef struct {
+	PyObject_HEAD
+
+	char	*obj;
+	double	lock_timeout;
+	double	wait_timeout;
+	double	drop_same_frames;
+
+	int					fd;
+	us_memsink_shared_s	*mem;
+
+	uint64_t		frame_id;
+	long double		frame_ts;
+	us_frame_s		*frame;
+} _MemsinkObject;
+
+
+#define _MEM(x_next)	self->mem->x_next
+#define _FRAME(x_next)	self->frame->x_next
+
+
+static void _MemsinkObject_destroy_internals(_MemsinkObject *self) {
+	if (self->mem != NULL) {
+		us_memsink_shared_unmap(self->mem);
+		self->mem = NULL;
+	}
+	if (self->fd >= 0) {
+		close(self->fd);
+		self->fd = -1;
+	}
+	if (self->frame != NULL) {
+		us_frame_destroy(self->frame);
+		self->frame = NULL;
+	}
+}
+
+static int _MemsinkObject_init(_MemsinkObject *self, PyObject *args, PyObject *kwargs) {
+	self->lock_timeout = 1;
+	self->wait_timeout = 1;
+
+	static char *kws[] = {"obj", "lock_timeout", "wait_timeout", "drop_same_frames", NULL};
+	if (!PyArg_ParseTupleAndKeywords(
+		args, kwargs, "s|ddd", kws,
+		&self->obj, &self->lock_timeout, &self->wait_timeout, &self->drop_same_frames)) {
+		return -1;
+	}
+
+#	define SET_DOUBLE(_field, _cond) { \
+			if (!(self->_field _cond)) { \
+				PyErr_SetString(PyExc_ValueError, #_field " must be " #_cond); \
+				return -1; \
+			} \
+		}
+
+	SET_DOUBLE(lock_timeout, > 0);
+	SET_DOUBLE(wait_timeout, > 0);
+	SET_DOUBLE(drop_same_frames, >= 0);
+
+#	undef SET_DOUBLE
+
+	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) {
+		PyErr_SetFromErrno(PyExc_OSError);
+		goto error;
+	}
+
+	return 0;
+
+	error:
+		_MemsinkObject_destroy_internals(self);
+		return -1;
+}
+
+static PyObject *_MemsinkObject_repr(_MemsinkObject *self) {
+	char repr[1024];
+	snprintf(repr, 1023, "<Memsink(%s)>", self->obj);
+	return Py_BuildValue("s", repr);
+}
+
+static void _MemsinkObject_dealloc(_MemsinkObject *self) {
+	_MemsinkObject_destroy_internals(self);
+	PyObject_Del(self);
+}
+
+static PyObject *_MemsinkObject_close(_MemsinkObject *self, PyObject *Py_UNUSED(ignored)) {
+	_MemsinkObject_destroy_internals(self);
+	Py_RETURN_NONE;
+}
+
+static PyObject *_MemsinkObject_enter(_MemsinkObject *self, PyObject *Py_UNUSED(ignored)) {
+	Py_INCREF(self);
+	return (PyObject *)self;
+}
+
+static PyObject *_MemsinkObject_exit(_MemsinkObject *self, PyObject *Py_UNUSED(ignored)) {
+	return PyObject_CallMethod((PyObject *)self, "close", "");
+}
+
+static int _wait_frame(_MemsinkObject *self) {
+	const long double deadline_ts = us_get_now_monotonic() + self->wait_timeout;
+
+#	define RETURN_OS_ERROR { \
+			Py_BLOCK_THREADS \
+			PyErr_SetFromErrno(PyExc_OSError); \
+			return -1; \
+		}
+
+	long double now;
+	do {
+		Py_BEGIN_ALLOW_THREADS
+
+		const int retval = us_flock_timedwait_monotonic(self->fd, self->lock_timeout);
+		now = us_get_now_monotonic();
+
+		if (retval < 0 && errno != EWOULDBLOCK) {
+			RETURN_OS_ERROR;
+
+		} else if (retval == 0) {
+			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)
+						&& !memcmp(_FRAME(data), _MEM(data), _MEM(used))
+					) {
+						self->frame_id = _MEM(id);
+						goto drop;
+					}
+				}
+
+				Py_BLOCK_THREADS
+				return 0;
+			}
+
+			if (flock(self->fd, LOCK_UN) < 0) {
+				RETURN_OS_ERROR;
+			}
+		}
+
+		drop:
+
+		if (usleep(1000) < 0) {
+			RETURN_OS_ERROR;
+		}
+
+		Py_END_ALLOW_THREADS
+
+		if (PyErr_CheckSignals() < 0) {
+			return -1;
+		}
+	} while (now < deadline_ts);
+
+#	undef RETURN_OS_ERROR
+
+	return -2;
+}
+
+static PyObject *_MemsinkObject_wait_frame(_MemsinkObject *self, PyObject *Py_UNUSED(ignored)) {
+	if (self->mem == NULL || self->fd <= 0) {
+		PyErr_SetString(PyExc_RuntimeError, "Closed");
+		return NULL;
+	}
+
+	switch (_wait_frame(self)) {
+		case 0: break;
+		case -2: Py_RETURN_NONE;
+		default: return NULL;
+	}
+
+	us_frame_set_data(self->frame, _MEM(data), _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 (flock(self->fd, LOCK_UN) < 0) {
+		return PyErr_SetFromErrno(PyExc_OSError);
+	}
+
+	PyObject *dict_frame = PyDict_New();
+	if (dict_frame  == NULL) {
+		return NULL;
+	}
+
+#	define SET_VALUE(_key, _maker) { \
+			PyObject *_tmp = _maker; \
+			if (_tmp == NULL) { \
+				return NULL; \
+			} \
+			if (PyDict_SetItemString(dict_frame, _key, _tmp) < 0) { \
+				Py_DECREF(_tmp); \
+				return NULL; \
+			} \
+			Py_DECREF(_tmp); \
+		}
+#	define SET_NUMBER(_key, _from, _to) SET_VALUE(#_key, Py##_to##_From##_from(_FRAME(_key)))
+
+	SET_NUMBER(width, Long, Long);
+	SET_NUMBER(height, Long, Long);
+	SET_NUMBER(format, Long, Long);
+	SET_NUMBER(stride, Long, Long);
+	SET_NUMBER(online, Long, Bool);
+	SET_NUMBER(key, Long, Bool);
+	SET_NUMBER(grab_ts, Double, Float);
+	SET_NUMBER(encode_begin_ts, Double, Float);
+	SET_NUMBER(encode_end_ts, Double, Float);
+	SET_VALUE("data", PyBytes_FromStringAndSize((const char *)_FRAME(data), _FRAME(used)));
+
+#	undef SET_NUMBER
+#	undef SET_VALUE
+
+	return dict_frame;
+}
+
+static PyObject *_MemsinkObject_is_opened(_MemsinkObject *self, PyObject *Py_UNUSED(ignored)) {
+	return PyBool_FromLong(self->mem != NULL && self->fd > 0);
+}
+
+#define FIELD_GETTER(_field, _from, _to) \
+	static PyObject *_MemsinkObject_getter_##_field(_MemsinkObject *self, void *Py_UNUSED(closure)) { \
+		return Py##_to##_From##_from(self->_field); \
+	}
+
+FIELD_GETTER(obj, String, Unicode)
+FIELD_GETTER(lock_timeout, Double, Float)
+FIELD_GETTER(wait_timeout, Double, Float)
+FIELD_GETTER(drop_same_frames, Double, Float)
+
+#undef FIELD_GETTER
+
+static PyMethodDef _MemsinkObject_methods[] = {
+#	define ADD_METHOD(_name, _method, _flags) \
+		{.ml_name = _name, .ml_meth = (PyCFunction)_MemsinkObject_##_method, .ml_flags = (_flags)}
+	ADD_METHOD("close", close, METH_NOARGS),
+	ADD_METHOD("__enter__", enter, METH_NOARGS),
+	ADD_METHOD("__exit__", exit, METH_VARARGS),
+	ADD_METHOD("wait_frame", wait_frame, METH_NOARGS),
+	ADD_METHOD("is_opened", is_opened, METH_NOARGS),
+	{},
+#	undef ADD_METHOD
+};
+
+static PyGetSetDef _MemsinkObject_getsets[] = {
+#	define ADD_GETTER(_field) {.name = #_field, .get = (getter)_MemsinkObject_getter_##_field}
+	ADD_GETTER(obj),
+	ADD_GETTER(lock_timeout),
+	ADD_GETTER(wait_timeout),
+	ADD_GETTER(drop_same_frames),
+	{},
+#	undef ADD_GETTER
+};
+
+static PyTypeObject _MemsinkType = {
+	PyVarObject_HEAD_INIT(NULL, 0)
+	.tp_name		= "ustreamer.Memsink",
+	.tp_basicsize	= sizeof(_MemsinkObject),
+	.tp_flags		= Py_TPFLAGS_DEFAULT,
+	.tp_new			= PyType_GenericNew,
+	.tp_init		= (initproc)_MemsinkObject_init,
+	.tp_dealloc		= (destructor)_MemsinkObject_dealloc,
+	.tp_repr		= (reprfunc)_MemsinkObject_repr,
+	.tp_methods		= _MemsinkObject_methods,
+	.tp_getset		= _MemsinkObject_getsets,
+};
+
+static PyModuleDef _Module = {
+	PyModuleDef_HEAD_INIT,
+	.m_name = "ustreamer",
+	.m_size = -1,
+};
+
+PyMODINIT_FUNC PyInit_ustreamer(void) { // cppcheck-suppress unusedFunction
+	PyObject *module = PyModule_Create(&_Module);
+	if (module == NULL) {
+		return NULL;
+	}
+
+	if (PyType_Ready(&_MemsinkType) < 0) {
+		return NULL;
+	}
+
+	Py_INCREF(&_MemsinkType);
+
+	if (PyModule_AddObject(module, "Memsink", (PyObject *)&_MemsinkType) < 0) {
+		return NULL;
+	}
+
+	return module;
+}

src/Makefile

@@ -0,0 +1,108 @@
+DESTDIR ?=
+PREFIX ?= /usr/local
+
+CC ?= gcc
+CFLAGS ?= -O3
+LDFLAGS ?=
+
+
+# =====
+_USTR = ustreamer.bin
+_DUMP = ustreamer-dump.bin
+
+_CFLAGS = -MD -c -std=c17 -Wall -Wextra -D_GNU_SOURCE $(CFLAGS)
+_LDFLAGS = $(LDFLAGS)
+
+_COMMON_LIBS = -lm -ljpeg -pthread -lrt
+
+_USTR_LIBS = $(_COMMON_LIBS) -levent -levent_pthreads
+_USTR_SRCS = $(shell ls \
+	libs/*.c \
+	ustreamer/*.c \
+	ustreamer/http/*.c \
+	ustreamer/data/*.c \
+	ustreamer/encoders/cpu/*.c \
+	ustreamer/encoders/hw/*.c \
+	ustreamer/h264/*.c \
+)
+
+_DUMP_LIBS = $(_COMMON_LIBS)
+_DUMP_SRCS = $(shell ls \
+	libs/*.c \
+	dump/*.c \
+)
+
+_BUILD = build
+
+
+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
+_USTR_SRCS += $(shell ls ustreamer/gpio/*.c)
+endif
+
+
+ifneq ($(call optbool,$(WITH_SYSTEMD)),)
+_USTR_LIBS += -lsystemd
+override _CFLAGS += -DWITH_SYSTEMD
+_USTR_SRCS += $(shell ls ustreamer/http/systemd/*.c)
+endif
+
+
+WITH_PTHREAD_NP ?= 1
+ifneq ($(call optbool,$(WITH_PTHREAD_NP)),)
+override _CFLAGS += -DWITH_PTHREAD_NP
+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
+endif
+
+
+# =====
+all: $(_USTR) $(_DUMP)
+
+
+install: all
+	mkdir -p $(DESTDIR)$(PREFIX)/bin
+	install -m755 $(_USTR) $(DESTDIR)$(PREFIX)/bin/$(subst .bin,,$(_USTR))
+	install -m755 $(_DUMP) $(DESTDIR)$(PREFIX)/bin/$(subst .bin,,$(_DUMP))
+
+
+install-strip: install
+	strip $(DESTDIR)$(PREFIX)/bin/$(subst .bin,,$(_USTR))
+	strip $(DESTDIR)$(PREFIX)/bin/$(subst .bin,,$(_DUMP))
+
+
+$(_USTR): $(_USTR_SRCS:%.c=$(_BUILD)/%.o)
+	$(info == LD $@)
+	@ $(CC) $^ -o $@ $(_LDFLAGS) $(_USTR_LIBS)
+
+
+$(_DUMP): $(_DUMP_SRCS:%.c=$(_BUILD)/%.o)
+	$(info == LD $@)
+	@ $(CC) $^ -o $@ $(_LDFLAGS) $(_DUMP_LIBS)
+
+
+$(_BUILD)/%.o: %.c
+	$(info -- CC $<)
+	@ mkdir -p $(dir $@) || true
+	@ $(CC) $< -o $@ $(_CFLAGS)
+
+
+clean:
+	rm -rf $(_USTR) $(_DUMP) $(_BUILD)
+
+
+_OBJS = $(_USTR_SRCS:%.c=$(_BUILD)/%.o) $(_DUMP_SRCS:%.c=$(_BUILD)/%.o)
+-include $(_OBJS:%.o=%.d)

src/device.c

@@ -1,878 +0,0 @@
-/*****************************************************************************
-#                                                                            #
-#    uStreamer - Lightweight and fast MJPG-HTTP streamer.                    #
-#                                                                            #
-#    Copyright (C) 2018  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 "device.h"
-
-#include <stdlib.h>
-#include <stddef.h>
-#include <stdbool.h>
-#include <string.h>
-#include <strings.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <errno.h>
-#include <assert.h>
-
-#include <sys/select.h>
-#include <sys/mman.h>
-#include <sys/time.h>
-
-#include <linux/videodev2.h>
-#include <linux/v4l2-controls.h>
-
-#include "tools.h"
-#include "logging.h"
-#include "threading.h"
-#include "xioctl.h"
-#include "picture.h"
-
-
-static const struct {
-	const char *name;
-	const v4l2_std_id standard;
-} _STANDARDS[] = {
-	{"UNKNOWN",	V4L2_STD_UNKNOWN},
-	{"PAL",		V4L2_STD_PAL},
-	{"NTSC",	V4L2_STD_NTSC},
-	{"SECAM",	V4L2_STD_SECAM},
-};
-
-static const struct {
-	const char *name;
-	const unsigned format;
-} _FORMATS[] = {
-	{"YUYV",	V4L2_PIX_FMT_YUYV},
-	{"UYVY",	V4L2_PIX_FMT_UYVY},
-	{"RGB565",	V4L2_PIX_FMT_RGB565},
-	{"RGB24",	V4L2_PIX_FMT_RGB24},
-	{"JPEG",	V4L2_PIX_FMT_MJPEG},
-	{"JPEG",	V4L2_PIX_FMT_JPEG},
-};
-
-static const struct {
-	const char *name;
-	const enum v4l2_memory io_method;
-} _IO_METHODS[] = {
-	{"MMAP",	V4L2_MEMORY_MMAP},
-	{"USERPTR",	V4L2_MEMORY_USERPTR},
-};
-
-
-static int _device_open_check_cap(struct device_t *dev);
-static int _device_open_dv_timings(struct device_t *dev);
-static int _device_apply_dv_timings(struct device_t *dev);
-static int _device_open_format(struct device_t *dev);
-static void _device_open_hw_fps(struct device_t *dev);
-static int _device_open_io_method(struct device_t *dev);
-static int _device_open_io_method_mmap(struct device_t *dev);
-static int _device_open_io_method_userptr(struct device_t *dev);
-static int _device_open_queue_buffers(struct device_t *dev);
-static void _device_open_alloc_picbufs(struct device_t *dev);
-static int _device_apply_resolution(struct device_t *dev, unsigned width, unsigned height);
-
-static void _device_apply_controls(struct device_t *dev);
-static int _device_query_control(struct device_t *dev, struct v4l2_queryctrl *query, const char *name, unsigned cid, bool quiet);
-static void _device_set_control(struct device_t *dev, struct v4l2_queryctrl *query, const char *name, unsigned cid, int value, bool quiet);
-
-static const char *_format_to_string_fourcc(char *buf, size_t size, unsigned format);
-static const char *_format_to_string_nullable(unsigned format);
-static const char *_format_to_string_supported(unsigned format);
-static const char *_standard_to_string(v4l2_std_id standard);
-static const char *_io_method_to_string_supported(enum v4l2_memory io_method);
-
-
-struct device_t *device_init(void) {
-	struct device_runtime_t *run;
-	struct device_t *dev;
-	long cores_sysconf;
-	unsigned cores_available;
-
-	cores_sysconf = sysconf(_SC_NPROCESSORS_ONLN);
-	cores_sysconf = (cores_sysconf < 0 ? 0 : cores_sysconf);
-	cores_available = max_u(min_u(cores_sysconf, 4), 1);
-
-	A_CALLOC(run, 1);
-	run->fd = -1;
-
-	A_CALLOC(dev, 1);
-	dev->path = "/dev/video0";
-	dev->width = 640;
-	dev->height = 480;
-	dev->format = V4L2_PIX_FMT_YUYV;
-	dev->standard = V4L2_STD_UNKNOWN;
-	dev->n_buffers = cores_available + 1;
-	dev->n_workers = min_u(cores_available, dev->n_buffers);
-	dev->min_frame_size = 128;
-	dev->timeout = 1;
-	dev->error_delay = 1;
-	dev->io_method = V4L2_MEMORY_MMAP;
-	dev->run = run;
-	return dev;
-}
-
-void device_destroy(struct device_t *dev) {
-	free(dev->run);
-	free(dev);
-}
-
-int device_parse_format(const char *str) {
-	for (unsigned index = 0; index < ARRAY_LEN(_FORMATS); ++index) {
-		if (!strcasecmp(str, _FORMATS[index].name)) {
-			return _FORMATS[index].format;
-		}
-	}
-	return FORMAT_UNKNOWN;
-}
-
-v4l2_std_id device_parse_standard(const char *str) {
-	for (unsigned index = 1; index < ARRAY_LEN(_STANDARDS); ++index) {
-		if (!strcasecmp(str, _STANDARDS[index].name)) {
-			return _STANDARDS[index].standard;
-		}
-	}
-	return STANDARD_UNKNOWN;
-}
-
-int device_parse_io_method(const char *str) {
-	for (unsigned index = 0; index < ARRAY_LEN(_IO_METHODS); ++index) {
-		if (!strcasecmp(str, _IO_METHODS[index].name)) {
-			return _IO_METHODS[index].io_method;
-		}
-	}
-	return IO_METHOD_UNKNOWN;
-}
-
-int device_open(struct device_t *dev) {
-	if ((dev->run->fd = open(dev->path, O_RDWR|O_NONBLOCK)) < 0) {
-		LOG_PERROR("Can't open device");
-		goto error;
-	}
-	LOG_INFO("Device fd=%d opened", dev->run->fd);
-
-	if (_device_open_check_cap(dev) < 0) {
-		goto error;
-	}
-	if (_device_open_dv_timings(dev) < 0) {
-		goto error;
-	}
-	if (_device_open_format(dev) < 0) {
-		goto error;
-	}
-	_device_open_hw_fps(dev);
-	if (_device_open_io_method(dev) < 0) {
-		goto error;
-	}
-	if (_device_open_queue_buffers(dev) < 0) {
-		goto error;
-	}
-	_device_open_alloc_picbufs(dev);
-	_device_apply_controls(dev);
-
-	dev->run->n_workers = min_u(dev->run->n_buffers, dev->n_workers);
-
-	LOG_DEBUG("Device fd=%d initialized", dev->run->fd);
-	return 0;
-
-	error:
-		device_close(dev);
-		return -1;
-}
-
-void device_close(struct device_t *dev) {
-	dev->run->n_workers = 0;
-
-	if (dev->run->pictures) {
-		LOG_DEBUG("Releasing picture buffers ...");
-		for (unsigned index = 0; index < dev->run->n_buffers; ++index) {
-			picture_destroy(dev->run->pictures[index]);
-		}
-		free(dev->run->pictures);
-		dev->run->pictures = NULL;
-	}
-
-	if (dev->run->hw_buffers) {
-		LOG_DEBUG("Releasing device buffers ...");
-		for (unsigned index = 0; index < dev->run->n_buffers; ++index) {
-#			define HW_BUFFER(_next) dev->run->hw_buffers[index]._next
-
-			if (dev->io_method == V4L2_MEMORY_MMAP) {
-				if (HW_BUFFER(allocated) > 0 && HW_BUFFER(data) != MAP_FAILED) {
-					if (munmap(HW_BUFFER(data), HW_BUFFER(allocated)) < 0) {
-						LOG_PERROR("Can't unmap device buffer %u", index);
-					}
-				}
-			} else { // V4L2_MEMORY_USERPTR
-				if (HW_BUFFER(data)) {
-					free(HW_BUFFER(data));
-				}
-			}
-			A_MUTEX_DESTROY(&HW_BUFFER(grabbed_mutex));
-
-#			undef HW_BUFFER
-		}
-		dev->run->n_buffers = 0;
-		free(dev->run->hw_buffers);
-		dev->run->hw_buffers = NULL;
-	}
-
-	if (dev->run->fd >= 0) {
-		LOG_DEBUG("Closing device ...");
-		if (close(dev->run->fd) < 0) {
-			LOG_PERROR("Can't close device fd=%d", dev->run->fd);
-		} else {
-			LOG_INFO("Device fd=%d closed", dev->run->fd);
-		}
-		dev->run->fd = -1;
-	}
-}
-
-int device_switch_capturing(struct device_t *dev, bool enable) {
-	if (enable != dev->run->capturing) {
-		enum v4l2_buf_type type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
-
-		LOG_DEBUG("Calling ioctl(%s) ...", (enable ? "VIDIOC_STREAMON" : "VIDIOC_STREAMOFF"));
-		if (xioctl(dev->run->fd, (enable ? VIDIOC_STREAMON : VIDIOC_STREAMOFF), &type) < 0) {
-			LOG_PERROR("Unable to %s capturing", (enable ? "start" : "stop"));
-			if (enable) {
-				return -1;
-			}
-		}
-
-		dev->run->capturing = enable;
-		LOG_INFO("Capturing %s", (enable ? "started" : "stopped"));
-	}
-    return 0;
-}
-
-int device_select(struct device_t *dev, bool *has_read, bool *has_write, bool *has_error) {
-	struct timeval timeout;
-	int retval;
-
-#	define INIT_FD_SET(_set) \
-		fd_set _set; FD_ZERO(&_set); FD_SET(dev->run->fd, &_set);
-
-	INIT_FD_SET(read_fds);
-	INIT_FD_SET(write_fds);
-	INIT_FD_SET(error_fds);
-
-#	undef INIT_FD_SET
-
-	timeout.tv_sec = dev->timeout;
-	timeout.tv_usec = 0;
-
-	LOG_DEBUG("Calling select() on video device ...");
-
-	retval = select(dev->run->fd + 1, &read_fds, &write_fds, &error_fds, &timeout);
-	if (retval > 0) {
-		*has_read = FD_ISSET(dev->run->fd, &read_fds);
-		*has_write = FD_ISSET(dev->run->fd, &write_fds);
-		*has_error = FD_ISSET(dev->run->fd, &error_fds);
-	} else {
-		*has_read = false;
-		*has_write = false;
-		*has_error = false;
-	}
-
-	LOG_DEBUG("Device select() --> %d", retval);
-	return retval;
-}
-
-int device_grab_buffer(struct device_t *dev) {
-	struct v4l2_buffer buf_info;
-
-	MEMSET_ZERO(buf_info);
-	buf_info.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
-	buf_info.memory = dev->io_method;
-
-	LOG_DEBUG("Grabbing device buffer ...");
-	if (xioctl(dev->run->fd, VIDIOC_DQBUF, &buf_info) < 0) {
-		LOG_PERROR("Unable to grab device buffer");
-		return -1;
-	}
-
-	LOG_DEBUG("Grabbed new frame in device buffer: index=%u, bytesused=%u",
-		buf_info.index, buf_info.bytesused);
-
-	if (buf_info.index >= dev->run->n_buffers) {
-		LOG_ERROR("V4L2 error: grabbed invalid device buffer: index=%u, nbuffers=%u",
-			buf_info.index, dev->run->n_buffers);
-		return -1;
-	}
-
-#	define HW_BUFFER(_next) dev->run->hw_buffers[buf_info.index]._next
-
-	A_MUTEX_LOCK(&HW_BUFFER(grabbed_mutex));
-	if (HW_BUFFER(grabbed)) {
-		LOG_ERROR("V4L2 error: grabbed device buffer is already used: index=%u, bytesused=%u",
-			buf_info.index, buf_info.bytesused);
-		A_MUTEX_UNLOCK(&HW_BUFFER(grabbed_mutex));
-		return -1;
-	}
-	HW_BUFFER(grabbed) = true;
-	A_MUTEX_UNLOCK(&HW_BUFFER(grabbed_mutex));
-
-	HW_BUFFER(used) = buf_info.bytesused;
-	memcpy(&HW_BUFFER(buf_info), &buf_info, sizeof(struct v4l2_buffer));
-	dev->run->pictures[buf_info.index]->grab_ts = get_now_monotonic();
-
-#	undef HW_BUFFER
-	return buf_info.index;
-}
-
-int device_release_buffer(struct device_t *dev, unsigned index) {
-#	define HW_BUFFER(_next) dev->run->hw_buffers[index]._next
-
-	LOG_DEBUG("Releasing device buffer index=%u ...", index);
-
-	A_MUTEX_LOCK(&HW_BUFFER(grabbed_mutex));
-	if (xioctl(dev->run->fd, VIDIOC_QBUF, &HW_BUFFER(buf_info)) < 0) {
-		LOG_PERROR("Unable to release device buffer index=%u", index);
-		A_MUTEX_UNLOCK(&HW_BUFFER(grabbed_mutex));
-		return -1;
-	}
-	HW_BUFFER(grabbed) = false;
-	A_MUTEX_UNLOCK(&HW_BUFFER(grabbed_mutex));
-	HW_BUFFER(used) = 0;
-
-#	undef HW_BUFFER
-	return 0;
-}
-
-int device_consume_event(struct device_t *dev) {
-	struct v4l2_event event;
-
-	LOG_DEBUG("Calling ioctl(VIDIOC_DQEVENT) ...");
-	if (xioctl(dev->run->fd, VIDIOC_DQEVENT, &event) == 0) {
-		switch (event.type) {
-			case V4L2_EVENT_SOURCE_CHANGE:
-				LOG_INFO("Got V4L2_EVENT_SOURCE_CHANGE: source changed");
-				return -1;
-			case V4L2_EVENT_EOS:
-				LOG_INFO("Got V4L2_EVENT_EOS: end of stream (ignored)");
-				return 0;
-		}
-	} else {
-		LOG_PERROR("Got some V4L2 device event, but where is it? ");
-	}
-	return 0;
-}
-
-static int _device_open_check_cap(struct device_t *dev) {
-	struct v4l2_capability cap;
-	int input = dev->input; // Needs pointer to int for ioctl()
-
-	MEMSET_ZERO(cap);
-
-	LOG_DEBUG("Calling ioctl(VIDIOC_QUERYCAP) ...");
-	if (xioctl(dev->run->fd, VIDIOC_QUERYCAP, &cap) < 0) {
-		LOG_PERROR("Can't query device (VIDIOC_QUERYCAP)");
-		return -1;
-	}
-
-	if (!(cap.capabilities & V4L2_CAP_VIDEO_CAPTURE)) {
-		LOG_ERROR("Video capture not supported by the device");
-		return -1;
-	}
-
-	if (!(cap.capabilities & V4L2_CAP_STREAMING)) {
-		LOG_ERROR("Device does not support streaming IO");
-		return -1;
-	}
-
-	LOG_INFO("Using input channel: %d", input);
-	if (xioctl(dev->run->fd, VIDIOC_S_INPUT, &input) < 0) {
-		LOG_ERROR("Can't set input channel");
-		return -1;
-	}
-
-	if (dev->standard != V4L2_STD_UNKNOWN) {
-		LOG_INFO("Using TV standard: %s", _standard_to_string(dev->standard));
-		if (xioctl(dev->run->fd, VIDIOC_S_STD, &dev->standard) < 0) {
-			LOG_ERROR("Can't set video standard");
-			return -1;
-		}
-	} else {
-		LOG_INFO("Using TV standard: DEFAULT");
-	}
-	return 0;
-}
-
-static int _device_open_dv_timings(struct device_t *dev) {
-	_device_apply_resolution(dev, dev->width, dev->height);
-	if (dev->dv_timings) {
-		LOG_DEBUG("Using DV timings");
-
-		if (_device_apply_dv_timings(dev) < 0) {
-			return -1;
-		}
-
-		struct v4l2_event_subscription sub;
-
-		MEMSET_ZERO(sub);
-		sub.type = V4L2_EVENT_SOURCE_CHANGE;
-
-		LOG_DEBUG("Calling ioctl(VIDIOC_SUBSCRIBE_EVENT) ...");
-		if (xioctl(dev->run->fd, VIDIOC_SUBSCRIBE_EVENT, &sub) < 0) {
-			LOG_PERROR("Can't subscribe to V4L2_EVENT_SOURCE_CHANGE");
-			return -1;
-		}
-	}
-	return 0;
-}
-
-static int _device_apply_dv_timings(struct device_t *dev) {
-	struct v4l2_dv_timings dv;
-
-	MEMSET_ZERO(dv);
-
-	LOG_DEBUG("Calling ioctl(VIDIOC_QUERY_DV_TIMINGS) ...");
-	if (xioctl(dev->run->fd, VIDIOC_QUERY_DV_TIMINGS, &dv) == 0) {
-		LOG_INFO("Got new DV timings: resolution=%ux%u, pixclk=%llu",
-			dv.bt.width, dv.bt.height, (unsigned long long)dv.bt.pixelclock); // Issue #11
-
-		LOG_DEBUG("Calling ioctl(VIDIOC_S_DV_TIMINGS) ...");
-		if (xioctl(dev->run->fd, VIDIOC_S_DV_TIMINGS, &dv) < 0) {
-			LOG_PERROR("Failed to set DV timings");
-			return -1;
-		}
-
-		if (_device_apply_resolution(dev, dv.bt.width, dv.bt.height) < 0) {
-			return -1;
-		}
-
-	} else {
-		LOG_DEBUG("Calling ioctl(VIDIOC_QUERYSTD) ...");
-		if (xioctl(dev->run->fd, VIDIOC_QUERYSTD, &dev->standard) == 0) {
-			LOG_INFO("Applying the new VIDIOC_S_STD: %s ...", _standard_to_string(dev->standard));
-			if (xioctl(dev->run->fd, VIDIOC_S_STD, &dev->standard) < 0) {
-				LOG_PERROR("Can't set video standard");
-				return -1;
-			}
-		}
-	}
-	return 0;
-}
-
-static int _device_open_format(struct device_t *dev) {
-	struct v4l2_format fmt;
-
-	MEMSET_ZERO(fmt);
-	fmt.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
-	fmt.fmt.pix.width = dev->run->width;
-	fmt.fmt.pix.height = dev->run->height;
-	fmt.fmt.pix.pixelformat = dev->format;
-	fmt.fmt.pix.field = V4L2_FIELD_ANY;
-
-	// Set format
-	LOG_DEBUG("Calling ioctl(VIDIOC_S_FMT) ...");
-	if (xioctl(dev->run->fd, VIDIOC_S_FMT, &fmt) < 0) {
-		LOG_PERROR("Unable to set pixelformat=%s, resolution=%ux%u",
-			_format_to_string_supported(dev->format),
-			dev->run->width,
-			dev->run->height);
-		return -1;
-	}
-
-	// Check resolution
-	if (fmt.fmt.pix.width != dev->run->width || fmt.fmt.pix.height != dev->run->height) {
-		LOG_ERROR("Requested resolution=%ux%u is unavailable", dev->run->width, dev->run->height);
-	}
-	if (_device_apply_resolution(dev, fmt.fmt.pix.width, fmt.fmt.pix.height) < 0) {
-		return -1;
-	}
-	LOG_INFO("Using resolution: %ux%u", dev->run->width, dev->run->height);
-
-	// Check format
-	if (fmt.fmt.pix.pixelformat != dev->format) {
-		char format_obtained_str[8];
-		char *format_str_nullable;
-
-		LOG_ERROR("Could not obtain the requested pixelformat=%s; driver gave us %s",
-			_format_to_string_supported(dev->format),
-			_format_to_string_supported(fmt.fmt.pix.pixelformat));
-
-		if ((format_str_nullable = (char *)_format_to_string_nullable(fmt.fmt.pix.pixelformat)) != NULL) {
-			LOG_INFO("Falling back to pixelformat=%s", format_str_nullable);
-		} else {
-			LOG_ERROR("Unsupported pixelformat=%s (fourcc)",
-				_format_to_string_fourcc(format_obtained_str, 8, fmt.fmt.pix.pixelformat));
-			return -1;
-		}
-	}
-
-	dev->run->format = fmt.fmt.pix.pixelformat;
-	LOG_INFO("Using pixelformat: %s", _format_to_string_supported(dev->run->format));
-
-	dev->run->raw_size = fmt.fmt.pix.sizeimage; // Only for userptr
-	return 0;
-}
-
-static void _device_open_hw_fps(struct device_t *dev) {
-	struct v4l2_streamparm setfps;
-
-	dev->run->hw_fps = 0;
-
-	MEMSET_ZERO(setfps);
-	setfps.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
-
-	LOG_DEBUG("Calling ioctl(VIDIOC_G_PARM) ...");
-	if (xioctl(dev->run->fd, VIDIOC_G_PARM, &setfps) < 0) {
-		if (errno == ENOTTY) { // Quiet message for Auvidea B101
-			LOG_INFO("Quierying HW FPS changing is not supported");
-		} else {
-			LOG_PERROR("Unable to query HW FPS changing");
-		}
-		return;
-	}
-
-	if (!(setfps.parm.capture.capability & V4L2_CAP_TIMEPERFRAME)) {
-		LOG_INFO("Changing HW FPS is not supported");
-		return;
-	}
-
-#	define SETFPS_TPF(_next) setfps.parm.capture.timeperframe._next
-
-	MEMSET_ZERO(setfps);
-	setfps.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
-	SETFPS_TPF(numerator) = 1;
-	SETFPS_TPF(denominator) = (dev->desired_fps == 0 ? 255 : dev->desired_fps);
-
-	if (xioctl(dev->run->fd, VIDIOC_S_PARM, &setfps) < 0) {
-		LOG_PERROR("Unable to set HW FPS");
-		return;
-	}
-
-	if (SETFPS_TPF(numerator) != 1) {
-		LOG_ERROR("Invalid HW FPS numerator: %u != 1", SETFPS_TPF(numerator));
-		return;
-	}
-
-	if (SETFPS_TPF(denominator) == 0) { // Не знаю, бывает ли так, но пускай на всякий случай
-		LOG_ERROR("Invalid HW FPS denominator: 0");
-		return;
-	}
-
-	dev->run->hw_fps = SETFPS_TPF(denominator);
-	if (dev->desired_fps != dev->run->hw_fps) {
-		LOG_INFO("Using HW FPS: %u -> %u (coerced)", dev->desired_fps, dev->run->hw_fps);
-	} else {
-		LOG_INFO("Using HW FPS: %u", dev->run->hw_fps);
-	}
-
-#	undef SETFPS_TPF
-}
-
-static int _device_open_io_method(struct device_t *dev) {
-	LOG_INFO("Using IO method: %s", _io_method_to_string_supported(dev->io_method));
-	switch (dev->io_method) {
-		case V4L2_MEMORY_MMAP: return _device_open_io_method_mmap(dev);
-		case V4L2_MEMORY_USERPTR: return _device_open_io_method_userptr(dev);
-		default: assert(0 && "Unsupported IO method");
-	}
-	return -1;
-}
-
-static int _device_open_io_method_mmap(struct device_t *dev) {
-	struct v4l2_requestbuffers req;
-
-	MEMSET_ZERO(req);
-	req.count = dev->n_buffers;
-	req.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
-	req.memory = V4L2_MEMORY_MMAP;
-
-	LOG_DEBUG("Calling ioctl(VIDIOC_REQBUFS) for V4L2_MEMORY_MMAP ...");
-	if (xioctl(dev->run->fd, VIDIOC_REQBUFS, &req) < 0) {
-		LOG_PERROR("Device '%s' doesn't support V4L2_MEMORY_MMAP", dev->path);
-		return -1;
-	}
-
-	if (req.count < 1) {
-		LOG_ERROR("Insufficient buffer memory: %u", req.count);
-		return -1;
-	} else {
-		LOG_INFO("Requested %u device buffers, got %u", dev->n_buffers, req.count);
-	}
-
-	LOG_DEBUG("Allocating device buffers ...");
-
-	A_CALLOC(dev->run->hw_buffers, req.count);
-	for (dev->run->n_buffers = 0; dev->run->n_buffers < req.count; ++dev->run->n_buffers) {
-		struct v4l2_buffer buf_info;
-
-		MEMSET_ZERO(buf_info);
-		buf_info.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
-		buf_info.memory = V4L2_MEMORY_MMAP;
-		buf_info.index = dev->run->n_buffers;
-
-		LOG_DEBUG("Calling ioctl(VIDIOC_QUERYBUF) for device buffer %u ...", dev->run->n_buffers);
-		if (xioctl(dev->run->fd, VIDIOC_QUERYBUF, &buf_info) < 0) {
-			LOG_PERROR("Can't VIDIOC_QUERYBUF");
-			return -1;
-		}
-
-#		define HW_BUFFER(_next) dev->run->hw_buffers[dev->run->n_buffers]._next
-
-		A_MUTEX_INIT(&HW_BUFFER(grabbed_mutex));
-
-		LOG_DEBUG("Mapping device buffer %u ...", dev->run->n_buffers);
-		HW_BUFFER(data) = mmap(NULL, buf_info.length, PROT_READ|PROT_WRITE, MAP_SHARED, dev->run->fd, buf_info.m.offset);
-		if (HW_BUFFER(data) == MAP_FAILED) {
-			LOG_PERROR("Can't map device buffer %u", dev->run->n_buffers);
-			return -1;
-		}
-		HW_BUFFER(allocated) = buf_info.length;
-
-#		undef HW_BUFFER
-	}
-	return 0;
-}
-
-static int _device_open_io_method_userptr(struct device_t *dev) {
-	struct v4l2_requestbuffers req;
-	unsigned page_size = getpagesize();
-	unsigned buf_size = align_size(dev->run->raw_size, page_size);
-
-	MEMSET_ZERO(req);
-	req.count = dev->n_buffers;
-	req.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
-	req.memory = V4L2_MEMORY_USERPTR;
-
-	LOG_DEBUG("Calling ioctl(VIDIOC_REQBUFS) for V4L2_MEMORY_USERPTR ...");
-	if (xioctl(dev->run->fd, VIDIOC_REQBUFS, &req) < 0) {
-		LOG_PERROR("Device '%s' doesn't support V4L2_MEMORY_USERPTR", dev->path);
-		return -1;
-	}
-
-	if (req.count < 1) {
-		LOG_ERROR("Insufficient buffer memory: %u", req.count);
-		return -1;
-	} else {
-		LOG_INFO("Requested %u device buffers, got %u", dev->n_buffers, req.count);
-	}
-
-	LOG_DEBUG("Allocating device buffers ...");
-
-	A_CALLOC(dev->run->hw_buffers, req.count);
-	for (dev->run->n_buffers = 0; dev->run->n_buffers < req.count; ++dev->run->n_buffers) {
-#       define HW_BUFFER(_next) dev->run->hw_buffers[dev->run->n_buffers]._next
-
-		assert(HW_BUFFER(data) = aligned_alloc(page_size, buf_size));
-		memset(HW_BUFFER(data), 0, buf_size);
-		HW_BUFFER(allocated) = buf_size;
-
-#		undef HW_BUFFER
-	}
-	return 0;
-}
-
-static int _device_open_queue_buffers(struct device_t *dev) {
-	for (unsigned index = 0; index < dev->run->n_buffers; ++index) {
-		struct v4l2_buffer buf_info;
-
-		MEMSET_ZERO(buf_info);
-		buf_info.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
-		buf_info.memory = dev->io_method;
-		buf_info.index = index;
-		if (dev->io_method == V4L2_MEMORY_USERPTR) {
-			buf_info.m.userptr = (unsigned long)dev->run->hw_buffers[index].data;
-			buf_info.length = dev->run->hw_buffers[index].allocated;
-		}
-
-		LOG_DEBUG("Calling ioctl(VIDIOC_QBUF) for buffer %u ...", index);
-		if (xioctl(dev->run->fd, VIDIOC_QBUF, &buf_info) < 0) {
-			LOG_PERROR("Can't VIDIOC_QBUF");
-			return -1;
-		}
-	}
-	return 0;
-}
-
-static void _device_open_alloc_picbufs(struct device_t *dev) {
-	size_t picture_size = picture_get_generous_size(dev->run->width, dev->run->height);
-
-	LOG_DEBUG("Allocating picture buffers ...");
-	A_CALLOC(dev->run->pictures, dev->run->n_buffers);
-
-	for (unsigned index = 0; index < dev->run->n_buffers; ++index) {
-		dev->run->pictures[index] = picture_init();
-		LOG_DEBUG("Pre-allocating picture buffer %u sized %zu bytes... ", index, picture_size);
-		picture_realloc_data(dev->run->pictures[index], picture_size);
-	}
-}
-
-static int _device_apply_resolution(struct device_t *dev, unsigned width, unsigned height) {
-	// Тут VIDEO_MIN_* не используются из-за странностей минимального разрешения при отсутствии сигнала
-	// у некоторых устройств, например Auvidea B101
-	if (
-		width == 0 || width > VIDEO_MAX_WIDTH
-		|| height == 0 || height > VIDEO_MAX_HEIGHT
-	) {
-		LOG_ERROR("Requested forbidden resolution=%ux%u: min=1x1, max=%ux%u",
-			width, height, VIDEO_MAX_WIDTH, VIDEO_MAX_HEIGHT);
-		return -1;
-	}
-	dev->run->width = width;
-	dev->run->height = height;
-	return 0;
-}
-
-static void _device_apply_controls(struct device_t *dev) {
-#	define SET_CID_VALUE(_cid, _field, _value, _quiet) { \
-			struct v4l2_queryctrl query; \
-			if (_device_query_control(dev, &query, #_field, _cid, _quiet) == 0) { \
-				_device_set_control(dev, &query, #_field, _cid, _value, _quiet); \
-			} \
-		}
-
-#	define SET_CID_DEFAULT(_cid, _field, _quiet) { \
-			struct v4l2_queryctrl query; \
-			if (_device_query_control(dev, &query, #_field, _cid, _quiet) == 0) { \
-				_device_set_control(dev, &query, #_field, _cid, query.default_value, _quiet); \
-			} \
-		}
-
-#	define CONTROL_MANUAL_CID(_cid, _field) { \
-			if (dev->ctl._field.mode == CTL_MODE_VALUE) { \
-				SET_CID_VALUE(_cid, _field, dev->ctl._field.value, false); \
-			} else if (dev->ctl._field.mode == CTL_MODE_DEFAULT) { \
-				SET_CID_DEFAULT(_cid, _field, false); \
-			} \
-		}
-
-#	define CONTROL_AUTO_CID(_cid_auto, _cid_manual, _field) { \
-			if (dev->ctl._field.mode == CTL_MODE_VALUE) { \
-				SET_CID_VALUE(_cid_auto, _field##_auto, 0, true); \
-				SET_CID_VALUE(_cid_manual, _field, dev->ctl._field.value, false); \
-			} else if (dev->ctl._field.mode == CTL_MODE_AUTO) { \
-				SET_CID_VALUE(_cid_auto, _field##_auto, 1, false); \
-			} else if (dev->ctl._field.mode == CTL_MODE_DEFAULT) { \
-				SET_CID_VALUE(_cid_auto, _field##_auto, 0, true); /* Reset inactive flag */ \
-				SET_CID_DEFAULT(_cid_manual, _field, false); \
-				SET_CID_DEFAULT(_cid_auto, _field##_auto, false); \
-			} \
-		}
-
-	CONTROL_AUTO_CID	(V4L2_CID_AUTOBRIGHTNESS,		V4L2_CID_BRIGHTNESS,				brightness);
-	CONTROL_MANUAL_CID	(								V4L2_CID_CONTRAST,					contrast);
-	CONTROL_MANUAL_CID	(								V4L2_CID_SATURATION,				saturation);
-	CONTROL_AUTO_CID	(V4L2_CID_HUE_AUTO,				V4L2_CID_HUE,						hue);
-	CONTROL_MANUAL_CID	(								V4L2_CID_GAMMA,						gamma);
-	CONTROL_MANUAL_CID	(								V4L2_CID_SHARPNESS,					sharpness);
-	CONTROL_MANUAL_CID	(								V4L2_CID_BACKLIGHT_COMPENSATION,	backlight_compensation);
-	CONTROL_AUTO_CID	(V4L2_CID_AUTO_WHITE_BALANCE,	V4L2_CID_WHITE_BALANCE_TEMPERATURE,	white_balance);
-	CONTROL_AUTO_CID	(V4L2_CID_AUTOGAIN,				V4L2_CID_GAIN,						gain);
-	CONTROL_MANUAL_CID	(								V4L2_CID_COLORFX,					color_effect);
-	CONTROL_MANUAL_CID	(								V4L2_CID_VFLIP,						flip_vertical);
-	CONTROL_MANUAL_CID	(								V4L2_CID_HFLIP,						flip_horizontal);
-
-#	undef CONTROL_AUTO_CID
-#	undef CONTROL_MANUAL_CID
-#	undef SET_CID_DEFAULT
-#	undef SET_CID_VALUE
-}
-
-static int _device_query_control(struct device_t *dev, struct v4l2_queryctrl *query, const char *name, unsigned cid, bool quiet) {
-	// cppcheck-suppress redundantPointerOp
-	MEMSET_ZERO(*query);
-	query->id = cid;
-
-	if (xioctl(dev->run->fd, VIDIOC_QUERYCTRL, query) < 0 || query->flags & V4L2_CTRL_FLAG_DISABLED) {
-		if (!quiet) {
-			LOG_ERROR("Changing control %s is unsupported", name);
-		}
-		return -1;
-	}
-	return 0;
-}
-
-static void _device_set_control(struct device_t *dev, struct v4l2_queryctrl *query, const char *name, unsigned cid, int value, bool quiet) {
-	struct v4l2_control ctl;
-
-	if (value < query->minimum || value > query->maximum || value % query->step != 0) {
-		if (!quiet) {
-			LOG_ERROR("Invalid value %d of control %s: min=%d, max=%d, default=%d, step=%u",
-				value, name, query->minimum, query->maximum, query->default_value, query->step);
-		}
-		return;
-	}
-
-	MEMSET_ZERO(ctl);
-	ctl.id = cid;
-	ctl.value = value;
-
-	if (xioctl(dev->run->fd, VIDIOC_S_CTRL, &ctl) < 0) {
-		if (!quiet) {
-			LOG_PERROR("Can't set control %s", name);
-		}
-	} else if (!quiet) {
-		LOG_INFO("Applying control %s: %d", name, ctl.value);
-	}
-}
-
-static const char *_format_to_string_fourcc(char *buf, size_t size, unsigned format) {
-	assert(size >= 8);
-	buf[0] = format & 0x7F;
-	buf[1] = (format >> 8) & 0x7F;
-	buf[2] = (format >> 16) & 0x7F;
-	buf[3] = (format >> 24) & 0x7F;
-	if (format & ((unsigned)1 << 31)) {
-		buf[4] = '-';
-		buf[5] = 'B';
-		buf[6] = 'E';
-		buf[7] = '\0';
-	} else {
-		buf[4] = '\0';
-	}
-	return buf;
-}
-
-static const char *_format_to_string_nullable(unsigned format) {
-    for (unsigned index = 0; index < ARRAY_LEN(_FORMATS); ++index) {
-		if (format == _FORMATS[index].format) {
-			return _FORMATS[index].name;
-		}
-    }
-    return NULL;
-}
-
-static const char *_format_to_string_supported(unsigned format) {
-	const char *format_str = _format_to_string_nullable(format);
-	return (format_str == NULL ? "unsupported" : format_str);
-}
-
-static const char *_standard_to_string(v4l2_std_id standard) {
-	for (unsigned index = 0; index < ARRAY_LEN(_STANDARDS); ++index) {
-		if (standard == _STANDARDS[index].standard) {
-			return _STANDARDS[index].name;
-		}
-	}
-	return _STANDARDS[0].name;
-}
-
-static const char *_io_method_to_string_supported(enum v4l2_memory io_method) {
-	for (unsigned index = 0; index < ARRAY_LEN(_IO_METHODS); ++index) {
-		if (io_method == _IO_METHODS[index].io_method) {
-			return _IO_METHODS[index].name;
-		}
-	}
-	return "unsupported";
-}

src/device.h

@@ -1,140 +0,0 @@
-/*****************************************************************************
-#                                                                            #
-#    uStreamer - Lightweight and fast MJPG-HTTP streamer.                    #
-#                                                                            #
-#    Copyright (C) 2018  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 <stddef.h>
-#include <stdbool.h>
-
-#include <pthread.h>
-#include <linux/videodev2.h>
-
-#include "picture.h"
-
-
-#define VIDEO_MIN_WIDTH		((unsigned)160)
-#define VIDEO_MAX_WIDTH		((unsigned)10240)
-
-#define VIDEO_MIN_HEIGHT	((unsigned)120)
-#define VIDEO_MAX_HEIGHT	((unsigned)4320)
-
-#define VIDEO_MAX_FPS		((unsigned)120)
-
-#define STANDARD_UNKNOWN	V4L2_STD_UNKNOWN
-#define STANDARDS_STR		"PAL, NTSC, SECAM"
-
-#define FORMAT_UNKNOWN	-1
-#define FORMATS_STR		"YUYV, UYVY, RGB565, RGB24, JPEG"
-
-#define IO_METHOD_UNKNOWN	-1
-#define IO_METHODS_STR		"MMAP, USERPTR"
-
-
-struct hw_buffer_t {
-	unsigned char		*data;
-	size_t				used;
-	size_t				allocated;
-	struct v4l2_buffer	buf_info;
-
-	pthread_mutex_t grabbed_mutex;
-	bool			grabbed;
-};
-
-struct device_runtime_t {
-	int					fd;
-	unsigned			width;
-	unsigned			height;
-	unsigned			format;
-	unsigned			hw_fps;
-	size_t				raw_size;
-	unsigned			n_buffers;
-	unsigned			n_workers;
-	struct hw_buffer_t	*hw_buffers;
-	struct picture_t	**pictures;
-	bool				capturing;
-};
-
-enum control_mode_t {
-	CTL_MODE_NONE = 0,
-	CTL_MODE_VALUE,
-	CTL_MODE_AUTO,
-	CTL_MODE_DEFAULT,
-};
-
-struct control_t {
-	enum control_mode_t	mode;
-	int					value;
-};
-
-struct controls_t {
-	struct control_t brightness;
-	struct control_t contrast;
-	struct control_t saturation;
-	struct control_t hue;
-	struct control_t gamma;
-	struct control_t sharpness;
-	struct control_t backlight_compensation;
-	struct control_t white_balance;
-	struct control_t gain;
-	struct control_t color_effect;
-	struct control_t flip_vertical;
-	struct control_t flip_horizontal;
-};
-
-struct device_t {
-	char			*path;
-	unsigned		input;
-	unsigned		width;
-	unsigned		height;
-	unsigned		format;
-	v4l2_std_id		standard;
-	enum v4l2_memory	io_method;
-	bool			dv_timings;
-	unsigned		n_buffers;
-	unsigned		n_workers;
-	unsigned		desired_fps;
-	size_t			min_frame_size;
-	bool			persistent;
-	unsigned		timeout;
-	unsigned		error_delay;
-
-	struct controls_t ctl;
-
-	struct device_runtime_t *run;
-};
-
-
-struct device_t *device_init(void);
-void device_destroy(struct device_t *dev);
-
-int device_parse_format(const char *str);
-v4l2_std_id device_parse_standard(const char *str);
-int device_parse_io_method(const char *str);
-
-int device_open(struct device_t *dev);
-void device_close(struct device_t *dev);
-
-int device_switch_capturing(struct device_t *dev, bool enable);
-int device_select(struct device_t *dev, bool *has_read, bool *has_write, bool *has_error);
-int device_grab_buffer(struct device_t *dev);
-int device_release_buffer(struct device_t *dev, unsigned index);
-int device_consume_event(struct device_t *dev);

src/dump/file.c

@@ -0,0 +1,77 @@
+/*****************************************************************************
+#                                                                            #
+#    uStreamer - Lightweight and fast MJPEG-HTTP streamer.                   #
+#                                                                            #
+#    Copyright (C) 2018-2022  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 "file.h"
+
+
+us_output_file_s *us_output_file_init(const char *path, bool json) {
+	us_output_file_s *output;
+	US_CALLOC(output, 1);
+
+	if (!strcmp(path, "-")) {
+		US_LOG_INFO("Using output: <stdout>");
+		output->fp = stdout;
+	} else {
+		US_LOG_INFO("Using output: %s", path);
+		if ((output->fp = fopen(path, "wb")) == NULL) {
+			US_LOG_PERROR("Can't open output file");
+			goto error;
+		}
+	}
+
+	output->json = json;
+	return output;
+
+	error:
+		us_output_file_destroy(output);
+		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,"
+			" \"grab_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->grab_ts, frame->encode_begin_ts, frame->encode_end_ts,
+			output->base64_data);
+	} else {
+		fwrite(frame->data, 1, frame->used, output->fp);
+	}
+	fflush(output->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) {
+			US_LOG_PERROR("Can't close output file");
+		}
+	}
+	free(output);
+}

src/dump/file.h

@@ -0,0 +1,49 @@
+/*****************************************************************************
+#                                                                            #
+#    uStreamer - Lightweight and fast MJPEG-HTTP streamer.                   #
+#                                                                            #
+#    Copyright (C) 2018-2022  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 <stdlib.h>
+#include <stdbool.h>
+
+#include <sys/types.h>
+
+#include "../libs/tools.h"
+#include "../libs/logging.h"
+#include "../libs/frame.h"
+#include "../libs/base64.h"
+
+
+typedef struct {
+	const char *path;
+	bool		json;
+
+	FILE		*fp;
+	char		*base64_data;
+	size_t		base64_allocated;
+} us_output_file_s;
+
+
+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);

src/dump/main.c

@@ -0,0 +1,341 @@
+/*****************************************************************************
+#                                                                            #
+#    uStreamer - Lightweight and fast MJPEG-HTTP streamer.                   #
+#                                                                            #
+#    Copyright (C) 2018-2022  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 <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/tools.h"
+#include "../libs/logging.h"
+#include "../libs/frame.h"
+#include "../libs/memsink.h"
+#include "../libs/options.h"
+
+#include "file.h"
+
+
+enum _OPT_VALUES {
+	_O_SINK = 's',
+	_O_SINK_TIMEOUT = 't',
+	_O_OUTPUT = 'o',
+	_O_OUTPUT_JSON = 'j',
+	_O_COUNT = 'c',
+	_O_INTERVAL = 'i',
+
+	_O_HELP = 'h',
+	_O_VERSION = 'v',
+
+	_O_LOG_LEVEL = 10000,
+	_O_PERF,
+	_O_VERBOSE,
+	_O_DEBUG,
+	_O_FORCE_LOG_COLORS,
+	_O_NO_LOG_COLORS,
+};
+
+static const struct option _LONG_OPTS[] = {
+	{"sink",				required_argument,	NULL,	_O_SINK},
+	{"sink-timeout",		required_argument,	NULL,	_O_SINK_TIMEOUT},
+	{"output",				required_argument,	NULL,	_O_OUTPUT},
+	{"output-json",			no_argument,		NULL,	_O_OUTPUT_JSON},
+	{"count",				required_argument,	NULL,	_O_COUNT},
+	{"interval",			required_argument,	NULL,	_O_INTERVAL},
+
+	{"log-level",			required_argument,	NULL,	_O_LOG_LEVEL},
+	{"perf",				no_argument,		NULL,	_O_PERF},
+	{"verbose",				no_argument,		NULL,	_O_VERBOSE},
+	{"debug",				no_argument,		NULL,	_O_DEBUG},
+	{"force-log-colors",	no_argument,		NULL,	_O_FORCE_LOG_COLORS},
+	{"no-log-colors",		no_argument,		NULL,	_O_NO_LOG_COLORS},
+
+	{"help",				no_argument,		NULL,	_O_HELP},
+	{"version",				no_argument,		NULL,	_O_VERSION},
+
+	{NULL, 0, NULL, 0},
+};
+
+
+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);
+} _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,
+	_output_context_s *ctx);
+
+static void _help(FILE *fp);
+
+
+int main(int argc, char *argv[]) {
+	US_LOGGING_INIT;
+	US_THREAD_RENAME("main");
+
+	char *sink_name = NULL;
+	unsigned sink_timeout = 1;
+	char *output_path = NULL;
+	bool output_json = false;
+	long long count = 0;
+	long double interval = 0;
+
+#	define OPT_SET(_dest, _value) { \
+			_dest = _value; \
+			break; \
+		}
+
+#	define OPT_NUMBER(_name, _dest, _min, _max, _base) { \
+			errno = 0; char *_end = NULL; long long _tmp = strtoll(optarg, &_end, _base); \
+			if (errno || *_end || _tmp < _min || _tmp > _max) { \
+				printf("Invalid value for '%s=%s': min=%lld, max=%lld\n", _name, optarg, (long long)_min, (long long)_max); \
+				return 1; \
+			} \
+			_dest = _tmp; \
+			break; \
+		}
+
+#	define OPT_LDOUBLE(_name, _dest, _min, _max) { \
+			errno = 0; char *_end = NULL; long double _tmp = strtold(optarg, &_end); \
+			if (errno || *_end || _tmp < _min || _tmp > _max) { \
+				printf("Invalid value for '%s=%s': min=%Lf, max=%Lf\n", _name, optarg, (long double)_min, (long double)_max); \
+				return 1; \
+			} \
+			_dest = _tmp; \
+			break; \
+		}
+
+	char short_opts[128];
+	us_build_short_options(_LONG_OPTS, short_opts, 128);
+
+	for (int ch; (ch = getopt_long(argc, argv, short_opts, _LONG_OPTS, NULL)) >= 0;) {
+		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_COUNT:			OPT_NUMBER("--count", count, 0, LLONG_MAX, 0);
+			case _O_INTERVAL:		OPT_LDOUBLE("--interval", interval, 0, 60);
+
+			case _O_LOG_LEVEL:			OPT_NUMBER("--log-level", us_g_log_level, US_LOG_LEVEL_INFO, US_LOG_LEVEL_DEBUG, 0);
+			case _O_PERF:				OPT_SET(us_g_log_level, US_LOG_LEVEL_PERF);
+			case _O_VERBOSE:			OPT_SET(us_g_log_level, US_LOG_LEVEL_VERBOSE);
+			case _O_DEBUG:				OPT_SET(us_g_log_level, US_LOG_LEVEL_DEBUG);
+			case _O_FORCE_LOG_COLORS:	OPT_SET(us_g_log_colored, true);
+			case _O_NO_LOG_COLORS:		OPT_SET(us_g_log_colored, false);
+
+			case _O_HELP:		_help(stdout); return 0;
+			case _O_VERSION:	puts(US_VERSION); return 0;
+
+			case 0:		break;
+			default:	return 1;
+		}
+	}
+
+#	undef OPT_LDOUBLE
+#	undef OPT_NUMBER
+#	undef OPT_SET
+
+	if (sink_name == NULL || sink_name[0] == '\0') {
+		puts("Missing option --sink. See --help for details.");
+		return 1;
+	}
+
+	_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) {
+			return 1;
+		}
+		ctx.write = us_output_file_write;
+		ctx.destroy = us_output_file_destroy;
+	}
+
+	_install_signal_handlers();
+	const int retval = abs(_dump_sink(sink_name, sink_timeout, count, interval, &ctx));
+	if (ctx.v_output && ctx.destroy) {
+		ctx.destroy(ctx.v_output);
+	}
+	return retval;
+}
+
+
+static void _signal_handler(int signum) {
+	char *const name = us_signum_to_string(signum);
+	US_LOG_INFO_NOLOCK("===== Stopping by %s =====", name);
+	free(name);
+	_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,
+	_output_context_s *ctx) {
+
+	if (count == 0) {
+		count = -1;
+	}
+
+	const useconds_t interval_us = interval * 1000000;
+
+	us_frame_s *frame = us_frame_init();
+	us_memsink_s *sink = NULL;
+
+	if ((sink = us_memsink_init("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) {
+		int error = us_memsink_client_get(sink, frame);
+		if (error == 0) {
+			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: size=%zu, res=%ux%u, fourcc=%s, stride=%u, online=%d, key=%d, latency=%.3Lf, diff=%.3Lf",
+				frame->used, frame->width, frame->height,
+				us_fourcc_to_string(frame->format, fourcc_str, 8),
+				frame->stride, frame->online, frame->key,
+				now - frame->grab_ts, (last_ts ? now - last_ts : 0));
+			last_ts = now;
+
+			US_LOG_DEBUG("       grab_ts=%.3Lf, encode_begin_ts=%.3Lf, encode_end_ts=%.3Lf",
+				frame->grab_ts, frame->encode_begin_ts, frame->encode_end_ts);
+
+			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 (count >= 0) {
+				--count;
+				if (count <= 0) {
+					break;
+				}
+			}
+
+			if (interval_us > 0) {
+				usleep(interval_us);
+			}
+		} else if (error == -2) {
+			usleep(1000);
+		} else {
+			goto error;
+		}
+	}
+
+	int retval = 0;
+	goto ok;
+
+	error:
+		retval = -1;
+
+	ok:
+		US_DELETE(sink, us_memsink_destroy);
+		us_frame_destroy(frame);
+
+		US_LOG_INFO("Bye-bye");
+		return retval;
+}
+
+static void _help(FILE *fp) {
+#	define SAY(_msg, ...) fprintf(fp, _msg "\n", ##__VA_ARGS__)
+	SAY("\nuStreamer-dump - Dump uStreamer's memory sink to file");
+	SAY("═════════════════════════════════════════════════════");
+	SAY("Version: %s; license: GPLv3", US_VERSION);
+	SAY("Copyright (C) 2018-2022 Maxim Devaev <mdevaev@gmail.com>\n");
+	SAY("Example:");
+	SAY("════════");
+	SAY("    ustreamer-dump --sink test --output - \\");
+	SAY("        | ffmpeg -use_wallclock_as_timestamps 1 -i pipe: -c:v libx264 test.mp4\n");
+	SAY("Sink options:");
+	SAY("═════════════");
+	SAY("    -s|--sink <name>  ──────── Memory sink ID. No default.\n");
+	SAY("    -t|--sink-timeout <sec>  ─ Timeout for the upcoming frame. Default: 1.\n");
+	SAY("    -o|--output <filename> ─── Filename to dump output to. Use '-' for stdout. Default: just consume the sink.\n");
+	SAY("    -j|--output-json  ──────── Format output as JSON. Required option --output. Default: disabled.\n");
+	SAY("    -c|--count  <N>  ───────── Limit the number of frames. Default: 0 (infinite).\n");
+	SAY("    -i|--interval <sec>  ───── Delay between reading frames (float). Default: 0.\n");
+	SAY("Logging options:");
+	SAY("════════════════");
+	SAY("    --log-level <N>  ──── Verbosity level of messages from 0 (info) to 3 (debug).");
+	SAY("                          Enabling debugging messages can slow down the program.");
+	SAY("                          Available levels: 0 (info), 1 (performance), 2 (verbose), 3 (debug).");
+	SAY("                          Default: %d.\n", us_g_log_level);
+	SAY("    --perf  ───────────── Enable performance messages (same as --log-level=1). Default: disabled.\n");
+	SAY("    --verbose  ────────── Enable verbose messages and lower (same as --log-level=2). Default: disabled.\n");
+	SAY("    --debug  ──────────── Enable debug messages and lower (same as --log-level=3). Default: disabled.\n");
+	SAY("    --force-log-colors  ─ Force color logging. Default: colored if stderr is a TTY.\n");
+	SAY("    --no-log-colors  ──── Disable color logging. Default: ditto.\n");
+	SAY("Help options:");
+	SAY("═════════════");
+	SAY("    -h|--help  ─────── Print this text and exit.\n");
+	SAY("    -v|--version  ──── Print version and exit.\n");
+#	undef SAY
+}

src/encoder.c

@@ -1,241 +0,0 @@
-/*****************************************************************************
-#                                                                            #
-#    uStreamer - Lightweight and fast MJPG-HTTP streamer.                    #
-#                                                                            #
-#    Copyright (C) 2018  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 "encoder.h"
-
-#include <stdlib.h>
-#include <stdbool.h>
-#include <strings.h>
-#include <assert.h>
-
-#include <linux/videodev2.h>
-
-#include "tools.h"
-#include "threading.h"
-#include "logging.h"
-#include "device.h"
-
-#include "encoders/cpu/encoder.h"
-#include "encoders/hw/encoder.h"
-#ifdef WITH_OMX
-#	include "encoders/omx/encoder.h"
-#endif
-
-
-static const struct {
-	const char *name;
-	const enum encoder_type_t type;
-} _ENCODER_TYPES[] = {
-	{"CPU",	ENCODER_TYPE_CPU},
-	{"HW",	ENCODER_TYPE_HW},
-#	ifdef WITH_OMX
-	{"OMX",	ENCODER_TYPE_OMX},
-#	endif
-};
-
-
-struct encoder_t *encoder_init(void) {
-	struct encoder_runtime_t *run;
-	struct encoder_t *encoder;
-
-	A_CALLOC(run, 1);
-	run->type = ENCODER_TYPE_CPU;
-	run->quality = 80;
-	A_MUTEX_INIT(&run->mutex);
-
-	A_CALLOC(encoder, 1);
-	encoder->type = run->type;
-	encoder->quality = run->quality;
-	encoder->run = run;
-	return encoder;
-}
-
-void encoder_destroy(struct encoder_t *encoder) {
-#	ifdef WITH_OMX
-	if (encoder->run->omxs) {
-		for (unsigned index = 0; index < encoder->run->n_omxs; ++index) {
-			if (encoder->run->omxs[index]) {
-				omx_encoder_destroy(encoder->run->omxs[index]);
-			}
-		}
-		free(encoder->run->omxs);
-	}
-#	endif
-	A_MUTEX_DESTROY(&encoder->run->mutex);
-	free(encoder->run);
-	free(encoder);
-}
-
-enum encoder_type_t encoder_parse_type(const char *str) {
-	for (unsigned index = 0; index < ARRAY_LEN(_ENCODER_TYPES); ++index) {
-		if (!strcasecmp(str, _ENCODER_TYPES[index].name)) {
-			return _ENCODER_TYPES[index].type;
-		}
-	}
-	return ENCODER_TYPE_UNKNOWN;
-}
-
-const char *encoder_type_to_string(enum encoder_type_t type) {
-	for (unsigned index = 0; index < ARRAY_LEN(_ENCODER_TYPES); ++index) {
-		if (_ENCODER_TYPES[index].type == type) {
-			return _ENCODER_TYPES[index].name;
-		}
-	}
-	return _ENCODER_TYPES[0].name;
-}
-
-void encoder_prepare(struct encoder_t *encoder, struct device_t *dev) {
-	enum encoder_type_t type = (encoder->run->cpu_forced ? ENCODER_TYPE_CPU : encoder->type);
-	unsigned quality = encoder->quality;
-	bool cpu_forced = false;
-
-	if ((dev->run->format == V4L2_PIX_FMT_MJPEG || dev->run->format == V4L2_PIX_FMT_JPEG) && type != ENCODER_TYPE_HW) {
-		LOG_INFO("Switching to HW encoder because the input format is (M)JPEG");
-		type = ENCODER_TYPE_HW;
-	}
-
-	if (type == ENCODER_TYPE_HW) {
-		if (dev->run->format != V4L2_PIX_FMT_MJPEG && dev->run->format != V4L2_PIX_FMT_JPEG) {
-			LOG_INFO("Switching to CPU encoder because the input format is not (M)JPEG");
-			goto use_cpu;
-		}
-
-		if (hw_encoder_prepare(dev, quality) < 0) {
-			quality = 0;
-		}
-
-		dev->run->n_workers = 1;
-	}
-#	ifdef WITH_OMX
-	else if (type == ENCODER_TYPE_OMX) {
-		for (unsigned index = 0; index < encoder->n_glitched_resolutions; ++index) {
-			if (
-				encoder->glitched_resolutions[index][0] == dev->run->width
-				&& encoder->glitched_resolutions[index][1] == dev->run->height
-			) {
-				LOG_INFO("Switching to CPU encoder the resolution %ux%u marked as glitchy for OMX",
-					dev->run->width, dev->run->height);
-				goto use_cpu;
-			}
-		}
-
-		LOG_DEBUG("Preparing OMX encoder ...");
-
-		if (dev->run->n_workers > OMX_MAX_ENCODERS) {
-			LOG_INFO("OMX encoder sets limit for worker threads: %u", OMX_MAX_ENCODERS);
-			dev->run->n_workers = OMX_MAX_ENCODERS;
-		}
-
-		if (encoder->run->omxs == NULL) {
-			A_CALLOC(encoder->run->omxs, OMX_MAX_ENCODERS);
-		}
-
-		// Начинаем с нуля и доинициализируем на следующих заходах при необходимости
-		for (; encoder->run->n_omxs < dev->run->n_workers; ++encoder->run->n_omxs) {
-			if ((encoder->run->omxs[encoder->run->n_omxs] = omx_encoder_init()) == NULL) {
-				LOG_ERROR("Can't initialize OMX encoder, falling back to CPU");
-				goto force_cpu;
-			}
-		}
-
-		for (unsigned index = 0; index < encoder->run->n_omxs; ++index) {
-			if (omx_encoder_prepare(encoder->run->omxs[index], dev, quality) < 0) {
-				LOG_ERROR("Can't prepare OMX encoder, falling back to CPU");
-				goto force_cpu;
-			}
-		}
-	}
-#	endif
-
-	goto ok;
-
-#	pragma GCC diagnostic ignored "-Wunused-label"
-#	pragma GCC diagnostic push
-	// cppcheck-suppress unusedLabel
-	force_cpu:
-		cpu_forced = true;
-#	pragma GCC diagnostic pop
-
-	use_cpu:
-		type = ENCODER_TYPE_CPU;
-		quality = encoder->quality;
-
-	ok:
-		if (quality == 0) {
-			LOG_INFO("Using JPEG quality: encoder default");
-		} else {
-			LOG_INFO("Using JPEG quality: %u%%", quality);
-		}
-
-		A_MUTEX_LOCK(&encoder->run->mutex);
-		encoder->run->type = type;
-		encoder->run->quality = quality;
-		if (cpu_forced) {
-			encoder->run->cpu_forced = true;
-		}
-		A_MUTEX_UNLOCK(&encoder->run->mutex);
-}
-
-#pragma GCC diagnostic ignored "-Wunused-parameter"
-#pragma GCC diagnostic push
-int encoder_compress_buffer(struct encoder_t *encoder, struct device_t *dev, unsigned worker_number, unsigned buf_index) {
-#pragma GCC diagnostic pop
-
-	assert(encoder->run->type != ENCODER_TYPE_UNKNOWN);
-	assert(dev->run->hw_buffers[buf_index].used > 0);
-
-	dev->run->pictures[buf_index]->encode_begin_ts = get_now_monotonic();
-
-	if (encoder->run->type == ENCODER_TYPE_CPU) {
-		LOG_VERBOSE("Compressing buffer %u using CPU", buf_index);
-		cpu_encoder_compress_buffer(dev, buf_index, encoder->run->quality);
-	} else if (encoder->run->type == ENCODER_TYPE_HW) {
-		LOG_VERBOSE("Compressing buffer %u using HW (just copying)", buf_index);
-		hw_encoder_compress_buffer(dev, buf_index);
-	}
-#	ifdef WITH_OMX
-	else if (encoder->run->type == ENCODER_TYPE_OMX) {
-		LOG_VERBOSE("Compressing buffer %u using OMX", buf_index);
-		if (omx_encoder_compress_buffer(encoder->run->omxs[worker_number], dev, buf_index) < 0) {
-			goto error;
-		}
-	}
-#	endif
-
-	dev->run->pictures[buf_index]->encode_end_ts = get_now_monotonic();
-
-	dev->run->pictures[buf_index]->width = dev->run->width;
-	dev->run->pictures[buf_index]->height = dev->run->height;
-
-	return 0;
-
-#	pragma GCC diagnostic ignored "-Wunused-label"
-#	pragma GCC diagnostic push
-	// cppcheck-suppress unusedLabel
-	error:
-		LOG_INFO("Error while compressing buffer, falling back to CPU");
-		A_MUTEX_LOCK(&encoder->run->mutex);
-		encoder->run->cpu_forced = true;
-		A_MUTEX_UNLOCK(&encoder->run->mutex);
-		return -1;
-#	pragma GCC diagnostic pop
-}

src/encoders/omx/component.c

@@ -1,158 +0,0 @@
-/*****************************************************************************
-#                                                                            #
-#    uStreamer - Lightweight and fast MJPG-HTTP streamer.                    #
-#                                                                            #
-#    Copyright (C) 2018  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 "component.h"
-
-#include <unistd.h>
-
-#include <IL/OMX_Core.h>
-#include <IL/OMX_Component.h>
-
-#include "../../logging.h"
-
-#include "formatters.h"
-
-
-static int _component_wait_port_changed(OMX_HANDLETYPE *component, OMX_U32 port, OMX_BOOL enabled);
-static int _component_wait_state_changed(OMX_HANDLETYPE *component, OMX_STATETYPE wanted);
-
-
-int component_enable_port(OMX_HANDLETYPE *component, OMX_U32 port) {
-	OMX_ERRORTYPE error;
-
-	LOG_DEBUG("Enabling OMX port %u ...", port);
-	if ((error = OMX_SendCommand(*component, OMX_CommandPortEnable, port, NULL)) != OMX_ErrorNone) {
-		LOG_ERROR_OMX(error, "Can't enable OMX port %u", port);
-		return -1;
-	}
-	return _component_wait_port_changed(component, port, OMX_TRUE);
-}
-
-int component_disable_port(OMX_HANDLETYPE *component, OMX_U32 port) {
-	OMX_ERRORTYPE error;
-
-	LOG_DEBUG("Disabling OMX port %u ...", port);
-	if ((error = OMX_SendCommand(*component, OMX_CommandPortDisable, port, NULL)) != OMX_ErrorNone) {
-		LOG_ERROR_OMX(error, "Can't disable OMX port %u", port);
-		return -1;
-	}
-	return _component_wait_port_changed(component, port, OMX_FALSE);
-}
-
-int component_get_portdef(OMX_HANDLETYPE *component, OMX_PARAM_PORTDEFINITIONTYPE *portdef, OMX_U32 port) {
-	OMX_ERRORTYPE error;
-
-	// cppcheck-suppress redundantPointerOp
-	OMX_INIT_STRUCTURE(*portdef);
-	portdef->nPortIndex = port;
-
-	LOG_DEBUG("Fetching OMX port %u definition ...", port);
-	if ((error = OMX_GetParameter(*component, OMX_IndexParamPortDefinition, portdef)) != OMX_ErrorNone) {
-		LOG_ERROR_OMX(error, "Can't get OMX port %u definition", port);
-		return -1;
-	}
-	return 0;
-}
-
-int component_set_portdef(OMX_HANDLETYPE *component, OMX_PARAM_PORTDEFINITIONTYPE *portdef) {
-	OMX_ERRORTYPE error;
-
-	LOG_DEBUG("Writing OMX port %u definition ...", portdef->nPortIndex);
-	if ((error = OMX_SetParameter(*component, OMX_IndexParamPortDefinition, portdef)) != OMX_ErrorNone) {
-		LOG_ERROR_OMX(error, "Can't set OMX port %u definition", portdef->nPortIndex);
-		return -1;
-	}
-	return 0;
-}
-
-int component_set_state(OMX_HANDLETYPE *component, OMX_STATETYPE state) {
-	const char *state_str = omx_state_to_string(state);
-	OMX_ERRORTYPE error;
-	int retries = 50;
-
-	LOG_DEBUG("Switching component state to %s ...", state_str);
-
-	do {
-		error = OMX_SendCommand(*component, OMX_CommandStateSet, state, NULL);
-		if (error == OMX_ErrorNone) {
-			return _component_wait_state_changed(component, state);
-		} else if (error == OMX_ErrorInsufficientResources && retries) {
-			// Иногда железо не инициализируется, хз почему, просто ретраим, со второй попытки сработает
-			LOG_ERROR_OMX(error, "Can't switch OMX component state to %s, need to retry", state_str);
-			retries -= 1;
-			usleep(8000);
-		} else {
-			break;
-		}
-	} while (retries);
-
-	LOG_ERROR_OMX(error, "Can't switch OMX component state to %s", state_str);
-	return -1;
-}
-
-
-static int _component_wait_port_changed(OMX_HANDLETYPE *component, OMX_U32 port, OMX_BOOL enabled) {
-	OMX_ERRORTYPE error;
-	OMX_PARAM_PORTDEFINITIONTYPE portdef;
-	int retries = 50;
-
-	OMX_INIT_STRUCTURE(portdef);
-	portdef.nPortIndex = port;
-
-	do {
-		if ((error = OMX_GetParameter(*component, OMX_IndexParamPortDefinition, &portdef)) != OMX_ErrorNone) {
-			LOG_ERROR_OMX(error, "Can't get OMX port %u definition for waiting", port);
-			return -1;
-		}
-
-		if (portdef.bEnabled != enabled) {
-			LOG_DEBUG("Waiting for OMX %s port %u", (enabled ? "enabling" : "disabling"), port);
-			retries -= 1;
-			usleep(8000);
-		}
-	} while (portdef.bEnabled != enabled && retries);
-
-	LOG_DEBUG("OMX port %u %s", port, (enabled ? "enabled" : "disabled"));
-	return (portdef.bEnabled == enabled ? 0 : -1);
-}
-
-static int _component_wait_state_changed(OMX_HANDLETYPE *component, OMX_STATETYPE wanted) {
-	OMX_ERRORTYPE error;
-	OMX_STATETYPE state;
-	int retries = 50;
-
-	do {
-		if ((error = OMX_GetState(*component, &state)) != OMX_ErrorNone) {
-			LOG_ERROR_OMX(error, "Failed to get OMX component state");
-			return -1;
-		}
-
-		if (state != wanted) {
-			LOG_DEBUG("Waiting when OMX component state changes to %s", omx_state_to_string(wanted));
-			retries -= 1;
-			usleep(8000);
-		}
-	} while (state != wanted && retries);
-
-	LOG_DEBUG("Switched OMX component state to %s", omx_state_to_string(wanted))
-	return (state == wanted ? 0 : -1);
-}

src/encoders/omx/encoder.c

@@ -1,507 +0,0 @@
-/*****************************************************************************
-#                                                                            #
-#    uStreamer - Lightweight and fast MJPG-HTTP streamer.                    #
-#                                                                            #
-#    Copyright (C) 2018  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 "encoder.h"
-
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <assert.h>
-
-#include <linux/videodev2.h>
-
-#include <bcm_host.h>
-#include <IL/OMX_Core.h>
-#include <IL/OMX_Component.h>
-#include <IL/OMX_Broadcom.h>
-#include <interface/vcos/vcos_semaphore.h>
-
-#include "../../logging.h"
-#include "../../tools.h"
-#include "../../picture.h"
-#include "../../device.h"
-
-#include "formatters.h"
-#include "component.h"
-
-
-static const OMX_U32 _INPUT_PORT = 340;
-static const OMX_U32 _OUTPUT_PORT = 341;
-
-
-static int _i_omx = 0;
-
-
-static int _omx_init_component(struct omx_encoder_t *omx);
-static int _omx_init_disable_ports(struct omx_encoder_t *omx);
-static int _omx_setup_input(struct omx_encoder_t *omx, struct device_t *dev);
-static int _omx_setup_output(struct omx_encoder_t *omx, unsigned quality);
-static int _omx_encoder_clear_ports(struct omx_encoder_t *omx);
-
-static OMX_ERRORTYPE _omx_event_handler(
-	UNUSED OMX_HANDLETYPE encoder,
-	OMX_PTR v_omx, OMX_EVENTTYPE event, OMX_U32 data1,
-	UNUSED OMX_U32 data2, UNUSED OMX_PTR event_data);
-
-static OMX_ERRORTYPE _omx_input_required_handler(
-	UNUSED OMX_HANDLETYPE encoder,
-	OMX_PTR v_omx, UNUSED OMX_BUFFERHEADERTYPE *buffer);
-
-static OMX_ERRORTYPE _omx_output_available_handler(
-	UNUSED OMX_HANDLETYPE encoder,
-	OMX_PTR v_omx, UNUSED OMX_BUFFERHEADERTYPE *buffer);
-
-
-struct omx_encoder_t *omx_encoder_init(void) {
-	// Some theory:
-	//   - http://www.fourcc.org/yuv.php
-	//   - https://kwasi-ich.de/blog/2017/11/26/omx/
-	//   - https://github.com/hopkinskong/rpi-omx-jpeg-encode/blob/master/jpeg_bench.cpp
-	//   - https://github.com/kwasmich/OMXPlayground/blob/master/omxJPEGEnc.c
-	//   - https://github.com/gagle/raspberrypi-openmax-jpeg/blob/master/jpeg.c
-	//   - https://www.raspberrypi.org/forums/viewtopic.php?t=154790
-	//   - https://bitbucket.org/bensch128/omxjpegencode/src/master/jpeg_encoder.cpp
-	//   - http://home.nouwen.name/RaspberryPi/documentation/ilcomponents/image_encode.html
-
-	struct omx_encoder_t *omx;
-	OMX_ERRORTYPE error;
-
-	A_CALLOC(omx, 1);
-
-	assert(_i_omx >= 0);
-	if (_i_omx == 0) {
-		LOG_INFO("Initializing BCM ...");
-		bcm_host_init();
-
-		LOG_INFO("Initializing OMX ...");
-		if ((error = OMX_Init()) != OMX_ErrorNone) {
-			LOG_ERROR_OMX(error, "Can't initialize OMX");
-			goto error;
-		}
-	}
-	_i_omx += 1;
-
-	LOG_INFO("Initializing OMX encoder ...");
-
-	if (vcos_semaphore_create(&omx->handler_sem, "handler_sem", 0) != VCOS_SUCCESS) {
-		LOG_ERROR("Can't create VCOS semaphore");
-		goto error;
-	}
-	omx->i_handler_sem = true;
-
-	if (_omx_init_component(omx) < 0) {
-		goto error;
-	}
-
-	if (_omx_init_disable_ports(omx) < 0) {
-		goto error;
-	}
-
-	return omx;
-
-	error:
-		omx_encoder_destroy(omx);
-		return NULL;
-}
-
-void omx_encoder_destroy(struct omx_encoder_t *omx) {
-	OMX_ERRORTYPE error;
-
-	LOG_INFO("Destroying OMX encoder ...");
-
-	component_set_state(&omx->encoder, OMX_StateIdle);
-	_omx_encoder_clear_ports(omx);
-	component_set_state(&omx->encoder, OMX_StateLoaded);
-
-	if (omx->i_handler_sem) {
-		vcos_semaphore_delete(&omx->handler_sem);
-	}
-
-	if (omx->i_encoder) {
-		if ((error = OMX_FreeHandle(omx->encoder)) != OMX_ErrorNone) {
-			LOG_ERROR_OMX(error, "Can't free OMX.broadcom.image_encode");
-		}
-	}
-
-	assert(_i_omx >= 0);
-	_i_omx -= 1;
-	if (_i_omx == 0) {
-		LOG_INFO("Destroying OMX ...");
-		OMX_Deinit();
-
-		LOG_INFO("Destroying BCM ...");
-		bcm_host_deinit();
-	}
-
-	free(omx);
-}
-
-int omx_encoder_prepare(struct omx_encoder_t *omx, struct device_t *dev, unsigned quality) {
-	if (component_set_state(&omx->encoder, OMX_StateIdle) < 0) {
-		return -1;
-	}
-	if (_omx_encoder_clear_ports(omx) < 0) {
-		return -1;
-	}
-	if (_omx_setup_input(omx, dev) < 0) {
-		return -1;
-	}
-	if (_omx_setup_output(omx, quality) < 0) {
-		return -1;
-	}
-	if (component_set_state(&omx->encoder, OMX_StateExecuting) < 0) {
-		return -1;
-	}
-	return 0;
-}
-
-int omx_encoder_compress_buffer(struct omx_encoder_t *omx, struct device_t *dev, unsigned index) {
-#	define HW_BUFFER(_next)	dev->run->hw_buffers[index]._next
-#	define IN(_next)		omx->input_buffer->_next
-#	define OUT(_next)		omx->output_buffer->_next
-
-	OMX_ERRORTYPE error;
-	VCOS_STATUS_T sem_status;
-	size_t slice_size = (IN(nAllocLen) < HW_BUFFER(used) ? IN(nAllocLen) : HW_BUFFER(used));
-	size_t pos = 0;
-
-	if ((error = OMX_FillThisBuffer(omx->encoder, omx->output_buffer)) != OMX_ErrorNone) {
-		LOG_ERROR_OMX(error, "Failed to request filling of the output buffer on encoder");
-		return -1;
-	}
-
-	dev->run->pictures[index]->used = 0;
-	omx->output_available = false;
-	omx->input_required = true;
-
-	while (true) {
-		if (omx->failed) {
-			return -1;
-		}
-
-		if (omx->output_available) {
-			omx->output_available = false;
-
-			picture_append_data(dev->run->pictures[index], OUT(pBuffer) + OUT(nOffset), OUT(nFilledLen));
-
-			if (OUT(nFlags) & OMX_BUFFERFLAG_ENDOFFRAME) {
-				OUT(nFlags) = 0;
-				break;
-			}
-
-			if ((error = OMX_FillThisBuffer(omx->encoder, omx->output_buffer)) != OMX_ErrorNone) {
-				LOG_ERROR_OMX(error, "Failed to request filling of the output buffer on encoder");
-				return -1;
-			}
-		}
-
-		if (omx->input_required) {
-			omx->input_required = false;
-
-			if (pos == HW_BUFFER(used)) {
-				continue;
-			}
-
-			memcpy(IN(pBuffer), HW_BUFFER(data) + pos, slice_size);
-			IN(nOffset) = 0;
-			IN(nFilledLen) = slice_size;
-
-			pos += slice_size;
-
-			if (pos + slice_size > HW_BUFFER(used)) {
-				slice_size = HW_BUFFER(used) - pos;
-			}
-
-			if ((error = OMX_EmptyThisBuffer(omx->encoder, omx->input_buffer)) != OMX_ErrorNone) {
-				LOG_ERROR_OMX(error, "Failed to request emptying of the input buffer on encoder");
-				return -1;
-			}
-		}
-
-		// vcos_semaphore_wait(&omx->handler_sem);
-		switch (sem_status = vcos_semaphore_wait_timeout(&omx->handler_sem, 3000)) {
-			case VCOS_SUCCESS: break;
-			case VCOS_EAGAIN: LOG_ERROR("Can't wait VCOS semaphore: EAGAIN (timeout)"); return -1;
-			case VCOS_EINVAL: LOG_ERROR("Can't wait VCOS semaphore: EINTVAL"); return -1;
-			default: LOG_ERROR("Can't wait VCOS semaphore: %d", sem_status); return -1;
-		}
-	}
-
-#	undef OUT
-#	undef IN
-#	undef HW_BUFFER
-	return 0;
-}
-
-static int _omx_init_component(struct omx_encoder_t *omx) {
-	OMX_ERRORTYPE error;
-
-	OMX_CALLBACKTYPE callbacks;
-	MEMSET_ZERO(callbacks);
-	callbacks.EventHandler = _omx_event_handler;
-	callbacks.EmptyBufferDone = _omx_input_required_handler;
-	callbacks.FillBufferDone = _omx_output_available_handler;
-
-	LOG_DEBUG("Initializing OMX.broadcom.image_encode ...");
-	if ((error = OMX_GetHandle(&omx->encoder, "OMX.broadcom.image_encode", omx, &callbacks)) != OMX_ErrorNone) {
-		LOG_ERROR_OMX(error, "Can't initialize OMX.broadcom.image_encode");
-		return -1;
-	}
-	omx->i_encoder = true;
-	return 0;
-}
-
-static int _omx_init_disable_ports(struct omx_encoder_t *omx) {
-	OMX_ERRORTYPE error;
-	OMX_INDEXTYPE types[] = {
-		OMX_IndexParamAudioInit, OMX_IndexParamVideoInit,
-		OMX_IndexParamImageInit, OMX_IndexParamOtherInit,
-	};
-	OMX_PORT_PARAM_TYPE ports;
-
-	OMX_INIT_STRUCTURE(ports);
-	if ((error = OMX_GetParameter(omx->encoder, OMX_IndexParamImageInit, &ports)) != OMX_ErrorNone) {
-		LOG_ERROR_OMX(error, "Can't OMX_GetParameter(OMX_IndexParamImageInit)");
-		return -1;
-	}
-
-	for (unsigned index = 0; index < 4; ++index) {
-		if ((error = OMX_GetParameter(omx->encoder, types[index], &ports)) != OMX_ErrorNone) {
-			LOG_ERROR_OMX(error, "Can't OMX_GetParameter(types[%u])", index);
-			return -1;
-		}
-		for (OMX_U32 port = ports.nStartPortNumber; port < ports.nStartPortNumber + ports.nPorts; ++port) {
-			if (component_disable_port(&omx->encoder, port) < 0) {
-				return -1;
-			}
-		}
-	}
-	return 0;
-}
-
-static int _omx_setup_input(struct omx_encoder_t *omx, struct device_t *dev) {
-	OMX_ERRORTYPE error;
-	OMX_PARAM_PORTDEFINITIONTYPE portdef;
-
-	LOG_DEBUG("Setting up OMX JPEG input port ...");
-
-	if (component_get_portdef(&omx->encoder, &portdef, _INPUT_PORT) < 0) {
-		LOG_ERROR("... first");
-		return -1;
-	}
-
-	portdef.format.image.nFrameWidth = dev->run->width;
-	portdef.format.image.nFrameHeight = dev->run->height;
-	portdef.format.image.nStride = 0;
-	portdef.format.image.nSliceHeight = align_size(dev->run->height, 16);
-	portdef.format.image.bFlagErrorConcealment = OMX_FALSE;
-	portdef.format.image.eCompressionFormat = OMX_IMAGE_CodingUnused;
-	portdef.nBufferSize = picture_get_generous_size(dev->run->width, dev->run->height);
-
-#	define MAP_FORMAT(_v4l2_format, _omx_format) \
-		case _v4l2_format: { portdef.format.image.eColorFormat = _omx_format; break; }
-
-	switch (dev->run->format) {
-		// https://www.fourcc.org/yuv.php
-		// Also see comments inside OMX_IVCommon.h
-		MAP_FORMAT(V4L2_PIX_FMT_YUYV, OMX_COLOR_FormatYCbYCr);
-		MAP_FORMAT(V4L2_PIX_FMT_UYVY, OMX_COLOR_FormatCbYCrY);
-		MAP_FORMAT(V4L2_PIX_FMT_RGB565, OMX_COLOR_Format16bitRGB565);
-		MAP_FORMAT(V4L2_PIX_FMT_RGB24, OMX_COLOR_Format24bitRGB888);
-		// TODO: найти устройство с RGB565 и протестить его.
-		// FIXME: RGB24 не работает нормально, нижняя половина экрана зеленая.
-		// FIXME: Китайский EasyCap тоже не работает, мусор на экране.
-		// Вероятно обе проблемы вызваны некорректной реализацией OMX на пае.
-		default: assert(0 && "Unsupported input format for OMX encoder");
-	}
-
-#	undef MAP_FORMAT
-
-	if (component_set_portdef(&omx->encoder, &portdef) < 0) {
-		return -1;
-	}
-
-	if (component_get_portdef(&omx->encoder, &portdef, _INPUT_PORT) < 0) {
-		LOG_ERROR("... second");
-		return -1;
-	}
-
-	if (component_enable_port(&omx->encoder, _INPUT_PORT) < 0) {
-		return -1;
-	}
-	omx->i_input_port_enabled = true;
-
-	if ((error = OMX_AllocateBuffer(omx->encoder, &omx->input_buffer, _INPUT_PORT, NULL, portdef.nBufferSize)) != OMX_ErrorNone) {
-		LOG_ERROR_OMX(error, "Can't allocate OMX JPEG input buffer");
-		return -1;
-	}
-	return 0;
-}
-
-static int _omx_setup_output(struct omx_encoder_t *omx, unsigned quality) {
-	OMX_ERRORTYPE error;
-	OMX_PARAM_PORTDEFINITIONTYPE portdef;
-
-	LOG_DEBUG("Setting up OMX JPEG output port ...");
-
-	if (component_get_portdef(&omx->encoder, &portdef, _OUTPUT_PORT) < 0) {
-		LOG_ERROR("... first");
-		return -1;
-	}
-
-	portdef.format.image.bFlagErrorConcealment = OMX_FALSE;
-	portdef.format.image.eCompressionFormat = OMX_IMAGE_CodingJPEG;
-	portdef.format.image.eColorFormat = OMX_COLOR_FormatYCbYCr;
-
-	if (component_set_portdef(&omx->encoder, &portdef) < 0) {
-		return -1;
-	}
-
-	if (component_get_portdef(&omx->encoder, &portdef, _OUTPUT_PORT) < 0) {
-		LOG_ERROR("... second");
-		return -1;
-	}
-
-	{
-		OMX_CONFIG_BOOLEANTYPE exif;
-
-		OMX_INIT_STRUCTURE(exif);
-		exif.bEnabled = OMX_FALSE;
-
-		if ((error = OMX_SetParameter(omx->encoder, OMX_IndexParamBrcmDisableEXIF, &exif)) != OMX_ErrorNone) {
-			LOG_ERROR_OMX(error, "Can't disable EXIF on OMX JPEG");
-			return -1;
-		}
-	}
-
-	{
-		OMX_PARAM_IJGSCALINGTYPE ijg;
-
-		OMX_INIT_STRUCTURE(ijg);
-		ijg.nPortIndex = _OUTPUT_PORT;
-		ijg.bEnabled = OMX_TRUE;
-
-		if ((error = OMX_SetParameter(omx->encoder, OMX_IndexParamBrcmEnableIJGTableScaling, &ijg)) != OMX_ErrorNone) {
-			LOG_ERROR_OMX(error, "Can't set OMX JPEG IJG settings");
-			return -1;
-		}
-	}
-
-	{
-		OMX_IMAGE_PARAM_QFACTORTYPE qfactor;
-
-		OMX_INIT_STRUCTURE(qfactor);
-		qfactor.nPortIndex = _OUTPUT_PORT;
-		qfactor.nQFactor = quality;
-
-		if ((error = OMX_SetParameter(omx->encoder, OMX_IndexParamQFactor, &qfactor)) != OMX_ErrorNone) {
-			LOG_ERROR_OMX(error, "Can't set OMX JPEG quality");
-			return -1;
-		}
-	}
-
-	if (component_enable_port(&omx->encoder, _OUTPUT_PORT) < 0) {
-		return -1;
-	}
-	omx->i_output_port_enabled = true;
-
-	if ((error = OMX_AllocateBuffer(omx->encoder, &omx->output_buffer, _OUTPUT_PORT, NULL, portdef.nBufferSize)) != OMX_ErrorNone) {
-		LOG_ERROR_OMX(error, "Can't allocate OMX JPEG output buffer");
-		return -1;
-	}
-	return 0;
-}
-
-static int _omx_encoder_clear_ports(struct omx_encoder_t *omx) {
-	OMX_ERRORTYPE error;
-	int retcode = 0;
-
-	if (omx->i_output_port_enabled) {
-		retcode -= component_disable_port(&omx->encoder, _OUTPUT_PORT);
-		omx->i_output_port_enabled = false;
-	}
-	if (omx->i_input_port_enabled) {
-		retcode -= component_disable_port(&omx->encoder, _INPUT_PORT);
-		omx->i_input_port_enabled = false;
-	}
-
-	if (omx->input_buffer) {
-		if ((error = OMX_FreeBuffer(omx->encoder, _INPUT_PORT, omx->input_buffer)) != OMX_ErrorNone) {
-			LOG_ERROR_OMX(error, "Can't free OMX JPEG input buffer");
-			// retcode -= 1;
-		}
-		omx->input_buffer = NULL;
-	}
-	if (omx->output_buffer) {
-		if ((error = OMX_FreeBuffer(omx->encoder, _OUTPUT_PORT, omx->output_buffer)) != OMX_ErrorNone) {
-			LOG_ERROR_OMX(error, "Can't free OMX JPEG output buffer");
-			// retcode -= 1;
-		}
-		omx->output_buffer = NULL;
-	}
-	return retcode;
-}
-
-static OMX_ERRORTYPE _omx_event_handler(
-	UNUSED OMX_HANDLETYPE encoder,
-	OMX_PTR v_omx, OMX_EVENTTYPE event, OMX_U32 data1,
-	UNUSED OMX_U32 data2, UNUSED OMX_PTR event_data) {
-
-	// OMX calls this handler for all the events it emits
-
-	struct omx_encoder_t *omx = (struct omx_encoder_t *)v_omx;
-
-	if (event == OMX_EventError) {
-		LOG_ERROR_OMX((OMX_ERRORTYPE)data1, "OMX error event received");
-		omx->failed = true;
-		assert(vcos_semaphore_post(&omx->handler_sem) == VCOS_SUCCESS);
-	}
-	return OMX_ErrorNone;
-}
-
-static OMX_ERRORTYPE _omx_input_required_handler(
-	UNUSED OMX_HANDLETYPE encoder,
-	OMX_PTR v_omx, UNUSED OMX_BUFFERHEADERTYPE *buffer) {
-
-	// Called by OMX when the encoder component requires
-	// the input buffer to be filled with RAW image data
-
-	struct omx_encoder_t *omx = (struct omx_encoder_t *)v_omx;
-
-	omx->input_required = true;
-	assert(vcos_semaphore_post(&omx->handler_sem) == VCOS_SUCCESS);
-	return OMX_ErrorNone;
-}
-
-static OMX_ERRORTYPE _omx_output_available_handler(
-	UNUSED OMX_HANDLETYPE encoder,
-	OMX_PTR v_omx, UNUSED OMX_BUFFERHEADERTYPE *buffer) {
-
-	// Called by OMX when the encoder component has filled
-	// the output buffer with JPEG data
-
-	struct omx_encoder_t *omx = (struct omx_encoder_t *)v_omx;
-
-	omx->output_available = true;
-	assert(vcos_semaphore_post(&omx->handler_sem) == VCOS_SUCCESS);
-	return OMX_ErrorNone;
-}

src/encoders/omx/formatters.c

@@ -1,109 +0,0 @@
-/*****************************************************************************
-#                                                                            #
-#    uStreamer - Lightweight and fast MJPG-HTTP streamer.                    #
-#                                                                            #
-#    Copyright (C) 2018  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 "formatters.h"
-
-#include <stdio.h>
-#include <assert.h>
-
-#include <IL/OMX_IVCommon.h>
-#include <IL/OMX_Core.h>
-
-#include "../../tools.h"
-
-
-#define CASE_TO_STRING(_value) \
-	case _value: { return #_value; }
-
-#define CASE_ASSERT(_msg, _value) default: { \
-		char *_assert_buf; A_CALLOC(_assert_buf, 128); \
-		sprintf(_assert_buf, _msg ": 0x%08x", _value); \
-		assert(0 && _assert_buf); \
-	}
-
-const char *omx_error_to_string(OMX_ERRORTYPE error) {
-	switch (error) {
-		CASE_TO_STRING(OMX_ErrorNone);
-		CASE_TO_STRING(OMX_ErrorInsufficientResources);
-		CASE_TO_STRING(OMX_ErrorUndefined);
-		CASE_TO_STRING(OMX_ErrorInvalidComponentName);
-		CASE_TO_STRING(OMX_ErrorComponentNotFound);
-		CASE_TO_STRING(OMX_ErrorInvalidComponent);
-		CASE_TO_STRING(OMX_ErrorBadParameter);
-		CASE_TO_STRING(OMX_ErrorNotImplemented);
-		CASE_TO_STRING(OMX_ErrorUnderflow);
-		CASE_TO_STRING(OMX_ErrorOverflow);
-		CASE_TO_STRING(OMX_ErrorHardware);
-		CASE_TO_STRING(OMX_ErrorInvalidState);
-		CASE_TO_STRING(OMX_ErrorStreamCorrupt);
-		CASE_TO_STRING(OMX_ErrorPortsNotCompatible);
-		CASE_TO_STRING(OMX_ErrorResourcesLost);
-		CASE_TO_STRING(OMX_ErrorNoMore);
-		CASE_TO_STRING(OMX_ErrorVersionMismatch);
-		CASE_TO_STRING(OMX_ErrorNotReady);
-		CASE_TO_STRING(OMX_ErrorTimeout);
-		CASE_TO_STRING(OMX_ErrorSameState);
-		CASE_TO_STRING(OMX_ErrorResourcesPreempted);
-		CASE_TO_STRING(OMX_ErrorPortUnresponsiveDuringAllocation);
-		CASE_TO_STRING(OMX_ErrorPortUnresponsiveDuringDeallocation);
-		CASE_TO_STRING(OMX_ErrorPortUnresponsiveDuringStop);
-		CASE_TO_STRING(OMX_ErrorIncorrectStateTransition);
-		CASE_TO_STRING(OMX_ErrorIncorrectStateOperation);
-		CASE_TO_STRING(OMX_ErrorUnsupportedSetting);
-		CASE_TO_STRING(OMX_ErrorUnsupportedIndex);
-		CASE_TO_STRING(OMX_ErrorBadPortIndex);
-		CASE_TO_STRING(OMX_ErrorPortUnpopulated);
-		CASE_TO_STRING(OMX_ErrorComponentSuspended);
-		CASE_TO_STRING(OMX_ErrorDynamicResourcesUnavailable);
-		CASE_TO_STRING(OMX_ErrorMbErrorsInFrame);
-		CASE_TO_STRING(OMX_ErrorFormatNotDetected);
-		CASE_TO_STRING(OMX_ErrorContentPipeOpenFailed);
-		CASE_TO_STRING(OMX_ErrorContentPipeCreationFailed);
-		CASE_TO_STRING(OMX_ErrorSeperateTablesUsed);
-		CASE_TO_STRING(OMX_ErrorTunnelingUnsupported);
-		CASE_TO_STRING(OMX_ErrorKhronosExtensions);
-		CASE_TO_STRING(OMX_ErrorVendorStartUnused);
-		CASE_TO_STRING(OMX_ErrorDiskFull);
-		CASE_TO_STRING(OMX_ErrorMaxFileSize);
-		CASE_TO_STRING(OMX_ErrorDrmUnauthorised);
-		CASE_TO_STRING(OMX_ErrorDrmExpired);
-		CASE_TO_STRING(OMX_ErrorDrmGeneral);
-		default: return "Unknown OMX error";
-	}
-}
-
-const char *omx_state_to_string(OMX_STATETYPE state) {
-	switch (state) {
-		CASE_TO_STRING(OMX_StateInvalid);
-		CASE_TO_STRING(OMX_StateLoaded);
-		CASE_TO_STRING(OMX_StateIdle);
-		CASE_TO_STRING(OMX_StateExecuting);
-		CASE_TO_STRING(OMX_StatePause);
-		CASE_TO_STRING(OMX_StateWaitForResources);
-		// cppcheck-suppress constArgument
-		// cppcheck-suppress knownArgument
-		CASE_ASSERT("Unsupported OMX state", state);
-	}
-}
-
-#undef CASE_ASSERT
-#undef CASE_TO_STRING

src/http/blank.c

@@ -1,161 +0,0 @@
-/*****************************************************************************
-#                                                                            #
-#    uStreamer - Lightweight and fast MJPG-HTTP streamer.                    #
-#                                                                            #
-#    Copyright (C) 2018  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 "blank.h"
-
-#include <stdio.h>
-#include <stdbool.h>
-#include <setjmp.h>
-
-#include <jpeglib.h>
-
-#include "../tools.h"
-#include "../logging.h"
-#include "../picture.h"
-
-#include "data/blank_jpeg.h"
-
-
-struct _jpeg_error_manager_t {
-	struct jpeg_error_mgr	mgr; // Default manager
-	jmp_buf					jmp;
-};
-
-
-static struct picture_t *_init_internal(void);
-static struct picture_t *_init_external(const char *path);
-
-static int _jpeg_read_geometry(FILE *fp, unsigned *width, unsigned *height);
-static void _jpeg_error_handler(j_common_ptr jpeg);
-
-
-struct picture_t *blank_picture_init(const char *path) {
-	struct picture_t *blank = NULL;
-
-	if (path) {
-		blank = _init_external(path);
-	}
-
-	if (blank) {
-		LOG_INFO("Using external blank placeholder: %s", path);
-	} else {
-		blank = _init_internal();
-		LOG_INFO("Using internal blank placeholder");
-	}
-	return blank;
-}
-
-static struct picture_t *_init_internal(void) {
-	struct picture_t *blank;
-
-	blank = picture_init();
-	picture_set_data(blank, BLANK_JPEG_DATA, ARRAY_LEN(BLANK_JPEG_DATA));
-	blank->width = BLANK_JPEG_WIDTH;
-	blank->height = BLANK_JPEG_HEIGHT;
-	return blank;
-}
-
-static struct picture_t *_init_external(const char *path) {
-	FILE *fp = NULL;
-	struct picture_t *blank;
-
-	blank = picture_init();
-
-	if ((fp = fopen(path, "rb")) == NULL) {
-		LOG_PERROR("Can't open blank placeholder '%s'", path);
-		goto error;
-	}
-
-	if (_jpeg_read_geometry(fp, &blank->width, &blank->height) < 0) {
-		goto error;
-	}
-
-	if (fseek(fp, 0, SEEK_SET) < 0) {
-		LOG_PERROR("Can't seek to begin of the blank placeholder");
-		goto error;
-	}
-
-#	define CHUNK_SIZE ((size_t)(100 * 1024))
-	while (true) {
-		if (blank->used + CHUNK_SIZE >= blank->allocated) {
-			picture_realloc_data(blank, blank->used + CHUNK_SIZE * 2);
-		}
-
-		size_t readed = fread(blank->data + blank->used, 1, CHUNK_SIZE, fp);
-		blank->used += readed;
-
-		if (readed < CHUNK_SIZE) {
-			if (feof(fp)) {
-				goto ok;
-			} else {
-				LOG_PERROR("Can't read blank placeholder");
-				goto error;
-			}
-		}
-	}
-#	undef CHUNK_SIZE
-
-	error:
-		picture_destroy(blank);
-		blank = NULL;
-
-	ok:
-		if (fp) {
-			fclose(fp);
-		}
-
-	return blank;
-}
-
-static int _jpeg_read_geometry(FILE *fp, unsigned *width, unsigned *height) {
-	struct jpeg_decompress_struct jpeg;
-	struct _jpeg_error_manager_t jpeg_error;
-
-	jpeg_create_decompress(&jpeg);
-
-	// https://stackoverflow.com/questions/19857766/error-handling-in-libjpeg
-	jpeg.err = jpeg_std_error((struct jpeg_error_mgr *)&jpeg_error);
-	jpeg_error.mgr.error_exit = _jpeg_error_handler;
-	if (setjmp(jpeg_error.jmp) < 0) {
-		jpeg_destroy_decompress(&jpeg);
-		return -1;
-	}
-
-	jpeg_stdio_src(&jpeg, fp);
-	jpeg_read_header(&jpeg, TRUE);
-	jpeg_start_decompress(&jpeg);
-
-	*width = jpeg.output_width;
-	*height = jpeg.output_height;
-
-	jpeg_destroy_decompress(&jpeg);
-	return 0;
-}
-
-static void _jpeg_error_handler(j_common_ptr jpeg) {
-	struct _jpeg_error_manager_t *jpeg_error = (struct _jpeg_error_manager_t *)jpeg->err;
-	char msg[JMSG_LENGTH_MAX];
-
-	(*jpeg_error->mgr.format_message)(jpeg, msg);
-	LOG_ERROR("Invalid blank placeholder: %s", msg);
-	longjmp(jpeg_error->jmp, -1);
-}

src/http/data/index.html

@@ -1,59 +0,0 @@
-<!DOCTYPE html>
-
-<html>
-<head>
-	<meta charset="utf-8" />
-	<title>uStreamer</title>
-</head>
-
-<body>
-	<h3>&micro;Streamer v%VERSION%</h3>
-	<hr>
-	<ul>
-		<li>
-			<a href="/state"><b><samp>/state</samp></b></a><br>
-			Get JSON structure with state of the server.
-		</li>
-		<br>
-		<li>
-			<a href="/snapshot"><b><samp>/snapshot</samp></b></a><br>
-			Get a current actual image from the server.
-		</li>
-		<br>
-		<li>
-			<a href="/stream"><b><samp>/stream</samp></b></a><br>
-			Get a live stream. Query params:<br>
-			<br>
-			<ul>
-				<li>
-					<b><samp>key=abc123</samp></b><br>
-					User-defined key, which is part of cookie <samp>stream_client</samp>, which allows<br>
-					the stream client to determine its identifier and view statistics using <a href="/state"><samp>/state</samp></a>.
-				</li>
-				<br>
-				<li>
-					<b><samp>extra_headers=1</samp></b><br>
-					Add <samp>X-UStreamer-*</samp> headers to /stream handle (like on <a href="/snapshot"><samp>/snapshot</samp></a>).
-				</li>
-				<br>
-				<li>
-					<b><samp>advance_headers=1</samp></b><br>
-					Enable workaround for Chromium/Blink
-					<a href="https://bugs.chromium.org/p/chromium/issues/detail?id=527446">Bug #527446</a>.
-				</li>
-				<br>
-				<li>
-					<b><samp>dual_final_frames=1</samp></b><br>
-					Enable workaround for Safari/WebKit bug when using option <samp>--drop-same-frames</samp>.<br>
-					Without this option, when the frame series is completed, WebKit-based browsers<br>
-					renders the last frame with a delay.
-				</li>
-			</ul>
-		</li>
-		<br>
-	</ul>
-	<br>
-	<hr>
-	<a href="https://github.com/pikvm/ustreamer">Sources &amp; docs</a>
-</body>
-</html>

src/http/server.c

@@ -1,988 +0,0 @@
-/*****************************************************************************
-#                                                                            #
-#    uStreamer - Lightweight and fast MJPG-HTTP streamer.                    #
-#                                                                            #
-#    Copyright (C) 2018  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 "server.h"
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <stdbool.h>
-#include <stdatomic.h>
-#include <string.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <assert.h>
-
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/time.h>
-#include <netinet/tcp.h>
-#include <netinet/in.h>
-#include <netinet/ip.h>
-
-#include <event2/event.h>
-#include <event2/thread.h>
-#include <event2/http.h>
-#include <event2/buffer.h>
-#include <event2/bufferevent.h>
-#include <event2/keyvalq_struct.h>
-
-#include <uuid/uuid.h>
-
-#ifndef EVTHREAD_USE_PTHREADS_IMPLEMENTED
-#	error Required libevent-pthreads support
-#endif
-
-#include "../tools.h"
-#include "../threading.h"
-#include "../logging.h"
-#include "../process.h"
-#include "../picture.h"
-#include "../encoder.h"
-#include "../stream.h"
-#ifdef WITH_GPIO
-#	include "../gpio/gpio.h"
-#endif
-
-#include "unix.h"
-#include "uri.h"
-#include "base64.h"
-#include "mime.h"
-#include "static.h"
-#include "blank.h"
-
-#include "data/index_html.h"
-
-
-static int _http_preprocess_request(struct evhttp_request *request, struct http_server_t *server);
-
-static void _http_callback_root(struct evhttp_request *request, void *v_server);
-static void _http_callback_static(struct evhttp_request *request, void *v_server);
-static void _http_callback_state(struct evhttp_request *request, void *v_server);
-static void _http_callback_snapshot(struct evhttp_request *request, void *v_server);
-
-static void _http_callback_stream(struct evhttp_request *request, void *v_server);
-static void _http_callback_stream_write(struct bufferevent *buf_event, void *v_ctx);
-static void _http_callback_stream_error(struct bufferevent *buf_event, short what, void *v_ctx);
-
-static void _http_exposed_refresh(int fd, short event, void *v_server);
-static void _http_queue_send_stream(struct http_server_t *server, bool stream_updated, bool picture_updated);
-
-static bool _expose_new_picture_unsafe(struct http_server_t *server);
-static bool _expose_blank_picture(struct http_server_t *server);
-
-static void _format_bufferevent_reason(short what, char *reason);
-
-
-struct http_server_t *http_server_init(struct stream_t *stream) {
-	struct http_server_runtime_t *run;
-	struct http_server_t *server;
-	struct exposed_t *exposed;
-
-	A_CALLOC(exposed, 1);
-	exposed->picture = picture_init();
-
-	A_CALLOC(run, 1);
-	run->stream = stream;
-	run->exposed = exposed;
-	run->drop_same_frames_blank = 10;
-
-	A_CALLOC(server, 1);
-	server->host = "127.0.0.1";
-	server->port = 8080;
-	server->unix_path = "";
-	server->user = "";
-	server->passwd = "";
-	server->static_path = "";
-	server->allow_origin = "";
-	server->timeout = 10;
-	server->last_as_blank = -1;
-	server->run = run;
-
-	assert(!evthread_use_pthreads());
-	assert((run->base = event_base_new()));
-	assert((run->http = evhttp_new(run->base)));
-	evhttp_set_allowed_methods(run->http, EVHTTP_REQ_GET|EVHTTP_REQ_HEAD);
-	return server;
-}
-
-void http_server_destroy(struct http_server_t *server) {
-	if (server->run->refresh) {
-		event_del(server->run->refresh);
-		event_free(server->run->refresh);
-	}
-
-	evhttp_free(server->run->http);
-	if (server->run->unix_fd) {
-		close(server->run->unix_fd);
-	}
-	event_base_free(server->run->base);
-
-#	if LIBEVENT_VERSION_NUMBER >= 0x02010100
-	libevent_global_shutdown();
-#	endif
-
-	for (struct stream_client_t *client = server->run->stream_clients; client != NULL;) {
-		struct stream_client_t *next = client->next;
-
-		free(client->key);
-		free(client);
-		client = next;
-	}
-
-	if (server->run->auth_token) {
-		free(server->run->auth_token);
-	}
-
-	if (server->run->blank) {
-		picture_destroy(server->run->blank);
-	}
-
-	picture_destroy(server->run->exposed->picture);
-	free(server->run->exposed);
-	free(server->run);
-	free(server);
-}
-
-int http_server_listen(struct http_server_t *server) {
-	{
-		if (server->static_path[0] != '\0') {
-			LOG_INFO("Enabling HTTP file server: %s", server->static_path);
-			evhttp_set_gencb(server->run->http, _http_callback_static, (void *)server);
-		} else {
-			assert(!evhttp_set_cb(server->run->http, "/", _http_callback_root, (void *)server));
-		}
-		assert(!evhttp_set_cb(server->run->http, "/state", _http_callback_state, (void *)server));
-		assert(!evhttp_set_cb(server->run->http, "/snapshot", _http_callback_snapshot, (void *)server));
-		assert(!evhttp_set_cb(server->run->http, "/stream", _http_callback_stream, (void *)server));
-	}
-
-	server->run->drop_same_frames_blank = max_u(server->drop_same_frames, server->run->drop_same_frames_blank);
-	server->run->blank = blank_picture_init(server->blank_path);
-
-#	define EXPOSED(_next) server->run->exposed->_next
-	// See _expose_blank_picture()
-	picture_copy(server->run->blank, EXPOSED(picture));
-	EXPOSED(expose_begin_ts) = get_now_monotonic();
-	EXPOSED(expose_cmp_ts) = EXPOSED(expose_begin_ts);
-	EXPOSED(expose_end_ts) = EXPOSED(expose_begin_ts);
-	// See _http_exposed_refresh()
-	EXPOSED(notify_last_width) = EXPOSED(picture->width);
-	EXPOSED(notify_last_height) = EXPOSED(picture->height);
-#	undef EXPOSED
-
-	{
-		struct timeval refresh_interval;
-
-		refresh_interval.tv_sec = 0;
-		if (server->run->stream->dev->desired_fps > 0) {
-			refresh_interval.tv_usec = 1000000 / (server->run->stream->dev->desired_fps * 2);
-		} else {
-			refresh_interval.tv_usec = 16000; // ~60fps
-		}
-
-		assert((server->run->refresh = event_new(server->run->base, -1, EV_PERSIST, _http_exposed_refresh, server)));
-		assert(!event_add(server->run->refresh, &refresh_interval));
-	}
-
-	if (server->slowdown) {
-		stream_switch_slowdown(server->run->stream, true);
-	}
-
-	evhttp_set_timeout(server->run->http, server->timeout);
-
-	if (server->user[0] != '\0') {
-		char *raw_token;
-		char *encoded_token;
-
-		A_CALLOC(raw_token, strlen(server->user) + strlen(server->passwd) + 2);
-		sprintf(raw_token, "%s:%s", server->user, server->passwd);
-		encoded_token = base64_encode((unsigned char *)raw_token);
-		free(raw_token);
-
-		A_CALLOC(server->run->auth_token, strlen(encoded_token) + 16);
-		sprintf(server->run->auth_token, "Basic %s", encoded_token);
-		free(encoded_token);
-
-		LOG_INFO("Using HTTP basic auth");
-	}
-
-	if (server->unix_path[0] != '\0') {
-		LOG_DEBUG("Binding HTTP to UNIX socket '%s' ...", server->unix_path);
-		if ((server->run->unix_fd = evhttp_my_bind_unix(
-			server->run->http,
-			server->unix_path,
-			server->unix_rm,
-			server->unix_mode)) < 0
-		) {
-			return -1;
-		}
-		LOG_INFO("Listening HTTP on UNIX socket '%s'", server->unix_path);
-		if (server->tcp_nodelay) {
-			LOG_ERROR("TCP_NODELAY flag can't be used with UNIX socket and will be ignored");
-		}
-	} else {
-		LOG_DEBUG("Binding HTTP to [%s]:%u ...", server->host, server->port);
-		if (evhttp_bind_socket(server->run->http, server->host, server->port) < 0) {
-			LOG_PERROR("Can't bind HTTP on [%s]:%u", server->host, server->port)
-			return -1;
-		}
-		LOG_INFO("Listening HTTP on [%s]:%u", server->host, server->port);
-	}
-
-	return 0;
-}
-
-void http_server_loop(struct http_server_t *server) {
-	LOG_INFO("Starting HTTP eventloop ...");
-	event_base_dispatch(server->run->base);
-	LOG_INFO("HTTP eventloop stopped");
-}
-
-void http_server_loop_break(struct http_server_t *server) {
-	event_base_loopbreak(server->run->base);
-}
-
-#define ADD_HEADER(_key, _value) \
-	assert(!evhttp_add_header(evhttp_request_get_output_headers(request), _key, _value))
-
-static int _http_preprocess_request(struct evhttp_request *request, struct http_server_t *server) {
-	if (server->run->auth_token) {
-		const char *token = evhttp_find_header(evhttp_request_get_input_headers(request), "Authorization");
-
-		if (token == NULL || strcmp(token, server->run->auth_token) != 0) {
-			ADD_HEADER("WWW-Authenticate", "Basic realm=\"Restricted area\"");
-			evhttp_send_reply(request, 401, "Unauthorized", NULL);
-			return -1;
-		}
-	}
-
-	if (evhttp_request_get_command(request) == EVHTTP_REQ_HEAD) { \
-		evhttp_send_reply(request, HTTP_OK, "OK", NULL); \
-		return -1;
-	}
-
-	return 0;
-}
-
-#define PREPROCESS_REQUEST { \
-		if (_http_preprocess_request(request, server) < 0) { \
-			return; \
-		} \
-	}
-
-static void _http_callback_root(struct evhttp_request *request, void *v_server) {
-	struct http_server_t *server = (struct http_server_t *)v_server;
-	struct evbuffer *buf;
-	struct evkeyvalq params; // For mjpg-streamer compatibility
-	const char *action; // Ditto
-
-	PREPROCESS_REQUEST;
-
-	evhttp_parse_query(evhttp_request_get_uri(request), &params);
-	action = evhttp_find_header(&params, "action");
-
-	if (action && !strcmp(action, "snapshot")) {
-		_http_callback_snapshot(request, v_server);
-	} else if (action && !strcmp(action, "stream")) {
-		_http_callback_stream(request, v_server);
-	} else {
-		assert((buf = evbuffer_new()));
-		assert(evbuffer_add_printf(buf, "%s", HTML_INDEX_PAGE));
-		ADD_HEADER("Content-Type", "text/html");
-		evhttp_send_reply(request, HTTP_OK, "OK", buf);
-		evbuffer_free(buf);
-	}
-
-	evhttp_clear_headers(&params);
-}
-
-static void _http_callback_static(struct evhttp_request *request, void *v_server) {
-	struct http_server_t *server = (struct http_server_t *)v_server;
-	struct evbuffer *buf = NULL;
-	struct evhttp_uri *uri = NULL;
-	char *uri_path;
-	char *decoded_path = NULL;
-	char *static_path = NULL;
-	int fd = -1;
-	struct stat st;
-
-	PREPROCESS_REQUEST;
-
-	if ((uri = evhttp_uri_parse(evhttp_request_get_uri(request))) == NULL) {
-		goto bad_request;
-	}
-	if ((uri_path = (char *)evhttp_uri_get_path(uri)) == NULL) {
-		uri_path = "/";
-	}
-
-	if ((decoded_path = evhttp_uridecode(uri_path, 0, NULL)) == NULL) {
-		goto bad_request;
-	}
-
-	assert((buf = evbuffer_new()));
-
-	if ((static_path = find_static_file_path(server->static_path, decoded_path)) == NULL) {
-		goto not_found;
-	}
-
-	if ((fd = open(static_path, O_RDONLY)) < 0) {
-		LOG_PERROR("HTTP: Can't open found static file %s", static_path);
-		goto not_found;
-	}
-
-	if (fstat(fd, &st) < 0) {
-		LOG_PERROR("HTTP: Can't stat() found static file %s", static_path);
-		goto not_found;
-	}
-
-	if (st.st_size > 0 && evbuffer_add_file(buf, fd, 0, st.st_size) < 0) {
-		LOG_ERROR("HTTP: Can't serve static file %s", static_path);
-		goto not_found;
-	}
-	ADD_HEADER("Content-Type", guess_mime_type(static_path));
-	evhttp_send_reply(request, HTTP_OK, "OK", buf);
-	goto cleanup;
-
-	bad_request:
-		evhttp_send_error(request, HTTP_BADREQUEST, NULL);
-		goto cleanup;
-
-	not_found:
-		evhttp_send_error(request, HTTP_NOTFOUND, NULL);
-		goto cleanup;
-
-	cleanup:
-		if (fd >= 0) {
-			close(fd);
-		}
-		if (static_path) {
-			free(static_path);
-		}
-		if (buf) {
-			evbuffer_free(buf);
-		}
-		if (decoded_path) {
-			free(decoded_path);
-		}
-		if (uri) {
-			evhttp_uri_free(uri);
-		}
-}
-
-static void _http_callback_state(struct evhttp_request *request, void *v_server) {
-	struct http_server_t *server = (struct http_server_t *)v_server;
-	struct evbuffer *buf;
-	enum encoder_type_t encoder_run_type;
-	unsigned encoder_run_quality;
-
-	PREPROCESS_REQUEST;
-
-#	define ENCODER(_next) server->run->stream->encoder->_next
-#	define EXPOSED(_next) server->run->exposed->_next
-
-	A_MUTEX_LOCK(&ENCODER(run->mutex));
-	encoder_run_type = ENCODER(run->type);
-	encoder_run_quality = ENCODER(run->quality);
-	A_MUTEX_UNLOCK(&ENCODER(run->mutex));
-
-	assert((buf = evbuffer_new()));
-
-	assert(evbuffer_add_printf(buf,
-		"{\"ok\": true, \"result\": {"
-		" \"encoder\": {\"type\": \"%s\", \"quality\": %u},"
-		" \"source\": {\"resolution\": {\"width\": %u, \"height\": %u},"
-		" \"online\": %s, \"desired_fps\": %u, \"captured_fps\": %u},"
-		" \"stream\": {\"queued_fps\": %u, \"clients\": %u, \"clients_stat\": {",
-		encoder_type_to_string(encoder_run_type),
-		encoder_run_quality,
-		(server->fake_width ? server->fake_width : EXPOSED(picture->width)),
-		(server->fake_height ? server->fake_height : EXPOSED(picture->height)),
-		bool_to_string(EXPOSED(online)),
-		server->run->stream->dev->desired_fps,
-		EXPOSED(captured_fps),
-		EXPOSED(queued_fps),
-		server->run->stream_clients_count
-	));
-
-#	undef EXPOSED
-#	undef ENCODER
-
-	for (struct stream_client_t * client = server->run->stream_clients; client != NULL; client = client->next) {
-		assert(evbuffer_add_printf(buf,
-			"\"%s\": {\"fps\": %u, \"extra_headers\": %s, \"advance_headers\": %s, \"dual_final_frames\": %s}%s",
-			client->id,
-			client->fps,
-			bool_to_string(client->extra_headers),
-			bool_to_string(client->advance_headers),
-			bool_to_string(client->dual_final_frames),
-			(client->next ? ", " : "")
-		));
-	}
-
-	assert(evbuffer_add_printf(buf, "}}}}"));
-
-	ADD_HEADER("Content-Type", "application/json");
-	evhttp_send_reply(request, HTTP_OK, "OK", buf);
-	evbuffer_free(buf);
-}
-
-static void _http_callback_snapshot(struct evhttp_request *request, void *v_server) {
-	struct http_server_t *server = (struct http_server_t *)v_server;
-	struct evbuffer *buf;
-	char header_buf[64];
-
-	PREPROCESS_REQUEST;
-
-#	define EXPOSED(_next) server->run->exposed->_next
-
-	assert((buf = evbuffer_new()));
-	assert(!evbuffer_add(buf, (const void *)EXPOSED(picture->data), EXPOSED(picture->used)));
-
-	if (server->allow_origin[0] != '\0') {
-		ADD_HEADER("Access-Control-Allow-Origin", server->allow_origin);
-	}
-	ADD_HEADER("Cache-Control", "no-store, no-cache, must-revalidate, proxy-revalidate, pre-check=0, post-check=0, max-age=0");
-	ADD_HEADER("Pragma", "no-cache");
-	ADD_HEADER("Expires", "Mon, 3 Jan 2000 12:34:56 GMT");
-
-#	define ADD_TIME_HEADER(_key, _value) { \
-			sprintf(header_buf, "%.06Lf", _value); \
-			ADD_HEADER(_key, header_buf); \
-		}
-
-#	define ADD_UNSIGNED_HEADER(_key, _value) { \
-			sprintf(header_buf, "%u", _value); \
-			ADD_HEADER(_key, header_buf); \
-		}
-
-	ADD_TIME_HEADER("X-Timestamp", get_now_real());
-
-	ADD_HEADER("X-UStreamer-Online",						bool_to_string(EXPOSED(online)));
-	ADD_UNSIGNED_HEADER("X-UStreamer-Dropped",				EXPOSED(dropped));
-	ADD_UNSIGNED_HEADER("X-UStreamer-Width",				EXPOSED(picture->width));
-	ADD_UNSIGNED_HEADER("X-UStreamer-Height",				EXPOSED(picture->height));
-	ADD_TIME_HEADER("X-UStreamer-Grab-Timestamp",			EXPOSED(picture->grab_ts));
-	ADD_TIME_HEADER("X-UStreamer-Encode-Begin-Timestamp",	EXPOSED(picture->encode_begin_ts));
-	ADD_TIME_HEADER("X-UStreamer-Encode-End-Timestamp",		EXPOSED(picture->encode_end_ts));
-	ADD_TIME_HEADER("X-UStreamer-Expose-Begin-Timestamp",	EXPOSED(expose_begin_ts));
-	ADD_TIME_HEADER("X-UStreamer-Expose-Cmp-Timestamp",		EXPOSED(expose_cmp_ts));
-	ADD_TIME_HEADER("X-UStreamer-Expose-End-Timestamp",		EXPOSED(expose_end_ts));
-	ADD_TIME_HEADER("X-UStreamer-Send-Timestamp",			get_now_monotonic());
-
-#	undef ADD_UNSUGNED_HEADER
-#	undef ADD_TIME_HEADER
-#	undef EXPOSED
-
-	ADD_HEADER("Content-Type", "image/jpeg");
-
-	evhttp_send_reply(request, HTTP_OK, "OK", buf);
-	evbuffer_free(buf);
-}
-
-#undef ADD_HEADER
-
-static void _http_callback_stream(struct evhttp_request *request, void *v_server) {
-	// https://github.com/libevent/libevent/blob/29cc8386a2f7911eaa9336692a2c5544d8b4734f/http.c#L2814
-	// https://github.com/libevent/libevent/blob/29cc8386a2f7911eaa9336692a2c5544d8b4734f/http.c#L2789
-	// https://github.com/libevent/libevent/blob/29cc8386a2f7911eaa9336692a2c5544d8b4734f/http.c#L362
-	// https://github.com/libevent/libevent/blob/29cc8386a2f7911eaa9336692a2c5544d8b4734f/http.c#L791
-	// https://github.com/libevent/libevent/blob/29cc8386a2f7911eaa9336692a2c5544d8b4734f/http.c#L1458
-
-	struct http_server_t *server = (struct http_server_t *)v_server;
-	struct evhttp_connection *conn;
-	struct evkeyvalq params;
-	struct bufferevent *buf_event;
-	struct stream_client_t *client;
-	char *client_addr;
-	unsigned short client_port;
-	uuid_t uuid;
-
-	PREPROCESS_REQUEST;
-
-	conn = evhttp_request_get_connection(request);
-	if (conn) {
-		A_CALLOC(client, 1);
-		client->server = server;
-		client->request = request;
-		client->need_initial = true;
-		client->need_first_frame = true;
-
-		evhttp_parse_query(evhttp_request_get_uri(request), &params);
-		client->key = uri_get_string(&params, "key");
-		client->extra_headers = uri_get_true(&params, "extra_headers");
-		client->advance_headers = uri_get_true(&params, "advance_headers");
-		client->dual_final_frames = uri_get_true(&params, "dual_final_frames");
-		evhttp_clear_headers(&params);
-
-		uuid_generate(uuid);
-		uuid_unparse_lower(uuid, client->id);
-
-		if (server->run->stream_clients == NULL) {
-			server->run->stream_clients = client;
-		} else {
-			struct stream_client_t *last = server->run->stream_clients;
-
-			for (; last->next != NULL; last = last->next);
-			client->prev = last;
-			last->next = client;
-		}
-		server->run->stream_clients_count += 1;
-
-		if (server->run->stream_clients_count == 1) {
-			if (server->slowdown) {
-				stream_switch_slowdown(server->run->stream, false);
-			}
-
-#			ifdef WITH_GPIO
-			gpio_set_has_http_clients(true);
-#			endif
-		}
-
-		evhttp_connection_get_peer(conn, &client_addr, &client_port);
-		LOG_INFO("HTTP: Registered client: [%s]:%u, id=%s; clients now: %u",
-			client_addr, client_port, client->id, server->run->stream_clients_count);
-
-		buf_event = evhttp_connection_get_bufferevent(conn);
-		if (server->tcp_nodelay && !server->run->unix_fd) {
-			evutil_socket_t fd;
-			int on = 1;
-
-			LOG_DEBUG("HTTP: Setting up TCP_NODELAY to the client [%s]:%u ...", client_addr, client_port);
-			assert((fd = bufferevent_getfd(buf_event)) >= 0);
-			if (setsockopt(fd, IPPROTO_TCP, TCP_NODELAY, (void *)&on, sizeof(on)) != 0) {
-				LOG_PERROR("HTTP: Can't set TCP_NODELAY to the client [%s]:%u", client_addr, client_port);
-			}
-		}
-		bufferevent_setcb(buf_event, NULL, NULL, _http_callback_stream_error, (void *)client);
-		bufferevent_enable(buf_event, EV_READ);
-	} else {
-		evhttp_request_free(request);
-	}
-}
-
-#undef PREPROCESS_REQUEST
-
-static void _http_callback_stream_write(struct bufferevent *buf_event, void *v_client) {
-#	define BOUNDARY "boundarydonotcross"
-#	define RN "\r\n"
-
-	struct stream_client_t *client = (struct stream_client_t *)v_client;
-	struct evbuffer *buf;
-	long double now = get_now_monotonic();
-	long long now_second = floor_ms(now);
-
-	if (now_second != client->fps_accum_second) {
-		client->fps = client->fps_accum;
-		client->fps_accum = 0;
-		client->fps_accum_second = now_second;
-	}
-	client->fps_accum += 1;
-
-	assert((buf = evbuffer_new()));
-
-	// В хроме и его производных есть фундаментальный баг: он отрисовывает
-	// фрейм с задержкой на один, как только ему придут заголовки следующего.
-	// В сочетании с drop_same_frames это дает значительный лаг стрима
-	// при большом количестве дропов (на статичном изображении, где внезапно
-	// что-то изменилось.
-	//
-	// https://bugs.chromium.org/p/chromium/issues/detail?id=527446
-	//
-	// Включение advance_headers заставляет стример отсылать заголовки
-	// будущего фрейма сразу после данных текущего, чтобы триггернуть отрисовку.
-	// Естественным следствием этого является невозможность установки заголовка
-	// Content-Length, так как предсказывать будущее мы еще не научились.
-	// Его наличие не требуется RFC, однако никаких стандартов на MJPG over HTTP
-	// в природе не существует, и никто не может гарантировать, что отсутствие
-	// Content-Length не сломает вещание для каких-нибудь маргинальных браузеров.
-	//
-	// Кроме того, advance_headers форсит отключение заголовков X-UStreamer-*
-	// по тем же причинам, по которым у нас нет Content-Length.
-
-#	define ADD_ADVANCE_HEADERS \
-		assert(evbuffer_add_printf(buf, \
-			"Content-Type: image/jpeg" RN "X-Timestamp: %.06Lf" RN RN, get_now_real()))
-
-	if (client->need_initial) {
-		assert(evbuffer_add_printf(buf, "HTTP/1.0 200 OK" RN));
-		if (client->server->allow_origin[0] != '\0') {
-			assert(evbuffer_add_printf(buf, "Access-Control-Allow-Origin: %s" RN, client->server->allow_origin));
-		}
-		assert(evbuffer_add_printf(buf,
-			"Cache-Control: no-store, no-cache, must-revalidate, proxy-revalidate, pre-check=0, post-check=0, max-age=0" RN
-			"Pragma: no-cache" RN
-			"Expires: Mon, 3 Jan 2000 12:34:56 GMT" RN
-			"Set-Cookie: stream_client=%s/%s; path=/; max-age=30" RN
-			"Content-Type: multipart/x-mixed-replace;boundary=" BOUNDARY RN
-			RN
-			"--" BOUNDARY RN,
-			(client->key != NULL ? client->key : "0"),
-			client->id
-		));
-
-		if (client->advance_headers) {
-			ADD_ADVANCE_HEADERS;
-		}
-
-		assert(!bufferevent_write_buffer(buf_event, buf));
-		client->need_initial = false;
-	}
-
-#	define EXPOSED(_next) client->server->run->exposed->_next
-
-	if (!client->advance_headers) {
-		assert(evbuffer_add_printf(buf,
-			"Content-Type: image/jpeg" RN
-			"Content-Length: %zu" RN
-			"X-Timestamp: %.06Lf" RN
-			"%s",
-			EXPOSED(picture->used),
-			get_now_real(),
-			(client->extra_headers ? "" : RN)
-		));
-		if (client->extra_headers) {
-			assert(evbuffer_add_printf(buf,
-				"X-UStreamer-Online: %s" RN
-				"X-UStreamer-Dropped: %u" RN
-				"X-UStreamer-Width: %u" RN
-				"X-UStreamer-Height: %u" RN
-				"X-UStreamer-Client-FPS: %u" RN
-				"X-UStreamer-Grab-Time: %.06Lf" RN
-				"X-UStreamer-Encode-Begin-Time: %.06Lf" RN
-				"X-UStreamer-Encode-End-Time: %.06Lf" RN
-				"X-UStreamer-Expose-Begin-Time: %.06Lf" RN
-				"X-UStreamer-Expose-Cmp-Time: %.06Lf" RN
-				"X-UStreamer-Expose-End-Time: %.06Lf" RN
-				"X-UStreamer-Send-Time: %.06Lf" RN
-				RN,
-				bool_to_string(EXPOSED(online)),
-				EXPOSED(dropped),
-				EXPOSED(picture->width),
-				EXPOSED(picture->height),
-				client->fps,
-				EXPOSED(picture->grab_ts),
-				EXPOSED(picture->encode_begin_ts),
-				EXPOSED(picture->encode_end_ts),
-				EXPOSED(expose_begin_ts),
-				EXPOSED(expose_cmp_ts),
-				EXPOSED(expose_end_ts),
-				now
-			));
-		}
-	}
-
-	assert(!evbuffer_add(buf, (void *)EXPOSED(picture->data), EXPOSED(picture->used)));
-	assert(evbuffer_add_printf(buf, RN "--" BOUNDARY RN));
-
-	if (client->advance_headers) {
-		ADD_ADVANCE_HEADERS;
-	}
-
-	assert(!bufferevent_write_buffer(buf_event, buf));
-	evbuffer_free(buf);
-
-	bufferevent_setcb(buf_event, NULL, NULL, _http_callback_stream_error, (void *)client);
-	bufferevent_enable(buf_event, EV_READ);
-
-#	undef EXPOSED
-#	undef ADD_ADVANCE_HEADERS
-#	undef RN
-#	undef BOUNDARY
-}
-
-static void _http_callback_stream_error(UNUSED struct bufferevent *buf_event, UNUSED short what, void *v_client) {
-	struct stream_client_t *client = (struct stream_client_t *)v_client;
-	struct evhttp_connection *conn;
-	char *client_addr = "???";
-	unsigned short client_port = 0;
-	char reason[2048] = {0};
-
-	_format_bufferevent_reason(what, reason);
-
-#	define RUN(_next) client->server->run->_next
-
-	assert(RUN(stream_clients_count) > 0);
-	RUN(stream_clients_count) -= 1;
-
-	if (RUN(stream_clients_count) == 0) {
-		if (client->server->slowdown) {
-			stream_switch_slowdown(RUN(stream), true);
-		}
-
-#		ifdef WITH_GPIO
-		gpio_set_has_http_clients(false);
-#		endif
-	}
-
-	conn = evhttp_request_get_connection(client->request);
-	if (conn) {
-		evhttp_connection_get_peer(conn, &client_addr, &client_port);
-	}
-
-	LOG_INFO("HTTP: Disconnected client: [%s]:%u, id=%s, %s; clients now: %u",
-		client_addr, client_port, client->id, reason, RUN(stream_clients_count));
-	if (conn) {
-		evhttp_connection_free(conn);
-	}
-
-	if (client->prev == NULL) {
-		RUN(stream_clients) = client->next;
-	} else {
-		client->prev->next = client->next;
-	}
-	if (client->next != NULL) {
-		client->next->prev = client->prev;
-	}
-	free(client->key);
-	free(client);
-
-#	undef RUN
-}
-
-static void _http_queue_send_stream(struct http_server_t *server, bool stream_updated, bool picture_updated) {
-	struct evhttp_connection *conn;
-	struct bufferevent *buf_event;
-	long long now;
-	bool has_clients = false;
-	bool queued = false;
-
-	for (struct stream_client_t *client = server->run->stream_clients; client != NULL; client = client->next) {
-		conn = evhttp_request_get_connection(client->request);
-		if (conn) {
-			// Фикс для бага WebKit. При включенной опции дропа одинаковых фреймов,
-			// WebKit отрисовывает последний фрейм в серии с некоторой задержкой,
-			// и нужно послать два фрейма, чтобы серия была вовремя завершена.
-			// Это похоже на баг Blink (см. _http_callback_stream_write() и advance_headers),
-			// но фикс для него не лечит проблему вебкита. Такие дела.
-
-			bool dual_update = (
-				server->drop_same_frames
-				&& client->dual_final_frames
-				&& stream_updated
-				&& client->updated_prev
-				&& !picture_updated
-			);
-
-			if (dual_update || picture_updated || client->need_first_frame) {
-				buf_event = evhttp_connection_get_bufferevent(conn);
-				bufferevent_setcb(buf_event, NULL, _http_callback_stream_write, _http_callback_stream_error, (void *)client);
-				bufferevent_enable(buf_event, EV_READ|EV_WRITE);
-
-				client->need_first_frame = false;
-				client->updated_prev = (picture_updated || client->need_first_frame); // Игнорировать dual
-				queued = true;
-			} else if (stream_updated) { // Для dual
-				client->updated_prev = false;
-			}
-
-			has_clients = true;
-		}
-	}
-
-	if (queued) {
-		static unsigned queued_fps_accum = 0;
-		static long long queued_fps_second = 0;
-
-		if ((now = floor_ms(get_now_monotonic())) != queued_fps_second) {
-			server->run->exposed->queued_fps = queued_fps_accum;
-			queued_fps_accum = 0;
-			queued_fps_second = now;
-		}
-		queued_fps_accum += 1;
-	} else if (!has_clients) {
-		server->run->exposed->queued_fps = 0;
-	}
-}
-
-static void _http_exposed_refresh(UNUSED int fd, UNUSED short what, void *v_server) {
-	struct http_server_t *server = (struct http_server_t *)v_server;
-	bool stream_updated = false;
-	bool picture_updated = false;
-
-#	define UNLOCK_STREAM { \
-			atomic_store(&server->run->stream->updated, false); \
-			A_MUTEX_UNLOCK(&server->run->stream->mutex); \
-		}
-
-	if (atomic_load(&server->run->stream->updated)) {
-		LOG_DEBUG("Refreshing HTTP exposed ...");
-		A_MUTEX_LOCK(&server->run->stream->mutex);
-		if (server->run->stream->online) {
-			picture_updated = _expose_new_picture_unsafe(server);
-			UNLOCK_STREAM;
-		} else {
-			UNLOCK_STREAM;
-			picture_updated = _expose_blank_picture(server);
-		}
-		stream_updated = true;
-	} else if (!server->run->exposed->online) {
-		LOG_DEBUG("Refreshing HTTP exposed (BLANK) ...");
-		picture_updated = _expose_blank_picture(server);
-		stream_updated = true;
-	}
-
-#	undef UNLOCK_STREAM
-
-	_http_queue_send_stream(server, stream_updated, picture_updated);
-
-#	define EXPOSED(_next) server->run->exposed->_next
-
-	if (
-		picture_updated
-		&& server->notify_parent
-		&& (
-			EXPOSED(notify_last_online) != EXPOSED(online)
-			|| EXPOSED(notify_last_width) != EXPOSED(picture->width)
-			|| EXPOSED(notify_last_height) != EXPOSED(picture->height)
-		)
-	) {
-		EXPOSED(notify_last_online) = EXPOSED(online);
-		EXPOSED(notify_last_width) = EXPOSED(picture->width);
-		EXPOSED(notify_last_height) = EXPOSED(picture->height);
-		process_notify_parent();
-	}
-
-#	undef EXPOSED
-}
-
-static bool _expose_new_picture_unsafe(struct http_server_t *server) {
-#	define EXPOSED(_next) server->run->exposed->_next
-#	define STREAM(_next) server->run->stream->_next
-
-	EXPOSED(captured_fps) = STREAM(captured_fps);
-	EXPOSED(expose_begin_ts) = get_now_monotonic();
-
-	if (server->drop_same_frames) {
-		if (
-			EXPOSED(online)
-			&& EXPOSED(dropped) < server->drop_same_frames
-			&& picture_compare(EXPOSED(picture), STREAM(picture))
-		) {
-			EXPOSED(expose_cmp_ts) = get_now_monotonic();
-			EXPOSED(expose_end_ts) = EXPOSED(expose_cmp_ts);
-			LOG_VERBOSE("HTTP: Dropped same frame number %u; cmp_time=%.06Lf",
-				EXPOSED(dropped), EXPOSED(expose_cmp_ts) - EXPOSED(expose_begin_ts));
-			EXPOSED(dropped) += 1;
-			return false; // Not updated
-		} else {
-			EXPOSED(expose_cmp_ts) = get_now_monotonic();
-			LOG_VERBOSE("HTTP: Passed same frame check (frames are differ); cmp_time=%.06Lf",
-				EXPOSED(expose_cmp_ts) - EXPOSED(expose_begin_ts));
-		}
-	}
-
-	picture_copy(STREAM(picture), EXPOSED(picture));
-
-#	undef STREAM
-
-	EXPOSED(online) = true;
-	EXPOSED(dropped) = 0;
-	EXPOSED(expose_cmp_ts) = EXPOSED(expose_begin_ts);
-	EXPOSED(expose_end_ts) = get_now_monotonic();
-
-	LOG_VERBOSE("HTTP: Exposed new frame; full exposition time = %.06Lf",
-		 EXPOSED(expose_end_ts) - EXPOSED(expose_begin_ts));
-
-#	undef EXPOSED
-	return true; // Updated
-}
-
-static bool _expose_blank_picture(struct http_server_t *server) {
-#	define EXPOSED(_next) server->run->exposed->_next
-
-	EXPOSED(expose_begin_ts) = get_now_monotonic();
-	EXPOSED(expose_cmp_ts) = EXPOSED(expose_begin_ts);
-
-#	define EXPOSE_BLANK picture_copy(server->run->blank, EXPOSED(picture))
-
-	if (EXPOSED(online)) { // Если переходим из online в offline
-		if (server->last_as_blank < 0) { // Если last_as_blank выключено, просто покажем картинку
-			LOG_INFO("HTTP: Changed picture to BLANK");
-			EXPOSE_BLANK;
-		} else if (server->last_as_blank > 0) { // Если нужен таймер - запустим
-			LOG_INFO("HTTP: Freezing last alive frame for %d seconds", server->last_as_blank);
-			EXPOSED(last_as_blank_ts) = get_now_monotonic();
-		} else { // last_as_blank == 0 - показываем последний фрейм вечно
-			LOG_INFO("HTTP: Freezing last alive frame forever");
-		}
-		goto updated;
-	}
-
-	if ( // Если уже оффлайн, включена фича last_as_blank с таймером и он запущен
-		server->last_as_blank > 0
-		&& EXPOSED(last_as_blank_ts) > 0
-		&& EXPOSED(last_as_blank_ts) + server->last_as_blank < EXPOSED(expose_begin_ts)
-	) {
-		LOG_INFO("HTTP: Changed last alive frame to BLANK");
-		EXPOSE_BLANK;
-		EXPOSED(last_as_blank_ts) = 0; // Останавливаем таймер
-		goto updated;
-	}
-
-#	undef EXPOSE_BLANK
-
-	if (EXPOSED(dropped) < server->run->drop_same_frames_blank) {
-		LOG_PERF("HTTP: Dropped same frame (BLANK) number %u", EXPOSED(dropped));
-		EXPOSED(dropped) += 1;
-		EXPOSED(expose_end_ts) = get_now_monotonic();
-		return false; // Not updated
-	}
-
-	updated:
-		EXPOSED(captured_fps) = 0;
-		EXPOSED(online) = false;
-		EXPOSED(dropped) = 0;
-		EXPOSED(expose_end_ts) = get_now_monotonic();
-		return true; // Updated
-
-#	undef EXPOSED
-}
-
-static void _format_bufferevent_reason(short what, char *reason) {
-	char perror_buf[1024] = {0};
-	char *perror_ptr = errno_to_string(EVUTIL_SOCKET_ERROR(), perror_buf, 1024); // evutil_socket_error_to_string() is not thread-sage
-	bool first = true;
-
-	strcat(reason, perror_ptr);
-	strcat(reason, " (");
-
-#	define FILL_REASON(_bev, _name) { \
-			if (what & _bev) { \
-				if (first) { \
-					first = false; \
-				} else { \
-					strcat(reason, ","); \
-				} \
-				strcat(reason, _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, ")");
-}

src/http/server.h

@@ -1,120 +0,0 @@
-/*****************************************************************************
-#                                                                            #
-#    uStreamer - Lightweight and fast MJPG-HTTP streamer.                    #
-#                                                                            #
-#    Copyright (C) 2018  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 <stdbool.h>
-
-#include <sys/stat.h>
-
-#include <event2/event.h>
-#include <event2/http.h>
-#include <event2/util.h>
-
-#include "../picture.h"
-#include "../stream.h"
-
-
-struct stream_client_t {
-	struct http_server_t	*server;
-	struct evhttp_request	*request;
-
-	char					*key;
-	bool					extra_headers;
-	bool					advance_headers;
-	bool					dual_final_frames;
-
-	char					id[37]; // ex. "1b4e28ba-2fa1-11d2-883f-0016d3cca427" + "\0"
-	bool					need_initial;
-	bool					need_first_frame;
-	bool					updated_prev;
-	unsigned				fps;
-	unsigned				fps_accum;
-	long long				fps_accum_second;
-
-	struct stream_client_t	*prev;
-	struct stream_client_t	*next;
-};
-
-struct exposed_t {
-	struct picture_t	*picture;
-	unsigned			captured_fps;
-	unsigned			queued_fps;
-	bool				online;
-	unsigned			dropped;
-	long double			expose_begin_ts;
-	long double			expose_cmp_ts;
-	long double			expose_end_ts;
-	long double			last_as_blank_ts;
-
-	bool		notify_last_online;
-	unsigned	notify_last_width;
-	unsigned	notify_last_height;
-};
-
-struct http_server_runtime_t {
-	struct event_base		*base;
-	struct evhttp			*http;
-	evutil_socket_t			unix_fd;
-	char					*auth_token;
-	struct event			*refresh;
-	struct stream_t			*stream;
-	struct exposed_t		*exposed;
-	struct stream_client_t	*stream_clients;
-	unsigned				stream_clients_count;
-	struct picture_t		*blank;
-	unsigned				drop_same_frames_blank;
-};
-
-struct http_server_t {
-	char		*host;
-	unsigned	port;
-	char		*unix_path;
-	bool		unix_rm;
-	mode_t		unix_mode;
-	bool		tcp_nodelay;
-	unsigned	timeout;
-
-	char		*user;
-	char		*passwd;
-	char		*static_path;
-	char		*allow_origin;
-
-	char		*blank_path;
-	int			last_as_blank;
-	unsigned	drop_same_frames;
-	bool		slowdown;
-	unsigned	fake_width;
-	unsigned	fake_height;
-
-	bool		notify_parent;
-
-	struct http_server_runtime_t *run;
-};
-
-
-struct http_server_t *http_server_init(struct stream_t *stream);
-void http_server_destroy(struct http_server_t *server);
-
-int http_server_listen(struct http_server_t *server);
-void http_server_loop(struct http_server_t *server);
-void http_server_loop_break(struct http_server_t *server);

src/libs/array.h

@@ -0,0 +1,37 @@
+/*****************************************************************************
+#                                                                            #
+#    uStreamer - Lightweight and fast MJPEG-HTTP streamer.                   #
+#                                                                            #
+#    Copyright (C) 2018-2022  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 <assert.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]; \
+			__VA_ARGS__ \
+		} \
+	}

src/libs/base64.c

@@ -1,8 +1,8 @@
 /*****************************************************************************
 #                                                                            #
-#    uStreamer - Lightweight and fast MJPG-HTTP streamer.                    #
+#    uStreamer - Lightweight and fast MJPEG-HTTP streamer.                   #
 #                                                                            #
-#    Copyright (C) 2018  Maxim Devaev <mdevaev@gmail.com>                    #
+#    Copyright (C) 2018-2022  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,11 +22,6 @@
 
 #include "base64.h"
 
-#include <stdlib.h>
-#include <string.h>
-
-#include "../tools.h"
-
 
 static const char _ENCODING_TABLE[] = {
 	'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H',
@@ -42,30 +37,36 @@ static const char _ENCODING_TABLE[] = {
 static const unsigned _MOD_TABLE[] = {0, 2, 1};
 
 
-char *base64_encode(const unsigned char *str) {
-	size_t str_len = strlen((const char *)str);
-	size_t encoded_size = 4 * ((str_len + 2) / 3) + 1; // +1 for '\0'
-	char *encoded;
+void us_base64_encode(const uint8_t *data, size_t size, char **encoded, size_t *allocated) {
+	const size_t encoded_size = 4 * ((size + 2) / 3) + 1; // +1 for '\0'
 
-	A_CALLOC(encoded, encoded_size);
-
-	for (unsigned str_index = 0, encoded_index = 0; str_index < str_len;) {
-		unsigned octet_a = (str_index < str_len ? (unsigned char)str[str_index++] : 0);
-		unsigned octet_b = (str_index < str_len ? (unsigned char)str[str_index++] : 0);
-		unsigned octet_c = (str_index < str_len ? (unsigned char)str[str_index++] : 0);
-
-		unsigned triple = (octet_a << 0x10) + (octet_b << 0x08) + octet_c;
-
-		encoded[encoded_index++] = _ENCODING_TABLE[(triple >> 3 * 6) & 0x3F];
-		encoded[encoded_index++] = _ENCODING_TABLE[(triple >> 2 * 6) & 0x3F];
-		encoded[encoded_index++] = _ENCODING_TABLE[(triple >> 1 * 6) & 0x3F];
-		encoded[encoded_index++] = _ENCODING_TABLE[(triple >> 0 * 6) & 0x3F];
+	if (*encoded == NULL || (allocated && *allocated < encoded_size)) {
+		US_REALLOC(*encoded, encoded_size);
+		if (allocated) {
+			*allocated = encoded_size;
+		}
 	}
 
-	for (unsigned index = 0; index < _MOD_TABLE[str_len % 3]; index++) {
-		encoded[encoded_size - 2 - index] = '=';
+	for (unsigned data_index = 0, encoded_index = 0; data_index < size;) {
+#		define OCTET(_name) unsigned _name = (data_index < size ? (uint8_t)data[data_index++] : 0)
+		OCTET(octet_a);
+		OCTET(octet_b);
+		OCTET(octet_c);
+#		undef OCTET
+
+		const unsigned triple = (octet_a << 0x10) + (octet_b << 0x08) + octet_c;
+
+#		define ENCODE(_offset) (*encoded)[encoded_index++] = _ENCODING_TABLE[(triple >> _offset * 6) & 0x3F]
+		ENCODE(3);
+		ENCODE(2);
+		ENCODE(1);
+		ENCODE(0);
+#		undef ENCODE
 	}
 
-	encoded[encoded_size - 1] = '\0';
-	return encoded;
+	for (unsigned index = 0; index < _MOD_TABLE[size % 3]; index++) {
+		(*encoded)[encoded_size - 2 - index] = '=';
+	}
+
+	(*encoded)[encoded_size - 1] = '\0';
 }

src/libs/base64.h

@@ -1,8 +1,8 @@
 /*****************************************************************************
 #                                                                            #
-#    uStreamer - Lightweight and fast MJPG-HTTP streamer.                    #
+#    uStreamer - Lightweight and fast MJPEG-HTTP streamer.                   #
 #                                                                            #
-#    Copyright (C) 2018  Maxim Devaev <mdevaev@gmail.com>                    #
+#    Copyright (C) 2018-2022  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,8 +22,13 @@
 
 #pragma once
 
-#include "../../device.h"
+#include <stdlib.h>
+#include <stdint.h>
+#include <string.h>
+
+#include <sys/types.h>
+
+#include "tools.h"
 
 
-int hw_encoder_prepare(struct device_t *dev, unsigned quality);
-void hw_encoder_compress_buffer(struct device_t *dev, unsigned index);
+void us_base64_encode(const uint8_t *data, size_t size, char **encoded, size_t *allocated);

src/libs/const.h

@@ -1,8 +1,8 @@
 /*****************************************************************************
 #                                                                            #
-#    uStreamer - Lightweight and fast MJPG-HTTP streamer.                    #
+#    uStreamer - Lightweight and fast MJPEG-HTTP streamer.                   #
 #                                                                            #
-#    Copyright (C) 2018  Maxim Devaev <mdevaev@gmail.com>                    #
+#    Copyright (C) 2018-2022  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,17 +22,11 @@
 
 #pragma once
 
-#include <IL/OMX_IVCommon.h>
-#include <IL/OMX_Core.h>
-#include <IL/OMX_Image.h>
+#define US_VERSION_MAJOR 5
+#define US_VERSION_MINOR 24
 
-#include "../../logging.h"
+#define US_MAKE_VERSION2(_major, _minor) #_major "." #_minor
+#define US_MAKE_VERSION1(_major, _minor) US_MAKE_VERSION2(_major, _minor)
+#define US_VERSION US_MAKE_VERSION1(US_VERSION_MAJOR, US_VERSION_MINOR)
 
-
-#define LOG_ERROR_OMX(_error, _msg, ...) { \
-		LOG_ERROR(_msg ": %s", ##__VA_ARGS__, omx_error_to_string(_error)); \
-	}
-
-
-const char *omx_error_to_string(OMX_ERRORTYPE error);
-const char *omx_state_to_string(OMX_STATETYPE state);
+#define US_VERSION_U ((unsigned)(US_VERSION_MAJOR * 1000 + US_VERSION_MINOR))

src/libs/frame.c

@@ -0,0 +1,105 @@
+/*****************************************************************************
+#                                                                            #
+#    uStreamer - Lightweight and fast MJPEG-HTTP streamer.                   #
+#                                                                            #
+#    Copyright (C) 2018-2022  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 "frame.h"
+
+
+us_frame_s *us_frame_init(void) {
+	us_frame_s *frame;
+	US_CALLOC(frame, 1);
+	us_frame_realloc_data(frame, 512 * 1024);
+	frame->dma_fd = -1;
+	return frame;
+}
+
+void us_frame_destroy(us_frame_s *frame) {
+	US_DELETE(frame->data, free);
+	free(frame);
+}
+
+void us_frame_realloc_data(us_frame_s *frame, size_t size) {
+	if (frame->allocated < size) {
+		US_REALLOC(frame->data, size);
+		frame->allocated = size;
+	}
+}
+
+void us_frame_set_data(us_frame_s *frame, const uint8_t *data, size_t size) {
+	us_frame_realloc_data(frame, size);
+	memcpy(frame->data, data, size);
+	frame->used = size;
+}
+
+void us_frame_append_data(us_frame_s *frame, const uint8_t *data, size_t size) {
+	const size_t new_used = frame->used + size;
+	us_frame_realloc_data(frame, new_used);
+	memcpy(frame->data + frame->used, data, size);
+	frame->used = new_used;
+}
+
+void us_frame_copy(const us_frame_s *src, us_frame_s *dest) {
+	us_frame_set_data(dest, src->data, src->used);
+	US_FRAME_COPY_META(src, 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)
+		&& !memcmp(a->data, b->data, b->used)
+	);
+}
+
+unsigned us_frame_get_padding(const us_frame_s *frame) {
+	unsigned bytes_per_pixel = 0;
+	switch (frame->format) {
+		case V4L2_PIX_FMT_YUYV:
+		case V4L2_PIX_FMT_UYVY:
+		case V4L2_PIX_FMT_RGB565: bytes_per_pixel = 2; 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");
+	}
+	if (bytes_per_pixel > 0 && frame->stride > frame->width) {
+		return (frame->stride - frame->width * bytes_per_pixel);
+	}
+	return 0;
+}
+
+const char *us_fourcc_to_string(unsigned format, char *buf, size_t size) {
+	assert(size >= 8);
+	buf[0] = format & 0x7F;
+	buf[1] = (format >> 8) & 0x7F;
+	buf[2] = (format >> 16) & 0x7F;
+	buf[3] = (format >> 24) & 0x7F;
+	if (format & ((unsigned)1 << 31)) {
+		buf[4] = '-';
+		buf[5] = 'B';
+		buf[6] = 'E';
+		buf[7] = '\0';
+	} else {
+		buf[4] = '\0';
+	}
+	return buf;
+}

src/libs/frame.h

@@ -0,0 +1,118 @@
+/*****************************************************************************
+#                                                                            #
+#    uStreamer - Lightweight and fast MJPEG-HTTP streamer.                   #
+#                                                                            #
+#    Copyright (C) 2018-2022  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 <stddef.h>
+#include <stdint.h>
+#include <stdbool.h>
+#include <stdlib.h>
+#include <string.h>
+#include <assert.h>
+
+#include <linux/videodev2.h>
+
+#include "tools.h"
+
+
+typedef struct {
+	uint8_t		*data;
+	size_t		used;
+	size_t		allocated;
+	int			dma_fd;
+
+	unsigned	width;
+	unsigned	height;
+	unsigned	format;
+	unsigned	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;
+
+	long double	grab_ts;
+	long double	encode_begin_ts;
+	long double	encode_end_ts;
+} 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->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; \
+	}
+
+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 \
+	)
+
+
+static inline void us_frame_encoding_begin(const us_frame_s *src, us_frame_s *dest, unsigned format) {
+	assert(src->used > 0);
+	us_frame_copy_meta(src, dest);
+	dest->encode_begin_ts = us_get_now_monotonic();
+	dest->format = format;
+	dest->stride = 0;
+	dest->used = 0;
+}
+
+static inline void us_frame_encoding_end(us_frame_s *dest) {
+	assert(dest->used > 0);
+	dest->encode_end_ts = us_get_now_monotonic();
+}
+
+
+us_frame_s *us_frame_init(void);
+void us_frame_destroy(us_frame_s *frame);
+
+void us_frame_realloc_data(us_frame_s *frame, size_t size);
+void us_frame_set_data(us_frame_s *frame, const uint8_t *data, size_t size);
+void us_frame_append_data(us_frame_s *frame, const uint8_t *data, size_t size);
+
+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);
+
+unsigned us_frame_get_padding(const us_frame_s *frame);
+
+const char *us_fourcc_to_string(unsigned format, char *buf, size_t size);
+
+static inline bool us_is_jpeg(unsigned format) {
+	return (format == V4L2_PIX_FMT_JPEG || format == V4L2_PIX_FMT_MJPEG);
+}

src/libs/list.h

@@ -0,0 +1,71 @@
+/*****************************************************************************
+#                                                                            #
+#    uStreamer - Lightweight and fast MJPEG-HTTP streamer.                   #
+#                                                                            #
+#    Copyright (C) 2018-2022  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 <assert.h>
+
+
+#define US_LIST_STRUCT(...) \
+	__VA_ARGS__ *prev; \
+	__VA_ARGS__ *next;
+
+#define US_LIST_ITERATE(x_first, x_item, ...) { \
+		for (__typeof__(x_first) x_item = x_first; x_item;) { \
+			__typeof__(x_first) m_next = x_item->next; \
+			__VA_ARGS__ \
+			x_item = m_next; \
+		} \
+	}
+
+#define US_LIST_APPEND(x_first, x_item) { \
+		if (x_first == NULL) { \
+			x_first = x_item; \
+		} else { \
+			__typeof__(x_first) m_last = x_first; \
+			for (; m_last->next; m_last = m_last->next); \
+			x_item->prev = m_last; \
+			m_last->next = x_item; \
+		} \
+	}
+
+#define US_LIST_APPEND_C(x_first, x_item, x_count) { \
+		US_LIST_APPEND(x_first, x_item); \
+		++(x_count); \
+	}
+
+#define US_LIST_REMOVE(x_first, x_item) { \
+		if (x_item->prev == NULL) { \
+			x_first = x_item->next; \
+		} else { \
+			x_item->prev->next = x_item->next; \
+		} \
+		if (x_item->next != NULL) { \
+			x_item->next->prev = x_item->prev; \
+		} \
+	}
+
+#define US_LIST_REMOVE_C(x_first, x_item, x_count) { \
+		US_LIST_REMOVE(x_first, x_item); \
+		assert((x_count) >= 1); \
+		--(x_count); \
+	}

src/libs/logging.c

@@ -1,8 +1,8 @@
 /*****************************************************************************
 #                                                                            #
-#    uStreamer - Lightweight and fast MJPG-HTTP streamer.                    #
+#    uStreamer - Lightweight and fast MJPEG-HTTP streamer.                   #
 #                                                                            #
-#    Copyright (C) 2018  Maxim Devaev <mdevaev@gmail.com>                    #
+#    Copyright (C) 2018-2022  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,15 +20,11 @@
 *****************************************************************************/
 
 
-#include <stdbool.h>
-
-#include <pthread.h>
-
 #include "logging.h"
 
 
-enum log_level_t log_level;
+enum us_log_level_t us_g_log_level;
 
-bool log_colored;
+bool us_g_log_colored;
 
-pthread_mutex_t log_mutex;
+pthread_mutex_t us_g_log_mutex;

src/libs/logging.h

@@ -0,0 +1,162 @@
+/*****************************************************************************
+#                                                                            #
+#    uStreamer - Lightweight and fast MJPEG-HTTP streamer.                   #
+#                                                                            #
+#    Copyright (C) 2018-2022  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 <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include <errno.h>
+#include <time.h>
+#include <assert.h>
+
+#include <pthread.h>
+
+#include "tools.h"
+#include "threading.h"
+
+
+enum us_log_level_t {
+    US_LOG_LEVEL_INFO,
+    US_LOG_LEVEL_PERF,
+    US_LOG_LEVEL_VERBOSE,
+    US_LOG_LEVEL_DEBUG,
+};
+
+
+extern enum us_log_level_t us_g_log_level;
+
+extern bool us_g_log_colored;
+
+extern pthread_mutex_t us_g_log_mutex;
+
+
+#define US_LOGGING_INIT { \
+		us_g_log_level = US_LOG_LEVEL_INFO; \
+		us_g_log_colored = isatty(2); \
+		US_MUTEX_INIT(us_g_log_mutex); \
+	}
+
+#define US_LOGGING_DESTROY	US_MUTEX_DESTROY(us_g_log_mutex)
+
+#define US_LOGGING_LOCK		US_MUTEX_LOCK(us_g_log_mutex)
+#define US_LOGGING_UNLOCK	US_MUTEX_UNLOCK(us_g_log_mutex)
+
+
+#define US_COLOR_GRAY		"\x1b[30;1m"
+#define US_COLOR_RED		"\x1b[31;1m"
+#define US_COLOR_GREEN		"\x1b[32;1m"
+#define US_COLOR_YELLOW		"\x1b[33;1m"
+#define US_COLOR_BLUE		"\x1b[34;1m"
+#define US_COLOR_CYAN		"\x1b[36;1m"
+#define US_COLOR_RESET		"\x1b[0m"
+
+
+#define US_SEP_INFO(x_ch) { \
+		US_LOGGING_LOCK; \
+		for (int m_count = 0; m_count < 80; ++m_count) { \
+			fputc((x_ch), stderr); \
+		} \
+		fputc('\n', stderr); \
+		fflush(stderr); \
+		US_LOGGING_UNLOCK; \
+	}
+
+#define US_SEP_DEBUG(x_ch) { \
+		if (us_g_log_level >= US_LOG_LEVEL_DEBUG) { \
+			US_SEP_INFO(x_ch); \
+		} \
+	}
+
+
+#define US_LOG_PRINTF_NOLOCK(x_label_color, x_label, x_msg_color, x_msg, ...) { \
+		char m_tname_buf[US_MAX_THREAD_NAME] = {0}; \
+		us_thread_get_name(m_tname_buf); \
+		if (us_g_log_colored) { \
+			fprintf(stderr, US_COLOR_GRAY "-- " x_label_color x_label US_COLOR_GRAY \
+				" [%.03Lf %9s]" " -- " US_COLOR_RESET x_msg_color x_msg US_COLOR_RESET, \
+				us_get_now_monotonic(), m_tname_buf, ##__VA_ARGS__); \
+		} else { \
+			fprintf(stderr, "-- " x_label " [%.03Lf %9s] -- " x_msg, \
+				us_get_now_monotonic(), m_tname_buf, ##__VA_ARGS__); \
+		} \
+		fputc('\n', stderr); \
+		fflush(stderr); \
+	}
+
+#define US_LOG_PRINTF(x_label_color, x_label, x_msg_color, x_msg, ...) { \
+		US_LOGGING_LOCK; \
+		US_LOG_PRINTF_NOLOCK(x_label_color, x_label, x_msg_color, x_msg, ##__VA_ARGS__); \
+		US_LOGGING_UNLOCK; \
+	}
+
+#define US_LOG_ERROR(x_msg, ...) { \
+		US_LOG_PRINTF(US_COLOR_RED, "ERROR", US_COLOR_RED, x_msg, ##__VA_ARGS__); \
+	}
+
+#define US_LOG_PERROR(x_msg, ...) { \
+		char *const m_perror_str = us_errno_to_string(errno); \
+		US_LOG_ERROR(x_msg ": %s", ##__VA_ARGS__, m_perror_str); \
+		free(m_perror_str); \
+	}
+
+#define US_LOG_INFO(x_msg, ...) { \
+		US_LOG_PRINTF(US_COLOR_GREEN, "INFO ", "", x_msg, ##__VA_ARGS__); \
+	}
+
+#define US_LOG_INFO_NOLOCK(x_msg, ...) { \
+		US_LOG_PRINTF_NOLOCK(US_COLOR_GREEN, "INFO ", "", x_msg, ##__VA_ARGS__); \
+	}
+
+#define US_LOG_PERF(x_msg, ...) { \
+		if (us_g_log_level >= US_LOG_LEVEL_PERF) { \
+			US_LOG_PRINTF(US_COLOR_CYAN, "PERF ", US_COLOR_CYAN, x_msg, ##__VA_ARGS__); \
+		} \
+	}
+
+#define US_LOG_PERF_FPS(x_msg, ...) { \
+		if (us_g_log_level >= US_LOG_LEVEL_PERF) { \
+			US_LOG_PRINTF(US_COLOR_YELLOW, "PERF ", US_COLOR_YELLOW, x_msg, ##__VA_ARGS__); \
+		} \
+	}
+
+#define US_LOG_VERBOSE(x_msg, ...) { \
+		if (us_g_log_level >= US_LOG_LEVEL_VERBOSE) { \
+			US_LOG_PRINTF(US_COLOR_BLUE, "VERB ", US_COLOR_BLUE, x_msg, ##__VA_ARGS__); \
+		} \
+	}
+
+#define US_LOG_VERBOSE_PERROR(x_msg, ...) { \
+		if (us_g_log_level >= US_LOG_LEVEL_VERBOSE) { \
+			char *m_perror_str = us_errno_to_string(errno); \
+			US_LOG_PRINTF(US_COLOR_BLUE, "VERB ", US_COLOR_BLUE, x_msg ": %s", ##__VA_ARGS__, m_perror_str); \
+			free(m_perror_str); \
+		} \
+	}
+
+#define US_LOG_DEBUG(x_msg, ...) { \
+		if (us_g_log_level >= US_LOG_LEVEL_DEBUG) { \
+			US_LOG_PRINTF(US_COLOR_GRAY, "DEBUG", US_COLOR_GRAY, x_msg, ##__VA_ARGS__); \
+		} \
+	}

src/libs/memsink.c

@@ -0,0 +1,196 @@
+/*****************************************************************************
+#                                                                            #
+#    uStreamer - Lightweight and fast MJPEG-HTTP streamer.                   #
+#                                                                            #
+#    Copyright (C) 2018-2022  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 "memsink.h"
+
+
+us_memsink_s *us_memsink_init(
+	const char *name, const char *obj, bool server,
+	mode_t mode, bool rm, unsigned client_ttl, unsigned timeout) {
+
+	us_memsink_s *sink;
+	US_CALLOC(sink, 1);
+	sink->name = name;
+	sink->obj = obj;
+	sink->server = server;
+	sink->rm = rm;
+	sink->client_ttl = client_ttl;
+	sink->timeout = timeout;
+	sink->fd = -1;
+	atomic_init(&sink->has_clients, false);
+
+	US_LOG_INFO("Using %s-sink: %s", name, obj);
+
+	const mode_t mask = umask(0);
+	sink->fd = shm_open(sink->obj, (server ? O_RDWR | O_CREAT : O_RDWR), mode);
+	umask(mask);
+	if (sink->fd == -1) {
+		umask(mask);
+		US_LOG_PERROR("%s-sink: Can't open shared memory", name);
+		goto error;
+	}
+
+	if (sink->server && ftruncate(sink->fd, sizeof(us_memsink_shared_s)) < 0) {
+		US_LOG_PERROR("%s-sink: Can't truncate shared memory", name);
+		goto error;
+	}
+
+	if ((sink->mem = us_memsink_shared_map(sink->fd)) == NULL) {
+		US_LOG_PERROR("%s-sink: Can't mmap shared memory", name);
+		goto error;
+	}
+
+	return sink;
+
+	error:
+		us_memsink_destroy(sink);
+		return NULL;
+}
+
+void us_memsink_destroy(us_memsink_s *sink) {
+	if (sink->mem != NULL) {
+		if (us_memsink_shared_unmap(sink->mem) < 0) {
+			US_LOG_PERROR("%s-sink: Can't unmap shared memory", sink->name);
+		}
+	}
+	if (sink->fd >= 0) {
+		if (close(sink->fd) < 0) {
+			US_LOG_PERROR("%s-sink: Can't close shared memory fd", sink->name);
+		}
+		if (sink->rm && shm_unlink(sink->obj) < 0) {
+			if (errno != ENOENT) {
+				US_LOG_PERROR("%s-sink: Can't remove shared memory", sink->name);
+			}
+		}
+	}
+	free(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).
+
+	assert(sink->server);
+
+	if (flock(sink->fd, LOCK_EX | LOCK_NB) < 0) {
+		if (errno == EWOULDBLOCK) {
+			atomic_store(&sink->has_clients, true);
+			return true;
+		}
+		US_LOG_PERROR("%s-sink: Can't lock memory", sink->name);
+		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);
+
+	if (flock(sink->fd, LOCK_UN) < 0) {
+		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));;
+}
+
+int us_memsink_server_put(us_memsink_s *sink, const us_frame_s *frame) {
+	assert(sink->server);
+
+	const long double now = us_get_now_monotonic();
+
+	if (frame->used > US_MEMSINK_MAX_DATA) {
+		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
+	}
+
+	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;
+
+		memcpy(sink->mem->data, frame->data, frame->used);
+		sink->mem->used = frame->used;
+		US_FRAME_COPY_META(frame, sink->mem);
+
+		sink->mem->magic = US_MEMSINK_MAGIC;
+		sink->mem->version = US_MEMSINK_VERSION;
+		atomic_store(&sink->has_clients, (sink->mem->last_client_ts + sink->client_ttl > us_get_now_monotonic()));
+
+		if (flock(sink->fd, LOCK_UN) < 0) {
+			US_LOG_PERROR("%s-sink: Can't unlock memory", sink->name);
+			return -1;
+		}
+		US_LOG_VERBOSE("%s-sink: Exposed new frame; full exposition time = %.3Lf",
+			sink->name, us_get_now_monotonic() - now);
+
+	} else if (errno == EWOULDBLOCK) {
+		US_LOG_VERBOSE("%s-sink: ===== Shared memory is busy now; frame skipped", sink->name);
+
+	} else {
+		US_LOG_PERROR("%s-sink: Can't lock memory", sink->name);
+		return -1;
+	}
+	return 0;
+}
+
+int us_memsink_client_get(us_memsink_s *sink, us_frame_s *frame) { // cppcheck-suppress unusedFunction
+	assert(!sink->server); // Client only
+
+	if (us_flock_timedwait_monotonic(sink->fd, sink->timeout) < 0) {
+		if (errno == EWOULDBLOCK) {
+			return -2;
+		}
+		US_LOG_PERROR("%s-sink: Can't lock memory", sink->name);
+		return -1;
+	}
+
+	int retval = -2; // Not updated
+	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);
+			retval = 0;
+		}
+		sink->mem->last_client_ts = us_get_now_monotonic();
+	}
+
+	done:
+		if (flock(sink->fd, LOCK_UN) < 0) {
+			US_LOG_PERROR("%s-sink: Can't unlock memory", sink->name);
+			return -1;
+		}
+		return retval;
+}

src/libs/memsink.h

@@ -0,0 +1,68 @@
+/*****************************************************************************
+#                                                                            #
+#    uStreamer - Lightweight and fast MJPEG-HTTP streamer.                   #
+#                                                                            #
+#    Copyright (C) 2018-2022  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 <stdint.h>
+#include <stdbool.h>
+#include <stdatomic.h>
+#include <string.h>
+#include <fcntl.h>
+#include <errno.h>
+#include <assert.h>
+
+#include <sys/types.h>
+#include <sys/file.h>
+#include <sys/stat.h>
+#include <sys/mman.h>
+
+#include "tools.h"
+#include "logging.h"
+#include "frame.h"
+#include "memsinksh.h"
+
+
+typedef struct {
+	const char			*name;
+	const char			*obj;
+	bool				server;
+	bool				rm;
+	unsigned			client_ttl; // Only for server
+	unsigned			timeout;
+
+	int					fd;
+	us_memsink_shared_s	*mem;
+	uint64_t			last_id;
+	atomic_bool			has_clients; // Only for server
+} us_memsink_s;
+
+
+us_memsink_s *us_memsink_init(
+	const char *name, const char *obj, bool server,
+	mode_t mode, bool rm, unsigned client_ttl, unsigned timeout);
+
+void us_memsink_destroy(us_memsink_s *sink);
+
+bool us_memsink_server_check(us_memsink_s *sink, const us_frame_s *frame);
+int us_memsink_server_put(us_memsink_s *sink, const us_frame_s *frame);
+
+int us_memsink_client_get(us_memsink_s *sink, us_frame_s *frame);

src/libs/memsinksh.h

@@ -0,0 +1,84 @@
+/*****************************************************************************
+#                                                                            #
+#    uStreamer - Lightweight and fast MJPEG-HTTP streamer.                   #
+#                                                                            #
+#    Copyright (C) 2018-2022  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 <stdint.h>
+#include <stdbool.h>
+
+#include <sys/types.h>
+#include <sys/mman.h>
+
+
+#define US_MEMSINK_MAGIC	((uint64_t)0xCAFEBABECAFEBABE)
+#define US_MEMSINK_VERSION	((uint32_t)2)
+
+#ifndef US_CFG_MEMSINK_MAX_DATA
+#	define US_CFG_MEMSINK_MAX_DATA 33554432
+#endif
+#define US_MEMSINK_MAX_DATA ((size_t)(US_CFG_MEMSINK_MAX_DATA))
+
+
+typedef struct {
+	uint64_t	magic;
+	uint32_t	version;
+
+	uint64_t	id;
+
+	size_t		used;
+	unsigned	width;
+	unsigned	height;
+	unsigned	format;
+	unsigned	stride;
+	bool		online;
+	bool		key;
+
+	long double	grab_ts;
+	long double	encode_begin_ts;
+	long double	encode_end_ts;
+
+	long double	last_client_ts;
+
+	uint8_t		data[US_MEMSINK_MAX_DATA];
+} 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;
+}
+
+INLINE int us_memsink_shared_unmap(us_memsink_shared_s *mem) {
+	assert(mem != NULL);
+	return munmap(mem, sizeof(us_memsink_shared_s));
+}

src/libs/options.c

@@ -0,0 +1,39 @@
+/*****************************************************************************
+#                                                                            #
+#    uStreamer - Lightweight and fast MJPEG-HTTP streamer.                   #
+#                                                                            #
+#    Copyright (C) 2018-2022  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 "options.h"
+
+
+void us_build_short_options(const struct option opts[], char *short_opts, size_t size) {
+	memset(short_opts, 0, size);
+    for (unsigned 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;
+            }
+        }
+    }
+}

src/libs/options.h

@@ -1,8 +1,8 @@
 /*****************************************************************************
 #                                                                            #
-#    uStreamer - Lightweight and fast MJPG-HTTP streamer.                    #
+#    uStreamer - Lightweight and fast MJPEG-HTTP streamer.                   #
 #                                                                            #
-#    Copyright (C) 2018  Maxim Devaev <mdevaev@gmail.com>                    #
+#    Copyright (C) 2018-2022  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,12 @@
 
 #pragma once
 
-#include "../../device.h"
+#include <string.h>
+#include <ctype.h>
+#include <getopt.h>
+#include <assert.h>
+
+#include <sys/types.h>
 
 
-void cpu_encoder_compress_buffer(struct device_t *dev, unsigned index, unsigned quality);
+void us_build_short_options(const struct option opts[], char *short_opts, size_t size);

src/libs/process.h

@@ -1,8 +1,8 @@
 /*****************************************************************************
 #                                                                            #
-#    uStreamer - Lightweight and fast MJPG-HTTP streamer.                    #
+#    uStreamer - Lightweight and fast MJPEG-HTTP streamer.                   #
 #                                                                            #
-#    Copyright (C) 2018  Maxim Devaev <mdevaev@gmail.com>                    #
+#    Copyright (C) 2018-2022  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    #
@@ -72,26 +72,25 @@ extern char **environ;
 
 
 #ifdef HAS_PDEATHSIG
-INLINE int process_track_parent_death(void) {
-	pid_t parent = getppid();
+INLINE int us_process_track_parent_death(void) {
+	const pid_t parent = getppid();
 	int signum = SIGTERM;
 #	if defined(__linux__)
-	int retval = prctl(PR_SET_PDEATHSIG, signum);
+	const int retval = prctl(PR_SET_PDEATHSIG, signum);
 #	elif defined(__FreeBSD__)
-	int retval = procctl(P_PID, 0, PROC_PDEATHSIG_CTL, &signum);
+	const int retval = procctl(P_PID, 0, PROC_PDEATHSIG_CTL, &signum);
 #	else
 #		error WTF?
 #	endif
 	if (retval < 0) {
-		LOG_PERROR("Can't set to receive SIGTERM on parent process death");
+		US_LOG_PERROR("Can't set to receive SIGTERM on parent process death");
 		return -1;
 	}
 
 	if (kill(parent, 0) < 0) {
-		LOG_PERROR("The parent process %d is already dead", parent);
+		US_LOG_PERROR("The parent process %d is already dead", parent);
 		return -1;
 	}
-
 	return 0;
 }
 #endif
@@ -99,21 +98,21 @@ INLINE int process_track_parent_death(void) {
 #ifdef WITH_SETPROCTITLE
 #	pragma GCC diagnostic ignored "-Wunused-parameter"
 #	pragma GCC diagnostic push
-INLINE void process_set_name_prefix(int argc, char *argv[], const char *prefix) {
+INLINE void us_process_set_name_prefix(int argc, char *argv[], const char *prefix) {
 #	pragma GCC diagnostic pop
 
 	char *cmdline = NULL;
 	size_t allocated = 2048;
 	size_t used = 0;
 
-	A_REALLOC(cmdline, allocated);
+	US_REALLOC(cmdline, allocated);
 	cmdline[0] = '\0';
 
 	for (int index = 0; index < argc; ++index) {
 		size_t arg_len = strlen(argv[index]);
 		if (used + arg_len + 16 >= allocated) {
 			allocated += arg_len + 2048;
-			A_REALLOC(cmdline, allocated);
+			US_REALLOC(cmdline, allocated); // cppcheck-suppress memleakOnRealloc // False-positive (ok with assert)
 		}
 
 		strcat(cmdline, " ");
@@ -130,10 +129,16 @@ INLINE void process_set_name_prefix(int argc, char *argv[], const char *prefix)
 }
 #endif
 
-INLINE void process_notify_parent(void) {
-	pid_t parent = getppid();
-
+INLINE void us_process_notify_parent(void) {
+	const pid_t parent = getppid();
 	if (kill(parent, SIGUSR2) < 0) {
-		LOG_PERROR("Can't send SIGUSR2 to the parent process %d", parent);
+		US_LOG_PERROR("Can't send SIGUSR2 to the parent process %d", parent);
+	}
+}
+
+INLINE void us_process_suicide(void) {
+	const pid_t pid = getpid();
+	if (kill(pid, SIGTERM) < 0) {
+		US_LOG_PERROR("Can't send SIGTERM to own pid %d", pid);
 	}
 }

src/libs/threading.h

@@ -1,8 +1,8 @@
 /*****************************************************************************
 #                                                                            #
-#    uStreamer - Lightweight and fast MJPG-HTTP streamer.                    #
+#    uStreamer - Lightweight and fast MJPEG-HTTP streamer.                   #
 #                                                                            #
-#    Copyright (C) 2018  Maxim Devaev <mdevaev@gmail.com>                    #
+#    Copyright (C) 2018-2022  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    #
@@ -41,37 +41,38 @@
 
 
 #ifdef PTHREAD_MAX_NAMELEN_NP
-#	define MAX_THREAD_NAME ((size_t)(PTHREAD_MAX_NAMELEN_NP))
+#	define US_MAX_THREAD_NAME ((size_t)(PTHREAD_MAX_NAMELEN_NP))
 #else
-#	define MAX_THREAD_NAME ((size_t)16)
+#	define US_MAX_THREAD_NAME ((size_t)16)
 #endif
 
-#define A_THREAD_CREATE(_tid, _func, _arg)	assert(!pthread_create(_tid, NULL, _func, _arg))
-#define A_THREAD_JOIN(_tid)					assert(!pthread_join(_tid, NULL))
+#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))
 
 #ifdef WITH_PTHREAD_NP
-#	define A_THREAD_RENAME(_fmt, ...) { \
-			char _new_tname_buf[MAX_THREAD_NAME] = {0}; \
-			assert(snprintf(_new_tname_buf, MAX_THREAD_NAME, _fmt, ##__VA_ARGS__) > 0); \
-			thread_set_name(_new_tname_buf); \
+#	define US_THREAD_RENAME(x_fmt, ...) { \
+			char m_new_tname_buf[US_MAX_THREAD_NAME] = {0}; \
+			assert(snprintf(m_new_tname_buf, US_MAX_THREAD_NAME, (x_fmt), ##__VA_ARGS__) > 0); \
+			us_thread_set_name(m_new_tname_buf); \
 		}
 #else
-#	define A_THREAD_RENAME(_fmt, ...)
+#	define US_THREAD_RENAME(_fmt, ...)
 #endif
 
-#define A_MUTEX_INIT(_mutex)	assert(!pthread_mutex_init(_mutex, NULL))
-#define A_MUTEX_DESTROY(_mutex)	assert(!pthread_mutex_destroy(_mutex))
-#define A_MUTEX_LOCK(_mutex)	assert(!pthread_mutex_lock(_mutex))
-#define A_MUTEX_UNLOCK(_mutex)	assert(!pthread_mutex_unlock(_mutex))
+#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 A_COND_INIT(_cond)		assert(!pthread_cond_init(_cond, NULL))
-#define A_COND_DESTROY(_cond)	assert(!pthread_cond_destroy(_cond))
-#define A_COND_SIGNAL(...)		assert(!pthread_cond_signal(__VA_ARGS__))
-#define A_COND_WAIT_TRUE(_var, _cond, _mutex) { while(!_var) assert(!pthread_cond_wait(_cond, _mutex)); }
+#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))); }
 
 
 #ifdef WITH_PTHREAD_NP
-INLINE void thread_set_name(const char *name) {
+INLINE void us_thread_set_name(const char *name) {
 #	if defined(__linux__)
 	pthread_setname_np(pthread_self(), name);
 #	elif defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
@@ -79,45 +80,45 @@ INLINE void thread_set_name(const char *name) {
 #	elif defined(__NetBSD__)
 	pthread_setname_np(pthread_self(), "%s", (void *)name);
 #	else
-#		error thread_set_name() not implemented, you can disable it using WITH_PTHREAD_NP=0
+#		error us_thread_set_name() not implemented, you can disable it using WITH_PTHREAD_NP=0
 #	endif
 }
 #endif
 
-INLINE void thread_get_name(char *name) { // Always required for logging
+INLINE void us_thread_get_name(char *name) { // Always required for logging
 #ifdef WITH_PTHREAD_NP
 	int retval = -1;
 #	if defined(__linux__) || defined (__NetBSD__)
-	retval = pthread_getname_np(pthread_self(), name, MAX_THREAD_NAME);
+	retval = pthread_getname_np(pthread_self(), name, US_MAX_THREAD_NAME);
 #	elif \
 		(defined(__FreeBSD__) && defined(__FreeBSD_version) && __FreeBSD_version >= 1103500) \
 		|| (defined(__OpenBSD__) && defined(OpenBSD) && OpenBSD >= 201905) \
 		|| defined(__DragonFly__)
-	pthread_get_name_np(pthread_self(), name, MAX_THREAD_NAME);
+	pthread_get_name_np(pthread_self(), name, US_MAX_THREAD_NAME);
 	if (name[0] != '\0') {
 		retval = 0;
 	}
 #	else
-#		error thread_get_name() not implemented, you can disable it using WITH_PTHREAD_NP=0
+#		error us_thread_get_name() not implemented, you can disable it using WITH_PTHREAD_NP=0
 #	endif
 	if (retval < 0) {
 #endif
 
 #if defined(__linux__)
-		pid_t tid = syscall(SYS_gettid);
+		const pid_t tid = syscall(SYS_gettid);
 #elif defined(__FreeBSD__)
-		pid_t tid = syscall(SYS_thr_self);
+		const pid_t tid = syscall(SYS_thr_self);
 #elif defined(__OpenBSD__)
-		pid_t tid = syscall(SYS_getthrid);
+		const pid_t tid = syscall(SYS_getthrid);
 #elif defined(__NetBSD__)
-		pid_t tid = syscall(SYS__lwp_self);
+		const pid_t tid = syscall(SYS__lwp_self);
 #elif defined(__DragonFly__)
-		pid_t tid = syscall(SYS_lwp_gettid);
+		const pid_t tid = syscall(SYS_lwp_gettid);
 #else
-		pid_t tid = 0; // Makes cppcheck happy
+		const pid_t tid = 0; // Makes cppcheck happy
 #	warning gettid() not implemented
 #endif
-		assert(snprintf(name, MAX_THREAD_NAME, "tid=%d", tid) > 0);
+		assert(snprintf(name, US_MAX_THREAD_NAME, "tid=%d", tid) > 0);
 
 #ifdef WITH_PTHREAD_NP
 	}

src/libs/tools.h

@@ -0,0 +1,220 @@
+/*****************************************************************************
+#                                                                            #
+#    uStreamer - Lightweight and fast MJPEG-HTTP streamer.                   #
+#                                                                            #
+#    Copyright (C) 2018-2022  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 <stdint.h>
+#include <stdlib.h>
+#include <stdbool.h>
+#include <string.h>
+#include <unistd.h>
+#include <limits.h>
+#include <locale.h>
+#include <errno.h>
+#include <math.h>
+#include <time.h>
+#include <assert.h>
+
+#include <sys/types.h>
+#include <sys/file.h>
+
+#if defined(__GLIBC__) && __GLIBC__ >= 2 && __GLIBC_MINOR__ >= 32
+#	define HAS_SIGABBREV_NP
+#else
+#	include <signal.h>
+#endif
+
+
+#ifdef NDEBUG
+#	error WTF dude? Asserts are good things!
+#endif
+
+#if CHAR_BIT != 8
+#	error There are not 8 bits in a char!
+#endif
+
+
+#define RN "\r\n"
+
+#define INLINE inline __attribute__((always_inline))
+#define UNUSED __attribute__((unused))
+
+#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_DELETE(x_dest, x_free)		{ if (x_dest) { x_free(x_dest); } }
+#define US_MEMSET_ZERO(x_obj)			memset(&(x_obj), 0, sizeof(x_obj))
+
+#define US_ASPRINTF(x_dest, x_fmt, ...) assert(asprintf(&(x_dest), (x_fmt), ##__VA_ARGS__) >= 0)
+
+
+INLINE char *us_strdup(const char *str) {
+	char *const new = strdup(str);
+	assert(new != NULL);
+	return new;
+}
+
+INLINE const char *us_bool_to_string(bool flag) {
+	return (flag ? "true" : "false");
+}
+
+INLINE size_t us_align_size(size_t size, size_t to) {
+	return ((size + (to - 1)) & ~(to - 1));
+}
+
+INLINE unsigned us_min_u(unsigned a, unsigned b) {
+	return (a < b ? a : b);
+}
+
+INLINE unsigned us_max_u(unsigned a, unsigned b) {
+	return (a > b ? a : b);
+}
+
+INLINE long long us_floor_ms(long double now) {
+	return (long long)now - (now < (long long)now); // floor()
+}
+
+INLINE uint32_t us_triple_u32(uint32_t x) {
+	// https://nullprogram.com/blog/2018/07/31/
+	x ^= x >> 17;
+	x *= UINT32_C(0xED5AD4BB);
+	x ^= x >> 11;
+	x *= UINT32_C(0xAC4C1B51);
+	x ^= x >> 15;
+	x *= UINT32_C(0x31848BAB);
+	x ^= x >> 14;
+	return x;
+}
+
+INLINE void us_get_now(clockid_t clk_id, time_t *sec, long *msec) {
+	struct timespec ts;
+	assert(!clock_gettime(clk_id, &ts));
+	*sec = ts.tv_sec;
+	*msec = round(ts.tv_nsec / 1.0e6);
+
+	if (*msec > 999) {
+		*sec += 1;
+		*msec = 0;
+	}
+}
+
+#if defined(CLOCK_MONOTONIC_RAW)
+#	define _X_CLOCK_MONOTONIC CLOCK_MONOTONIC_RAW
+#elif defined(CLOCK_MONOTONIC_FAST)
+#	define _X_CLOCK_MONOTONIC CLOCK_MONOTONIC_FAST
+#else
+#	define _X_CLOCK_MONOTONIC CLOCK_MONOTONIC
+#endif
+
+INLINE long double us_get_now_monotonic(void) {
+	time_t sec;
+	long msec;
+	us_get_now(_X_CLOCK_MONOTONIC, &sec, &msec);
+	return (long double)sec + ((long double)msec) / 1000;
+}
+
+INLINE uint64_t us_get_now_monotonic_u64(void) {
+	struct timespec ts;
+	assert(!clock_gettime(_X_CLOCK_MONOTONIC, &ts));
+	return (uint64_t)(ts.tv_nsec / 1000) + (uint64_t)ts.tv_sec * 1000000;
+}
+
+#undef _X_CLOCK_MONOTONIC
+
+INLINE uint64_t us_get_now_id(void) {
+	const uint64_t now = us_get_now_monotonic_u64();
+	return (uint64_t)us_triple_u32(now) | ((uint64_t)us_triple_u32(now + 12345) << 32);
+}
+
+INLINE long double us_get_now_real(void) {
+	time_t sec;
+	long msec;
+	us_get_now(CLOCK_REALTIME, &sec, &msec);
+	return (long double)sec + ((long double)msec) / 1000;
+}
+
+INLINE unsigned us_get_cores_available(void) {
+	long cores_sysconf = sysconf(_SC_NPROCESSORS_ONLN);
+	cores_sysconf = (cores_sysconf < 0 ? 0 : cores_sysconf);
+	return us_max_u(us_min_u(cores_sysconf, 4), 1);
+}
+
+INLINE void us_ld_to_timespec(long double ld, struct timespec *ts) {
+	ts->tv_sec = (long)ld;
+	ts->tv_nsec = (ld - ts->tv_sec) * 1000000000L;
+	if (ts->tv_nsec > 999999999L) {
+		ts->tv_sec += 1;
+		ts->tv_nsec = 0;
+	}
+}
+
+INLINE long double us_timespec_to_ld(const struct timespec *ts) {
+	return ts->tv_sec + ((long double)ts->tv_nsec) / 1000000000;
+}
+
+INLINE int us_flock_timedwait_monotonic(int fd, long double timeout) {
+	const long double deadline_ts = us_get_now_monotonic() + timeout;
+	int retval = -1;
+
+	while (true) {
+		retval = flock(fd, LOCK_EX | LOCK_NB);
+		if (retval == 0 || errno != EWOULDBLOCK || us_get_now_monotonic() > deadline_ts) {
+			break;
+		}
+		if (usleep(1000) < 0) {
+			break;
+		}
+	}
+	return retval;
+}
+
+INLINE char *us_errno_to_string(int error) {
+	locale_t locale = newlocale(LC_MESSAGES_MASK, "C", NULL);
+	char *buf;
+	if (locale) {
+		buf = us_strdup(strerror_l(error, locale));
+		freelocale(locale);
+	} else {
+		buf = us_strdup("!!! newlocale() error !!!");
+	}
+	return buf;
+}
+
+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);
+	}
+	return buf;
+}

src/libs/unjpeg.c

@@ -0,0 +1,92 @@
+/*****************************************************************************
+#                                                                            #
+#    uStreamer - Lightweight and fast MJPEG-HTTP streamer.                   #
+#                                                                            #
+#    Copyright (C) 2018-2022  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 "unjpeg.h"
+
+
+typedef struct {
+	struct jpeg_error_mgr	mgr; // Default manager
+	jmp_buf					jmp;
+	const us_frame_s		*frame;
+} _jpeg_error_manager_s;
+
+
+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));
+
+	volatile int retval = 0;
+
+	struct jpeg_decompress_struct jpeg;
+	jpeg_create_decompress(&jpeg);
+
+	// 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_error.mgr.error_exit = _jpeg_error_handler;
+	jpeg_error.frame = src;
+	if (setjmp(jpeg_error.jmp) < 0) {
+		retval = -1;
+		goto done;
+	}
+
+	jpeg_mem_src(&jpeg, src->data, src->used);
+	jpeg_read_header(&jpeg, TRUE);
+	jpeg.out_color_space = JCS_RGB;
+
+	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;
+
+	if (decode) {
+		JSAMPARRAY scanlines;
+		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) {
+			jpeg_read_scanlines(&jpeg, scanlines, 1);
+			us_frame_append_data(dest, scanlines[0], dest->stride);
+		}
+
+		jpeg_finish_decompress(&jpeg);
+	}
+
+	done:
+		jpeg_destroy_decompress(&jpeg);
+		return retval;
+}
+
+static void _jpeg_error_handler(j_common_ptr jpeg) {
+	_jpeg_error_manager_s *jpeg_error = (_jpeg_error_manager_s *)jpeg->err;
+	char msg[JMSG_LENGTH_MAX];
+
+	(*jpeg_error->mgr.format_message)(jpeg, msg);
+	US_LOG_ERROR("Can't decompress JPEG: %s", msg);
+	longjmp(jpeg_error->jmp, -1);
+}

src/libs/unjpeg.h

@@ -0,0 +1,40 @@
+/*****************************************************************************
+#                                                                            #
+#    uStreamer - Lightweight and fast MJPEG-HTTP streamer.                   #
+#                                                                            #
+#    Copyright (C) 2018-2022  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>
+#include <setjmp.h>
+#include <assert.h>
+
+#include <sys/types.h>
+
+#include <jpeglib.h>
+#include <linux/videodev2.h>
+
+#include "logging.h"
+#include "frame.h"
+
+
+int us_unjpeg(const us_frame_s *src, us_frame_s *dest, bool decode);

src/libs/xioctl.h

@@ -1,8 +1,8 @@
 /*****************************************************************************
 #                                                                            #
-#    uStreamer - Lightweight and fast MJPG-HTTP streamer.                    #
+#    uStreamer - Lightweight and fast MJPEG-HTTP streamer.                   #
 #                                                                            #
-#    Copyright (C) 2018  Maxim Devaev <mdevaev@gmail.com>                    #
+#    Copyright (C) 2018-2022  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,18 +26,15 @@
 
 #include <sys/ioctl.h>
 
-#include "tools.h"
-#include "logging.h"
 
-
-#ifndef CFG_XIOCTL_RETRIES
-#	define CFG_XIOCTL_RETRIES 4
+#ifndef US_CFG_XIOCTL_RETRIES
+#	define US_CFG_XIOCTL_RETRIES 4
 #endif
-#define XIOCTL_RETRIES ((unsigned)(CFG_XIOCTL_RETRIES))
+#define _XIOCTL_RETRIES ((unsigned)(US_CFG_XIOCTL_RETRIES))
 
 
-INLINE int xioctl(int fd, int request, void *arg) {
-	int retries = XIOCTL_RETRIES;
+INLINE int us_xioctl(int fd, int request, void *arg) {
+	int retries = _XIOCTL_RETRIES;
 	int retval = -1;
 
 	do {
@@ -51,10 +48,5 @@ INLINE int xioctl(int fd, int request, void *arg) {
 			|| errno == ETIMEDOUT
 		)
 	);
-
-	// cppcheck-suppress knownConditionTrueFalse
-	if (retval && retries <= 0) {
-		LOG_PERROR("ioctl(%d) retried %u times; giving up", request, XIOCTL_RETRIES);
-	}
 	return retval;
 }