Bump version: 0.50 → 0.51

refactoring
ARRAY_LEN()
2026-02-20 08:46:31 +00:00 · 2019-03-03 05:23:51 +03:00 · 2019-03-03 04:25:32 +03:00 · 2019-03-02 11:30:10 +03:00 · 2019-03-02 11:29:57 +03:00 · 2019-03-01 11:36:15 +03:00
31 changed files with 916 additions and 750 deletions
--- a/.bumpversion.cfg
+++ b/.bumpversion.cfg
@@ -1,7 +1,7 @@
 [bumpversion]
 commit = True
 tag = True
-current_version = 0.41
+current_version = 0.51
 parse = (?P<major>\d+)\.(?P<minor>\d+)(\.(?P<patch>\d+)(\-(?P<release>[a-z]+))?)?
 serialize = 
 	{major}.{minor}
--- a/.gitignore
+++ b/.gitignore
@@ -5,4 +5,5 @@
 /ustreamer-*.pkg.tar.xz
 /vgcore.*
 /ustreamer
+/*.sock
 *.o
--- a/2
+++ b/2
@@ -59,5 +59,5 @@ push:

 clean-all: clean
 clean:
-	rm -f src/*.o src/{jpeg,omx}/*.o vgcore.* $(PROG)
+	rm -f src/*.o src/{jpeg,omx}/*.o vgcore.* *.sock $(PROG)
 	rm -rf pkg src/$(PROG)-* src/v*.tar.gz v*.tar.gz $(PROG)-*.pkg.tar.xz
--- a/2
+++ b/2
@@ -3,7 +3,7 @@


 pkgname=ustreamer
-pkgver=0.41
+pkgver=0.51
 pkgrel=1
 pkgdesc="Lightweight and fast MJPG-HTTP streamer"
 url="https://github.com/pi-kvm/ustreamer"
--- a/README.md
+++ b/README.md
@@ -10,11 +10,12 @@
 |----------|---------------|-------------------|
 | 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 broadcast<sup>1</sup> |
+| 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 broadcast <sup>1</sup> |
 | [DV-timings](https://linuxtv.org/downloads/v4l-dvb-apis/uapi/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 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 broadcast parameters | ![#00aa00](https://placehold.it/15/00aa00/000000?text=+) Yes | ![#f03c15](https://placehold.it/15/f03c15/000000?text=+) No |
-| Supported input devices | ![#ffaa00](https://placehold.it/15/ffaa00/000000?text=+) YUYV, UYVY,<br>RGB565, ~~MJPG~~ <sup>3</sup> | ![#00aa00](https://placehold.it/15/00aa00/000000?text=+) YUYV, UYVY,<br>RGB565, MJPG |
+| Supported input formats | ![#ffaa00](https://placehold.it/15/ffaa00/000000?text=+) YUYV, UYVY,<br>RGB565, ~~MJPG~~ <sup>3</sup> | ![#00aa00](https://placehold.it/15/00aa00/000000?text=+) YUYV, UYVY,<br>RGB565, MJPG |
 | 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 |
 | Option to serve files<br>with a built-in HTTP server, auth settings | ![#f03c15](https://placehold.it/15/f03c15/000000?text=+) No <sup>4</sup> | ![#00aa00](https://placehold.it/15/00aa00/000000?text=+) Yes |

@@ -59,7 +60,6 @@ $ ./ustreamer \
    --format=uyvy \ # Device input format
    --encoder=omx \ # Hardware encoding with OpenMAX
    --dv-timings \ # Use DV-timings
-    --quality=20 \ # OpenMAX has a non-linear quality scale
    --drop-same-frames=30 # Save that traffic
 ```

--- a/README.ru.md
+++ b/README.ru.md
@@ -13,6 +13,7 @@
 | Поведение при физическом отключении устройства<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/uapi/v4l/dv-timings.html) - возможности изменения <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=+) Нет |
 | Поддерживаемые входные форматы устройств | ![#ffaa00](https://placehold.it/15/ffaa00/000000?text=+) YUYV, UYVY,<br>RGB565, ~~MJPG~~ <sup>3</sup> | ![#00aa00](https://placehold.it/15/00aa00/000000?text=+) YUYV, UYVY,<br>RGB565, MJPG |
 | Поддержка контролов веб-камер (фокус,<br> движение сервами) и всяких настроек,<br> типа яркости, через HTTP | ![#f03c15](https://placehold.it/15/f03c15/000000?text=+) Нет | ![#00aa00](https://placehold.it/15/00aa00/000000?text=+) Есть |
@@ -59,7 +60,6 @@ $ ./ustreamer \
    --format=uyvy \ # Настройка входного формата устройства
    --encoder=omx \ # Использование аппаратного кодирования с помощью OpenMAX
    --dv-timings \ # Включение DV-таймингов
-    --quality=20 \ # У OpenMAX нелинейная шкала качества
    --drop-same-frames=30 # Экономим трафик
 ```

--- a/src/config.h
+++ b/src/config.h
@@ -1,4 +1,5 @@
 /*****************************************************************************
+#                                                                            #
 #    uStreamer - Lightweight and fast MJPG-HTTP streamer.                    #
 #                                                                            #
 #    Copyright (C) 2018  Maxim Devaev <mdevaev@gmail.com>                    #
@@ -21,4 +22,4 @@

 #pragma once

-#define VERSION "0.41"
+#define VERSION "0.51"
--- a/src/data/blank_jpeg.h
+++ b/src/data/blank_jpeg.h
--- a/src/data/index_html.h
+++ b/src/data/index_html.h
@@ -1,4 +1,5 @@
 /*****************************************************************************
+#                                                                            #
 #    uStreamer - Lightweight and fast MJPG-HTTP streamer.                    #
 #                                                                            #
 #    Copyright (C) 2018  Maxim Devaev <mdevaev@gmail.com>                    #
--- a/src/device.c
+++ b/src/device.c
@@ -1,4 +1,5 @@
 /*****************************************************************************
+#                                                                            #
 #    uStreamer - Lightweight and fast MJPG-HTTP streamer.                    #
 #                                                                            #
 #    Copyright (C) 2018  Maxim Devaev <mdevaev@gmail.com>                    #
@@ -26,6 +27,7 @@
 #include <strings.h>
 #include <unistd.h>
 #include <fcntl.h>
+#include <assert.h>

 #include <sys/mman.h>
 #include <linux/videodev2.h>
@@ -63,10 +65,11 @@ static int _device_open_format(struct device_t *dev);
 static void _device_open_alloc_picbufs(struct device_t *dev);
 static int _device_open_mmap(struct device_t *dev);
 static int _device_open_queue_buffers(struct device_t *dev);
+static int _device_apply_resolution(struct device_t *dev, unsigned width, unsigned height);

-static const char *_format_to_string_auto(char *buf, const size_t size, const unsigned format);
-static const char *_format_to_string_null(const unsigned format);
-static const char *_standard_to_string(const v4l2_std_id standard);
+static const char *_format_to_string_auto(char *buf, size_t size, unsigned format);
+static const char *_format_to_string_null(unsigned format);
+static const char *_standard_to_string(v4l2_std_id standard);


 struct device_t *device_init() {
@@ -95,8 +98,8 @@ void device_destroy(struct device_t *dev) {
 	free(dev);
 }

-int device_parse_format(const char *const str) {
-	for (unsigned index = 0; index < sizeof(_FORMATS) / sizeof(_FORMATS[0]); ++index) {
+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;
 		}
@@ -104,8 +107,8 @@ int device_parse_format(const char *const str) {
 	return FORMAT_UNKNOWN;
 }

-v4l2_std_id device_parse_standard(const char *const str) {
-	for (unsigned index = 1; index < sizeof(_STANDARDS) / sizeof(_STANDARDS[0]); ++index) {
+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;
 		}
@@ -161,7 +164,7 @@ void device_close(struct device_t *dev) {
 		for (unsigned index = 0; index < dev->run->n_buffers; ++index) {
 			if (dev->run->hw_buffers[index].start != MAP_FAILED) {
 				if (munmap(dev->run->hw_buffers[index].start, dev->run->hw_buffers[index].length) < 0) {
-					LOG_PERROR("Can't unmap device buffer %d", index);
+					LOG_PERROR("Can't unmap device buffer %u", index);
 				}
 			}
 		}
@@ -222,6 +225,7 @@ static int _device_open_check_cap(struct device_t *dev) {
 }

 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");

@@ -239,10 +243,6 @@ static int _device_open_dv_timings(struct device_t *dev) {
 			LOG_PERROR("Can't subscribe to V4L2_EVENT_SOURCE_CHANGE");
 			return -1;
 		}
-
-	} else {
-		dev->run->width = dev->width;
-		dev->run->height = dev->height;
 	}
 	return 0;
 }
@@ -255,7 +255,7 @@ static int _device_apply_dv_timings(struct device_t *dev) {
 	LOG_DEBUG("Calling ioctl(VIDIOC_QUERY_DV_TIMINGS) ...");
 	if (xioctl(dev->run->fd, VIDIOC_QUERY_DV_TIMINGS, &dv_timings) == 0) {
 		LOG_INFO(
-			"Got new DV timings: resolution=%dx%d; pixclk=%llu",
+			"Got new DV timings: resolution=%ux%u; pixclk=%llu",
 			dv_timings.bt.width,
 			dv_timings.bt.height,
 			dv_timings.bt.pixelclock
@@ -267,8 +267,9 @@ static int _device_apply_dv_timings(struct device_t *dev) {
 			return -1;
 		}

-		dev->run->width = dv_timings.bt.width;
-		dev->run->height = dv_timings.bt.height;
+		if (_device_apply_resolution(dev, dv_timings.bt.width, dv_timings.bt.height) < 0) {
+			return -1;
+		}

 	} else {
 		LOG_DEBUG("Calling ioctl(VIDIOC_QUERYSTD) ...");
@@ -285,6 +286,7 @@ static int _device_apply_dv_timings(struct device_t *dev) {

 static int _device_open_format(struct device_t *dev) {
 	struct v4l2_format fmt;
+	char format_str[8];

 	MEMSET_ZERO(fmt);
 	fmt.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
@@ -296,10 +298,8 @@ static int _device_open_format(struct device_t *dev) {
 	// Set format
 	LOG_DEBUG("Calling ioctl(VIDIOC_S_FMT) ...");
 	if (xioctl(dev->run->fd, VIDIOC_S_FMT, &fmt) < 0) {
-		char format_str[8];
-
 		LOG_PERROR(
-			"Unable to set format=%s; resolution=%dx%d",
+			"Unable to set format=%s; resolution=%ux%u",
 			_format_to_string_auto(format_str, 8, dev->format),
 			dev->run->width,
 			dev->run->height
@@ -309,21 +309,21 @@ static int _device_open_format(struct device_t *dev) {

 	// Check resolution
 	if (fmt.fmt.pix.width != dev->run->width || fmt.fmt.pix.height != dev->run->height) {
-		LOG_ERROR("Requested resolution=%dx%d is unavailable", dev->run->width, dev->run->height);
+		LOG_ERROR("Requested resolution=%ux%u is unavailable", dev->run->width, dev->run->height);
 	}
-	dev->run->width = fmt.fmt.pix.width;
-	dev->run->height = fmt.fmt.pix.height;
-	LOG_INFO("Using resolution: %dx%d", 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_requested_str[8];
 		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_auto(format_requested_str, 8, dev->format),
+			_format_to_string_auto(format_str, 8, dev->format),
 			_format_to_string_auto(format_obtained_str, 8, fmt.fmt.pix.pixelformat)
 		);

@@ -338,7 +338,9 @@ static int _device_open_format(struct device_t *dev) {
 			return -1;
 		}
 	}
+
 	dev->run->format = fmt.fmt.pix.pixelformat;
+	LOG_INFO("Using pixelformat: %s", _format_to_string_auto(format_str, 8, dev->run->format));
 	return 0;
 }

@@ -357,10 +359,10 @@ static int _device_open_mmap(struct device_t *dev) {
 	}

 	if (req.count < 1) {
-		LOG_ERROR("Insufficient buffer memory: %d", req.count);
+		LOG_ERROR("Insufficient buffer memory: %u", req.count);
 		return -1;
 	} else {
-		LOG_INFO("Requested %d HW buffers, got %d", dev->n_buffers, req.count);
+		LOG_INFO("Requested %u HW buffers, got %u", dev->n_buffers, req.count);
 	}

 	LOG_DEBUG("Allocating HW buffers ...");
@@ -374,17 +376,17 @@ static int _device_open_mmap(struct device_t *dev) {
 		buf_info.memory = V4L2_MEMORY_MMAP;
 		buf_info.index = dev->run->n_buffers;

-		LOG_DEBUG("Calling ioctl(VIDIOC_QUERYBUF) for device buffer %d ...", 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;
 		}

-		LOG_DEBUG("Mapping device buffer %d ...", dev->run->n_buffers);
+		LOG_DEBUG("Mapping device buffer %u ...", dev->run->n_buffers);
 		dev->run->hw_buffers[dev->run->n_buffers].length = buf_info.length;
 		dev->run->hw_buffers[dev->run->n_buffers].start = mmap(NULL, buf_info.length, PROT_READ|PROT_WRITE, MAP_SHARED, dev->run->fd, buf_info.m.offset);
 		if (dev->run->hw_buffers[dev->run->n_buffers].start == MAP_FAILED) {
-			LOG_PERROR("Can't map device buffer %d", dev->run->n_buffers);
+			LOG_PERROR("Can't map device buffer %u", dev->run->n_buffers);
 			return -1;
 		}
 	}
@@ -400,7 +402,7 @@ static int _device_open_queue_buffers(struct device_t *dev) {
 		buf_info.memory = V4L2_MEMORY_MMAP;
 		buf_info.index = index;

-		LOG_DEBUG("Calling ioctl(VIDIOC_QBUF) for buffer %d ...", index);
+		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;
@@ -415,18 +417,34 @@ static void _device_open_alloc_picbufs(struct device_t *dev) {

 	dev->run->max_picture_size = ((dev->run->width * dev->run->height) << 1) * 2;
 	for (unsigned index = 0; index < dev->run->n_buffers; ++index) {
-		LOG_DEBUG("Allocating picture buffer %d sized %lu bytes... ", index, dev->run->max_picture_size);
+		LOG_DEBUG("Allocating picture buffer %u sized %lu bytes... ", index, dev->run->max_picture_size);
 		A_CALLOC(dev->run->pictures[index].data, dev->run->max_picture_size);
 		dev->run->pictures[index].allocated = dev->run->max_picture_size;
 	}
 }

-static const char *_format_to_string_auto(char *buf, const size_t size, const unsigned format) {
+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 const char *_format_to_string_auto(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;
+	buf[0] = format & 0x7F;
+	buf[1] = (format >> 8) & 0x7F;
+	buf[2] = (format >> 16) & 0x7F;
+	buf[3] = (format >> 24) & 0x7F;
 	if (format & (1 << 31)) {
 		buf[4] = '-';
 		buf[5] = 'B';
@@ -438,8 +456,8 @@ static const char *_format_to_string_auto(char *buf, const size_t size, const un
 	return buf;
 }

-static const char *_format_to_string_null(const unsigned format) {
-    for (unsigned index = 0; index < sizeof(_FORMATS) / sizeof(_FORMATS[0]); ++index) {
+static const char *_format_to_string_null(unsigned format) {
+    for (unsigned index = 0; index < ARRAY_LEN(_FORMATS); ++index) {
 		if (format == _FORMATS[index].format) {
 			return _FORMATS[index].name;
 		}
@@ -448,7 +466,7 @@ static const char *_format_to_string_null(const unsigned format) {
 }

 static const char *_standard_to_string(v4l2_std_id standard) {
-	for (unsigned index = 0; index < sizeof(_STANDARDS) / sizeof(_STANDARDS[0]); ++index) {
+	for (unsigned index = 0; index < ARRAY_LEN(_STANDARDS); ++index) {
 		if (standard == _STANDARDS[index].standard) {
 			return _STANDARDS[index].name;
 		}
--- a/src/device.h
+++ b/src/device.h
@@ -1,4 +1,5 @@
 /*****************************************************************************
+#                                                                            #
 #    uStreamer - Lightweight and fast MJPG-HTTP streamer.                    #
 #                                                                            #
 #    Copyright (C) 2018  Maxim Devaev <mdevaev@gmail.com>                    #
@@ -28,6 +29,12 @@
 #include <linux/videodev2.h>


+#define VIDEO_MIN_WIDTH		320
+#define VIDEO_MAX_WIDTH		1920
+
+#define VIDEO_MIN_HEIGHT	180
+#define VIDEO_MAX_HEIGHT	1200
+
 #define STANDARD_UNKNOWN	V4L2_STD_UNKNOWN
 #define STANDARDS_STR		"UNKNOWN, PAL, NTSC, SECAM"

@@ -86,8 +93,8 @@ struct device_t {
 struct device_t *device_init();
 void device_destroy(struct device_t *dev);

-int device_parse_format(const char *const str);
-v4l2_std_id device_parse_standard(const char *const str);
+int device_parse_format(const char *str);
+v4l2_std_id device_parse_standard(const char *str);

 int device_open(struct device_t *dev);
 void device_close(struct device_t *dev);
--- a/src/encoder.c
+++ b/src/encoder.c
@@ -1,4 +1,5 @@
 /*****************************************************************************
+#                                                                            #
 #    uStreamer - Lightweight and fast MJPG-HTTP streamer.                    #
 #                                                                            #
 #    Copyright (C) 2018  Maxim Devaev <mdevaev@gmail.com>                    #
@@ -46,11 +47,16 @@ static const struct {


 struct encoder_t *encoder_init() {
+	struct encoder_runtime_t *run;
 	struct encoder_t *encoder;

+	A_CALLOC(run, 1);
+	run->type = ENCODER_TYPE_CPU;
+
 	A_CALLOC(encoder, 1);
-	encoder->type = ENCODER_TYPE_CPU;
+	encoder->type = run->type;
 	encoder->quality = 80;
+	encoder->run = run;
 	return encoder;
 }

@@ -60,15 +66,16 @@ void encoder_prepare(struct encoder_t *encoder, struct device_t *dev) {
 #pragma GCC diagnostic pop

 	assert(encoder->type != ENCODER_TYPE_UNKNOWN);
+	encoder->run->type = encoder->type;

-	if (encoder->type != ENCODER_TYPE_CPU) {
+	if (encoder->run->type != ENCODER_TYPE_CPU) {
 		LOG_DEBUG("Initializing encoder ...");
 	}

-	LOG_INFO("Using JPEG quality: %d%%", encoder->quality);
+	LOG_INFO("Using JPEG quality: %u%%", encoder->quality);

 #	ifdef OMX_ENCODER
-	if (encoder->type == ENCODER_TYPE_OMX) {
+	if (encoder->run->type == ENCODER_TYPE_OMX) {
 		if (dev->n_workers > OMX_MAX_ENCODERS) {
 			LOG_INFO(
 				"OMX-based encoder can only work with %u worker threads; forced --workers=%u",
@@ -76,11 +83,11 @@ void encoder_prepare(struct encoder_t *encoder, struct device_t *dev) {
 			);
 			dev->n_workers = OMX_MAX_ENCODERS;
 		}
-		encoder->n_omxs = dev->n_workers;
+		encoder->run->n_omxs = dev->n_workers;

-		A_CALLOC(encoder->omxs, encoder->n_omxs);
-		for (unsigned index = 0; index < encoder->n_omxs; ++index) {
-			if ((encoder->omxs[index] = omx_encoder_init()) == NULL) {
+		A_CALLOC(encoder->run->omxs, encoder->run->n_omxs);
+		for (unsigned index = 0; index < encoder->run->n_omxs; ++index) {
+			if ((encoder->run->omxs[index] = omx_encoder_init()) == NULL) {
 				goto use_fallback;
 			}
 		}
@@ -93,26 +100,27 @@ void encoder_prepare(struct encoder_t *encoder, struct device_t *dev) {
 #	pragma GCC diagnostic push
 	use_fallback:
 		LOG_ERROR("Can't initialize selected encoder, using CPU instead it");
-		encoder->type = ENCODER_TYPE_CPU;
+		encoder->run->type = ENCODER_TYPE_CPU;
 #	pragma GCC diagnostic pop
 }

 void encoder_destroy(struct encoder_t *encoder) {
 #	ifdef OMX_ENCODER
-	if (encoder->omxs) {
-		for (unsigned index = 0; index < encoder->n_omxs; ++index) {
-			if (encoder->omxs[index]) {
-				omx_encoder_destroy(encoder->omxs[index]);
+	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->omxs);
+		free(encoder->run->omxs);
 	}
 #	endif
+	free(encoder->run);
 	free(encoder);
 }

-enum encoder_type_t encoder_parse_type(const char *const str) {
-	for (unsigned index = 0; index < sizeof(_ENCODER_TYPES) / sizeof(_ENCODER_TYPES[0]); ++index) {
+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;
 		}
@@ -123,13 +131,13 @@ enum encoder_type_t encoder_parse_type(const char *const str) {
 #pragma GCC diagnostic ignored "-Wunused-parameter"
 #pragma GCC diagnostic push
 void encoder_prepare_live(struct encoder_t *encoder, struct device_t *dev) {
-	assert(encoder->type != ENCODER_TYPE_UNKNOWN);
+	assert(encoder->run->type != ENCODER_TYPE_UNKNOWN);

 #pragma GCC diagnostic pop
 #	ifdef OMX_ENCODER
-	if (encoder->type == ENCODER_TYPE_OMX) {
-		for (unsigned index = 0; index < encoder->n_omxs; ++index) {
-			if (omx_encoder_prepare_live(encoder->omxs[index], dev, encoder->quality) < 0) {
+	if (encoder->run->type == ENCODER_TYPE_OMX) {
+		for (unsigned index = 0; index < encoder->run->n_omxs; ++index) {
+			if (omx_encoder_prepare_live(encoder->run->omxs[index], dev, encoder->quality) < 0) {
 				goto use_fallback;
 			}
 		}
@@ -142,24 +150,23 @@ void encoder_prepare_live(struct encoder_t *encoder, struct device_t *dev) {
 #	pragma GCC diagnostic push
 	use_fallback:
 		LOG_ERROR("Can't prepare selected encoder, falling back to CPU");
-		encoder->type = ENCODER_TYPE_CPU;
+		encoder->run->type = ENCODER_TYPE_CPU;
 #	pragma GCC diagnostic pop
 }

 #pragma GCC diagnostic ignored "-Wunused-label"
 #pragma GCC diagnostic push
-int encoder_compress_buffer(struct encoder_t *encoder, struct device_t *dev,
-	const unsigned worker_number, const unsigned buf_index) {
+int encoder_compress_buffer(struct encoder_t *encoder, struct device_t *dev, unsigned worker_number, unsigned buf_index) {
 #pragma GCC diagnostic pop

-	assert(encoder->type != ENCODER_TYPE_UNKNOWN);
+	assert(encoder->run->type != ENCODER_TYPE_UNKNOWN);

-	if (encoder->type == ENCODER_TYPE_CPU) {
+	if (encoder->run->type == ENCODER_TYPE_CPU) {
 		jpeg_encoder_compress_buffer(dev, buf_index, encoder->quality);
 	}
 #	ifdef OMX_ENCODER
-	else if (encoder->type == ENCODER_TYPE_OMX) {
-		if (omx_encoder_compress_buffer(encoder->omxs[worker_number], dev, buf_index) < 0) {
+	else if (encoder->run->type == ENCODER_TYPE_OMX) {
+		if (omx_encoder_compress_buffer(encoder->run->omxs[worker_number], dev, buf_index) < 0) {
 			goto error;
 		}
 	}
@@ -171,7 +178,7 @@ int encoder_compress_buffer(struct encoder_t *encoder, struct device_t *dev,
 #	pragma GCC diagnostic push
 	error:
 		LOG_INFO("HW compressing error, falling back to CPU");
-		encoder->type = ENCODER_TYPE_CPU;
+		encoder->run->type = ENCODER_TYPE_CPU;
 		return -1;
 #	pragma GCC diagnostic pop
 }
--- a/src/encoder.h
+++ b/src/encoder.h
@@ -1,4 +1,5 @@
 /*****************************************************************************
+#                                                                            #
 #    uStreamer - Lightweight and fast MJPG-HTTP streamer.                    #
 #                                                                            #
 #    Copyright (C) 2018  Maxim Devaev <mdevaev@gmail.com>                    #
@@ -44,9 +45,8 @@ enum encoder_type_t {
 #endif
 };

-struct encoder_t {
-	enum encoder_type_t		type;
-	unsigned				quality;
+struct encoder_runtime_t {
+	enum encoder_type_t type;
 #ifdef OMX_ENCODER
 	unsigned				n_omxs;
 	struct omx_encoder_t	**omxs;
@@ -54,13 +54,20 @@ struct encoder_t {
 };


+struct encoder_t {
+	enum encoder_type_t	type;
+	unsigned			quality;
+
+	struct encoder_runtime_t *run;
+};
+
+
 struct encoder_t *encoder_init();
 void encoder_destroy(struct encoder_t *encoder);

-enum encoder_type_t encoder_parse_type(const char *const str);
+enum encoder_type_t encoder_parse_type(const char *str);

 void encoder_prepare(struct encoder_t *encoder, struct device_t *dev);
 void encoder_prepare_live(struct encoder_t *encoder, struct device_t *dev);

-int encoder_compress_buffer(struct encoder_t *encoder, struct device_t *dev,
-	const unsigned worker_number, const unsigned buf_index);
+int encoder_compress_buffer(struct encoder_t *encoder, struct device_t *dev, unsigned worker_number, unsigned buf_index);
--- a/src/http.c
+++ b/src/http.c
@@ -1,4 +1,5 @@
 /*****************************************************************************
+#                                                                            #
 #    uStreamer - Lightweight and fast MJPG-HTTP streamer.                    #
 #                                                                            #
 #    Copyright (C) 2018  Maxim Devaev <mdevaev@gmail.com>                    #
@@ -23,8 +24,14 @@
 #include <stdbool.h>
 #include <string.h>
 #include <strings.h>
+#include <unistd.h>
+#include <fcntl.h>
 #include <assert.h>

+#include <sys/socket.h>
+#include <sys/un.h>
+#include <sys/stat.h>
+
 #include <event2/event.h>
 #include <event2/thread.h>
 #include <event2/http.h>
@@ -59,7 +66,7 @@ static void _http_callback_stream_write(struct bufferevent *buf_event, void *v_c
 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, const bool stream_updated, const bool picture_updated);
+static void _http_queue_send_stream(struct http_server_t *server, bool stream_updated, bool picture_updated);

 static bool _expose_new_picture(struct http_server_t *server);
 static bool _expose_blank_picture(struct http_server_t *server);
@@ -105,9 +112,20 @@ void http_server_destroy(struct http_server_t *server) {
 	}

 	evhttp_free(server->run->http);
+	if (server->run->unix_fd) {
+		close(server->run->unix_fd);
+	}
 	event_base_free(server->run->base);
 	libevent_global_shutdown();

+	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;
+	}
+
 	free(server->run->exposed->picture.data);
 	free(server->run->exposed);
 	free(server->run);
@@ -128,15 +146,57 @@ int http_server_listen(struct http_server_t *server) {

 	server->run->drop_same_frames_blank = max_u(server->drop_same_frames, server->run->drop_same_frames_blank);

-	LOG_DEBUG("Binding HTTP to [%s]:%d ...", server->host, server->port);
 	evhttp_set_timeout(server->run->http, server->timeout);

-	if (evhttp_bind_socket(server->run->http, server->host, server->port) < 0) {
-		LOG_PERROR("Can't listen HTTP on [%s]:%d", server->host, server->port)
-		return -1;
+	if (server->unix_path) {
+		struct sockaddr_un unix_addr;
+		int unix_fd_flags;
+
+		LOG_DEBUG("Binding HTTP to UNIX socket '%s' ...", server->unix_path);
+
+		assert((server->run->unix_fd = socket(AF_UNIX, SOCK_STREAM, 0)));
+		assert((unix_fd_flags = fcntl(server->run->unix_fd, F_GETFL)) >= 0);
+		unix_fd_flags |= O_NONBLOCK;
+		assert(fcntl(server->run->unix_fd, F_SETFL, unix_fd_flags) >= 0);
+
+		strncpy(unix_addr.sun_path, server->unix_path, 107);
+		unix_addr.sun_path[107] = '\0';
+		unix_addr.sun_family = AF_UNIX;
+
+		if (server->unix_rm && unlink(server->unix_path) < 0) {
+			if (errno != ENOENT) {
+				LOG_PERROR("Can't remove old UNIX socket '%s'", server->unix_path);
+				return -1;
+			}
+		}
+		if (bind(server->run->unix_fd, (struct sockaddr *)&unix_addr, sizeof(struct sockaddr_un)) < 0) {
+			LOG_PERROR("Can't bind HTTP to UNIX socket '%s'", server->unix_path);
+			return -1;
+		}
+		if (server->unix_mode && chmod(server->unix_path, server->unix_mode) < 0) {
+			LOG_PERROR("Can't set permissions %o to UNIX socket '%s'", server->unix_mode, server->unix_path);
+			return -1;
+		}
+		if (listen(server->run->unix_fd, 128) < 0) {
+			LOG_PERROR("Can't listen UNIX socket '%s'", server->unix_path);
+			return -1;
+		}
+		if (evhttp_accept_socket(server->run->http, server->run->unix_fd) < 0) {
+			LOG_PERROR("Can't evhttp_accept_socket() UNIX socket '%s'", server->unix_path);
+			return -1;
+		}
+
+		LOG_INFO("Listening HTTP on UNIX socket '%s'", server->unix_path);
+
+	} 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);
 	}

-	LOG_INFO("Listening HTTP on [%s]:%d", server->host, server->port);
 	return 0;
 }

@@ -201,14 +261,16 @@ static void _http_callback_state(struct evhttp_request *request, void *v_server)

 	assert((buf = evbuffer_new()));
 	assert(evbuffer_add_printf(buf,
-		"{\"ok\": true, \"result\":"
-		" {\"source\": {\"resolution\": {\"width\": %u, \"height\": %u},"
-		" \"online\": %s, \"quality\": %u, \"desired_fps\": %u, \"captured_fps\": %u},"
+		"{\"ok\": true, \"result\": {"
+		" \"encoder\": {\"fallback\": %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\": {",
+		bool_to_string(server->run->stream->encoder->type != server->run->stream->encoder->run->type),
+		server->run->stream->encoder->quality,
 		(server->fake_width ? server->fake_width : server->run->exposed->width),
 		(server->fake_height ? server->fake_height : server->run->exposed->height),
 		bool_to_string(server->run->exposed->online),
-		server->run->stream->encoder->quality,
 		server->run->stream->dev->desired_fps,
 		server->run->exposed->captured_fps,
 		server->run->exposed->queued_fps,
@@ -245,7 +307,7 @@ static void _http_callback_snapshot(struct evhttp_request *request, void *v_serv
 	assert(!evbuffer_add(buf, (const void *)EXPOSED(picture.data), EXPOSED(picture.size)));

 	ADD_HEADER("Access-Control-Allow-Origin:", "*");
-	ADD_HEADER("Cache-Control", "no-store, no-cache, must-revalidate, pre-check=0, post-check=0, max-age=0");
+	ADD_HEADER("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");

@@ -258,6 +320,7 @@ static void _http_callback_snapshot(struct evhttp_request *request, void *v_serv
 	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(width));
 	ADD_UNSIGNED_HEADER("X-UStreamer-Height",			EXPOSED(height));
 	ADD_TIME_HEADER("X-UStreamer-Grab-Time",			EXPOSED(picture.grab_time));
@@ -395,7 +458,7 @@ static void _http_callback_stream_write(struct bufferevent *buf_event, void *v_c
 		assert(evbuffer_add_printf(buf,
 			"HTTP/1.0 200 OK" RN
 			"Access-Control-Allow-Origin: *" RN
-			"Cache-Control: no-store, no-cache, must-revalidate, pre-check=0, post-check=0, max-age=0" RN
+			"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
@@ -428,6 +491,7 @@ static void _http_callback_stream_write(struct bufferevent *buf_event, void *v_c
 		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
@@ -440,6 +504,7 @@ static void _http_callback_stream_write(struct bufferevent *buf_event, void *v_c
 				"X-UStreamer-Send-Time: %.06Lf" RN
 				RN,
 				bool_to_string(EXPOSED(online)),
+				EXPOSED(dropped),
 				EXPOSED(width),
 				EXPOSED(height),
 				client->fps,
@@ -508,7 +573,7 @@ static void _http_callback_stream_error(UNUSED struct bufferevent *buf_event, UN
 	free(client);
 }

-static void _http_queue_send_stream(struct http_server_t *server, const bool stream_updated, const bool picture_updated) {
+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;
--- a/src/http.h
+++ b/src/http.h
@@ -1,4 +1,5 @@
 /*****************************************************************************
+#                                                                            #
 #    uStreamer - Lightweight and fast MJPG-HTTP streamer.                    #
 #                                                                            #
 #    Copyright (C) 2018  Maxim Devaev <mdevaev@gmail.com>                    #
@@ -21,8 +22,11 @@

 #include <stdbool.h>

+#include <sys/stat.h>
+
 #include <event2/event.h>
 #include <event2/http.h>
+#include <event2/util.h>

 #include "tools.h"
 #include "stream.h"
@@ -65,6 +69,7 @@ struct exposed_t {
 struct http_server_runtime_t {
 	struct event_base		*base;
 	struct evhttp			*http;
+	evutil_socket_t			unix_fd;
 	struct event			*refresh;
 	struct stream_t			*stream;
 	struct exposed_t		*exposed;
@@ -76,6 +81,9 @@ struct http_server_runtime_t {
 struct http_server_t {
 	char		*host;
 	unsigned	port;
+	char		*unix_path;
+	bool		unix_rm;
+	mode_t		unix_mode;
 	unsigned	drop_same_frames;
 	unsigned	fake_width;
 	unsigned	fake_height;
--- a/src/jpeg/encoder.c
+++ b/src/jpeg/encoder.c
@@ -1,4 +1,5 @@
 /*****************************************************************************
+#                                                                            #
 #    uStreamer - Lightweight and fast MJPG-HTTP streamer.                    #
 #                                                                            #
 #    This source file based on code of MJPG-Streamer.                        #
@@ -48,24 +49,27 @@ struct _mjpg_destination_mgr {

 static void _jpeg_set_dest_picture(j_compress_ptr jpeg, unsigned char *picture, unsigned long *written);

-static void _jpeg_write_scanlines_yuyv(struct jpeg_compress_struct *jpeg,
-    unsigned char *line_buffer, const unsigned char *data,
-    const unsigned width, const unsigned height);
-
-static void _jpeg_write_scanlines_uyvy(struct jpeg_compress_struct *jpeg,
+static void _jpeg_write_scanlines_yuyv(
+	struct jpeg_compress_struct *jpeg,
 	unsigned char *line_buffer, const unsigned char *data,
-	const unsigned width, const unsigned height);
+	unsigned width, unsigned height);

-static void _jpeg_write_scanlines_rgb565(struct jpeg_compress_struct *jpeg,
+static void _jpeg_write_scanlines_uyvy(
+	struct jpeg_compress_struct *jpeg,
 	unsigned char *line_buffer, const unsigned char *data,
-	const unsigned width, const unsigned height);
+	unsigned width, unsigned height);
+
+static void _jpeg_write_scanlines_rgb565(
+	struct jpeg_compress_struct *jpeg,
+	unsigned char *line_buffer, const unsigned char *data,
+	unsigned width, unsigned height);

 static void _jpeg_init_destination(j_compress_ptr jpeg);
 static boolean _jpeg_empty_output_buffer(j_compress_ptr jpeg);
 static void _jpeg_term_destination(j_compress_ptr jpeg);


-void jpeg_encoder_compress_buffer(struct device_t *dev, const unsigned index, const unsigned quality) {
+void jpeg_encoder_compress_buffer(struct device_t *dev, unsigned index, unsigned quality) {
 	// This function based on compress_image_to_jpeg() from mjpg-streamer

 	struct jpeg_compress_struct jpeg;
@@ -92,6 +96,7 @@ void jpeg_encoder_compress_buffer(struct device_t *dev, const unsigned index, co

 #	define WRITE_SCANLINES(_func) \
 		_func(&jpeg, line_buffer, dev->run->hw_buffers[index].start, dev->run->width, dev->run->height)
+
 	switch (dev->run->format) {
 		// https://www.fourcc.org/yuv.php
 		case V4L2_PIX_FMT_YUYV: WRITE_SCANLINES(_jpeg_write_scanlines_yuyv); break;
@@ -99,6 +104,7 @@ void jpeg_encoder_compress_buffer(struct device_t *dev, const unsigned index, co
 		case V4L2_PIX_FMT_RGB565: WRITE_SCANLINES(_jpeg_write_scanlines_rgb565); break;
 		default: assert(0 && "Unsupported input format for JPEG compressor");
 	}
+
 #	undef WRITE_SCANLINES

 	// TODO: process jpeg errors:
@@ -127,9 +133,12 @@ static void _jpeg_set_dest_picture(j_compress_ptr jpeg, unsigned char *picture,
 	dest->written = written;
 }

-static void _jpeg_write_scanlines_yuyv(struct jpeg_compress_struct *jpeg,
+#define NORM_COMPONENT(_x) (((_x) > 255) ? 255 : (((_x) < 0) ? 0 : (_x)))
+
+static void _jpeg_write_scanlines_yuyv(
+	struct jpeg_compress_struct *jpeg,
 	unsigned char *line_buffer, const unsigned char *data,
-	const unsigned width, const unsigned height) {
+	unsigned width, unsigned height) {

 	JSAMPROW scanlines[1];
 	unsigned z = 0;
@@ -146,9 +155,9 @@ static void _jpeg_write_scanlines_yuyv(struct jpeg_compress_struct *jpeg,
 			int g = (y - (88 * u) - (183 * v)) >> 8;
 			int b = (y + (454 * u)) >> 8;

-			*(ptr++) = (r > 255) ? 255 : ((r < 0) ? 0 : r);
-			*(ptr++) = (g > 255) ? 255 : ((g < 0) ? 0 : g);
-			*(ptr++) = (b > 255) ? 255 : ((b < 0) ? 0 : b);
+			*(ptr++) = NORM_COMPONENT(r);
+			*(ptr++) = NORM_COMPONENT(g);
+			*(ptr++) = NORM_COMPONENT(b);

 			if (z++) {
 				z = 0;
@@ -161,9 +170,10 @@ static void _jpeg_write_scanlines_yuyv(struct jpeg_compress_struct *jpeg,
 	}
 }

-static void _jpeg_write_scanlines_uyvy(struct jpeg_compress_struct *jpeg,
+static void _jpeg_write_scanlines_uyvy(
+	struct jpeg_compress_struct *jpeg,
 	unsigned char *line_buffer, const unsigned char *data,
-	const unsigned width, const unsigned height) {
+	unsigned width, unsigned height) {

 	JSAMPROW scanlines[1];
 	unsigned z = 0;
@@ -180,9 +190,9 @@ static void _jpeg_write_scanlines_uyvy(struct jpeg_compress_struct *jpeg,
 			int g = (y - (88 * u) - (183 * v)) >> 8;
 			int b = (y + (454 * u)) >> 8;

-			*(ptr++) = (r > 255) ? 255 : ((r < 0) ? 0 : r);
-			*(ptr++) = (g > 255) ? 255 : ((g < 0) ? 0 : g);
-			*(ptr++) = (b > 255) ? 255 : ((b < 0) ? 0 : b);
+			*(ptr++) = NORM_COMPONENT(r);
+			*(ptr++) = NORM_COMPONENT(g);
+			*(ptr++) = NORM_COMPONENT(b);

 			if (z++) {
 				z = 0;
@@ -195,9 +205,12 @@ static void _jpeg_write_scanlines_uyvy(struct jpeg_compress_struct *jpeg,
 	}
 }

-static void _jpeg_write_scanlines_rgb565(struct jpeg_compress_struct *jpeg,
+#undef NORM_COMPONENT
+
+static void _jpeg_write_scanlines_rgb565(
+	struct jpeg_compress_struct *jpeg,
 	unsigned char *line_buffer, const unsigned char *data,
-	const unsigned width, const unsigned height) {
+	unsigned width, unsigned height) {

 	JSAMPROW scanlines[1];

--- a/src/jpeg/encoder.h
+++ b/src/jpeg/encoder.h
@@ -1,4 +1,5 @@
 /*****************************************************************************
+#                                                                            #
 #    uStreamer - Lightweight and fast MJPG-HTTP streamer.                    #
 #                                                                            #
 #    Copyright (C) 2018  Maxim Devaev <mdevaev@gmail.com>                    #
@@ -24,4 +25,4 @@
 #include "../device.h"


-void jpeg_encoder_compress_buffer(struct device_t *dev, const unsigned index, const unsigned quality);
+void jpeg_encoder_compress_buffer(struct device_t *dev, unsigned index, unsigned quality);
--- a/src/logging.h
+++ b/src/logging.h
@@ -1,4 +1,5 @@
 /*****************************************************************************
+#                                                                            #
 #    uStreamer - Lightweight and fast MJPG-HTTP streamer.                    #
 #                                                                            #
 #    Copyright (C) 2018  Maxim Devaev <mdevaev@gmail.com>                    #
--- a/src/main.c
+++ b/src/main.c
@@ -1,4 +1,5 @@
 /*****************************************************************************
+#                                                                            #
 #    uStreamer - Lightweight and fast MJPG-HTTP streamer.                    #
 #                                                                            #
 #    Copyright (C) 2018  Maxim Devaev <mdevaev@gmail.com>                    #
@@ -40,7 +41,7 @@
 #include "http.h"


-static const char _short_opts[] = "d:i:x:y:f:a:z:tn:w:q:c:s:p:r:h";
+static const char _short_opts[] = "d:i:x:y:m:a:f:z:tb:w:q:c:s:p:u:ro:e:h";
 static const struct option _long_opts[] = {
 	{"device",					required_argument,	NULL,	'd'},
 	{"input",					required_argument,	NULL,	'i'},
@@ -61,7 +62,10 @@ static const struct option _long_opts[] = {

 	{"host",					required_argument,	NULL,	's'},
 	{"port",					required_argument,	NULL,	'p'},
-	{"drop-same-frames",		required_argument,	NULL,	'r'},
+	{"unix",					required_argument,	NULL,	'u'},
+	{"unix-rm",					no_argument,		NULL,	'r'},
+	{"unix-mode",				required_argument,	NULL,	'o'},
+	{"drop-same-frames",		required_argument,	NULL,	'e'},
 	{"fake-width",				required_argument,	NULL,	2001},
 	{"fake-height",				required_argument,	NULL,	2002},
 	{"server-timeout",			required_argument,	NULL,	2003},
@@ -96,47 +100,50 @@ static void _help(struct device_t *dev, struct encoder_t *encoder, struct http_s
 	printf("------------------\n");
 	printf("    -d|--device </dev/path>          -- Path to V4L2 device. Default: %s.\n\n", dev->path);
 	printf("    -i|--input <N>                   -- Input channel. Default: %u.\n\n", dev->input);
-	printf("    -x|--width <N>                   -- Initial image width. Default: %d.\n\n", dev->width);
-	printf("    -y|--height <N>                  -- Initial image height. Default: %d.\n\n", dev->height);
+	printf("    -x|--width <N>                   -- Initial image width. Default: %u.\n\n", dev->width);
+	printf("    -y|--height <N>                  -- Initial image height. Default: %u.\n\n", dev->height);
 	printf("    -m|--format <fmt>                -- Image format.\n");
 	printf("                                        Available: %s; default: YUYV.\n\n", FORMATS_STR);
 	printf("    -a|--tv-standard <std>           -- Force TV standard.\n");
 	printf("                                        Available: %s; default: disabled.\n\n", STANDARDS_STR);
-	printf("    -f|--desired-fps <N>             -- Desired FPS; default: maximum as possible.\n\n");
+	printf("    -f|--desired-fps <N>             -- Desired FPS. Default: maximum as possible.\n\n");
 	printf("    -z|--min-frame-size <N>          -- Drop frames smaller then this limit.\n");
 	printf("                                        Useful if the device produces small-sized garbage frames.\n\n");
 	printf("    -t|--dv-timings                  -- Enable DV timings queriyng and events processing.\n");
 	printf("                                        Supports automatic resolution changing. Default: disabled.\n\n");
 	printf("    -b|--buffers <N>                 -- The number of buffers to receive data from the device.\n");
 	printf("                                        Each buffer may processed using an intermediate thread.\n");
-	printf("                                        Default: %d (number of CPU cores + 1)\n\n", dev->n_buffers);
-	printf("    -w|--workers <N>                 -- The number of compressing threads. Default: %d (== --buffers).\n\n", dev->n_workers);
-	printf("    -q|--quality <N>                 -- Set quality of JPEG encoding from 1 to 100 (best). Default: %d.\n\n", encoder->quality);
-	printf("    --encoder <type>                 -- Use specified encoder. It may affects to workers number.\n");
+	printf("                                        Default: %u (number of CPU cores + 1)\n\n", dev->n_buffers);
+	printf("    -w|--workers <N>                 -- The number of compressing threads. Default: %u (== --buffers).\n\n", dev->n_workers);
+	printf("    -q|--quality <N>                 -- Set quality of JPEG encoding from 1 to 100 (best). Default: %u.\n\n", encoder->quality);
+	printf("    -c|--encoder <type>              -- Use specified encoder. It may affects to workers number.\n");
 	printf("                                     -- Available: %s; default: CPU.\n\n", ENCODER_TYPES_STR);
-	printf("    --device-timeout <seconds>       -- Timeout for device querying. Default: %d\n\n", dev->timeout);
+	printf("    --device-timeout <seconds>       -- Timeout for device querying. Default: %u\n\n", dev->timeout);
 	printf("    --device-persistent              -- Don't re-initialize device on timeout. Default: disabled.\n\n");
 	printf("    --device-error-delay <seconds>   -- Delay before trying to connect to the device again\n");
-	printf("                                        after a timeout. Default: %d\n\n", dev->error_delay);
+	printf("                                        after a timeout. Default: %u\n\n", dev->error_delay);
 	printf("HTTP server options:\n");
 	printf("--------------------\n");
-	printf("    --host <address>           -- Listen on Hostname or IP. Default: %s\n\n", server->host);
-	printf("    --port <N>                 -- Bind to this TCP port. Default: %d\n\n", server->port);
-	printf("    --drop-same-frames <N>     -- Don't send same frames to clients, but no more than specified number.\n");
+	printf("    -s|--host <address>        -- Listen on Hostname or IP. Default: %s\n\n", server->host);
+	printf("    -p|--port <N>              -- Bind to this TCP port. Default: %u\n\n", server->port);
+	printf("    -u|--unix <path>           -- Bind to UNIX domain socket. Default: disabled\n\n");
+	printf("    -r|--unix-rm               -- Try to remove old UNIX socket file before binding. Default: disabled\n\n");
+	printf("    -o|--unix-mode <mode>      -- Set UNIX socket file permissions (like 777). Default: disabled\n\n");
+	printf("    -e|--drop-same-frames <N>  -- Don't send same frames to clients, but no more than specified number.\n");
 	printf("                                  It can significantly reduce the outgoing traffic, but will increase\n");
 	printf("                                  the CPU loading. Don't use this option with analog signal sources\n");
 	printf("                                  or webcams, it's useless. Default: disabled.\n\n");
 	printf("    --fake-width <N>           -- Override image width for /state. Default: disabled\n\n");
 	printf("    --fake-height <N>          -- Override image height for /state. Default: disabled.\n\n");
-	printf("    --server-timeout <seconds> -- Timeout for client connections. Default: %d\n\n", server->timeout);
+	printf("    --server-timeout <seconds> -- Timeout for client connections. Default: %u\n\n", server->timeout);
 	printf("Misc options:\n");
 	printf("-------------\n");
 	printf("    --log-level <N> -- Verbosity level of messages from 0 (info) to 3 (debug).\n");
 	printf("                       Enabling debugging messages can slow down the program.\n");
 	printf("                       Available levels: 0=info, 1=performance, 2=verbose, 3=debug.\n");
-	printf("                       Default: %d.\n\n", log_level);
-	printf("    --perf          -- Enable performance messages (same as log-level=1). Default: disabled.\n\n");
-	printf("    --verbose       -- Enable verbose messages and lower (same as log-level=2). Default: disabled.\n\n");
+	printf("                       Default: %u.\n\n", log_level);
+	printf("    --perf          -- Enable performance messages (same as --log-level=1). Default: disabled.\n\n");
+	printf("    --verbose       -- Enable verbose messages and lower (same as --log-level=2). Default: disabled.\n\n");
 	printf("    --debug         -- Enable debug messages and lower (same as --log-level=3). Default: disabled.\n\n");
 	printf("    -h|--help       -- Print this messages and exit.\n\n");
 }
@@ -146,9 +153,9 @@ static int _parse_options(int argc, char *argv[], struct device_t *dev, struct e
 		{ _dest = _value; break; }

 #	define OPT_UNSIGNED(_dest, _name, _min, _max) \
-		{ errno = 0; int _tmp = strtol(optarg, NULL, 0); \
-		if (errno || _tmp < _min || _tmp > _max) \
-		{ printf("Invalid value for '%s=%u'; min=%u; max=%u\n", _name, _tmp, _min, _max); return -1; } \
+		{ errno = 0; char *_end = NULL; int _tmp = strtol(optarg, &_end, 0); \
+		if (errno || *_end || _tmp < _min || _tmp > _max) \
+		{ printf("Invalid value for '%s=%s'; min=%u; max=%u\n", _name, optarg, _min, _max); return -1; } \
 		_dest = _tmp; break; }

 #	define OPT_PARSE(_dest, _func, _invalid, _name) \
@@ -156,6 +163,12 @@ static int _parse_options(int argc, char *argv[], struct device_t *dev, struct e
 		{ printf("Unknown " _name ": %s\n", optarg); return -1; } \
 		break; }

+#	define OPT_CHMOD(_dest, _name) \
+		{ errno = 0; char *_end = NULL; int _tmp = strtol(optarg, &_end, 8); \
+		if (errno || *_end) \
+		{ printf("Invalid value for '%s=%s'\n", _name, optarg); return -1; } \
+		_dest = _tmp; break; }
+
 	int index;
 	int ch;

@@ -164,8 +177,8 @@ static int _parse_options(int argc, char *argv[], struct device_t *dev, struct e
 		switch (ch) {
 			case 'd':	OPT_SET(dev->path, optarg);
 			case 'i':	OPT_UNSIGNED(dev->input, "--input", 0, 128);
-			case 'x':	OPT_UNSIGNED(dev->width, "--width", 320, 1920);
-			case 'y':	OPT_UNSIGNED(dev->height, "--height", 180, 1200);
+			case 'x':	OPT_UNSIGNED(dev->width, "--width", VIDEO_MIN_WIDTH, VIDEO_MAX_WIDTH);
+			case 'y':	OPT_UNSIGNED(dev->height, "--height", VIDEO_MIN_HEIGHT, VIDEO_MAX_HEIGHT);
 #			pragma GCC diagnostic ignored "-Wsign-compare"
 #			pragma GCC diagnostic push
 			case 'm':	OPT_PARSE(dev->format, device_parse_format, FORMAT_UNKNOWN, "pixel format");
@@ -184,7 +197,10 @@ static int _parse_options(int argc, char *argv[], struct device_t *dev, struct e

 			case 's':	OPT_SET(server->host, optarg);
 			case 'p':	OPT_UNSIGNED(server->port, "--port", 1, 65535);
-			case 'r':	OPT_UNSIGNED(server->drop_same_frames, "--drop-same-frames", 0, 30);
+			case 'u':	OPT_SET(server->unix_path, optarg);
+			case 'r':	OPT_SET(server->unix_rm, true);
+			case 'o':	OPT_CHMOD(server->unix_mode, "--unix-mode");
+			case 'e':	OPT_UNSIGNED(server->drop_same_frames, "--drop-same-frames", 0, 30);
 			case 2001:	OPT_UNSIGNED(server->fake_width, "--fake-width", 0, 1920);
 			case 2002:	OPT_UNSIGNED(server->fake_height, "--fake-height", 0, 1200);
 			case 2003:	OPT_UNSIGNED(server->timeout, "--server-timeout", 1, 60);
@@ -200,6 +216,7 @@ static int _parse_options(int argc, char *argv[], struct device_t *dev, struct e
 		}
 	}

+#	undef OPT_CHMOD
 #	undef OPT_PARSE
 #	undef OPT_UNSIGNED
 #	undef OPT_SET
--- a/src/omx/component.c
+++ b/src/omx/component.c
@@ -1,4 +1,5 @@
 /*****************************************************************************
+#                                                                            #
 #    uStreamer - Lightweight and fast MJPG-HTTP streamer.                    #
 #                                                                            #
 #    Copyright (C) 2018  Maxim Devaev <mdevaev@gmail.com>                    #
@@ -30,11 +31,11 @@
 #include "component.h"


-static int _component_wait_port_changed(OMX_HANDLETYPE *component, const OMX_U32 port, const OMX_BOOL enabled);
-static int _component_wait_state_changed(OMX_HANDLETYPE *component, const OMX_STATETYPE wanted);
+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, const OMX_U32 port) {
+int component_enable_port(OMX_HANDLETYPE *component, OMX_U32 port) {
 	OMX_ERRORTYPE error;

 	LOG_DEBUG("Enabling OMX port %u ...", port);
@@ -45,7 +46,7 @@ int component_enable_port(OMX_HANDLETYPE *component, const OMX_U32 port) {
 	return _component_wait_port_changed(component, port, OMX_TRUE);
 }

-int component_disable_port(OMX_HANDLETYPE *component, const OMX_U32 port) {
+int component_disable_port(OMX_HANDLETYPE *component, OMX_U32 port) {
 	OMX_ERRORTYPE error;

 	LOG_DEBUG("Disabling OMX port %u ...", port);
@@ -56,7 +57,7 @@ int component_disable_port(OMX_HANDLETYPE *component, const OMX_U32 port) {
 	return _component_wait_port_changed(component, port, OMX_FALSE);
 }

-int component_get_portdef(OMX_HANDLETYPE *component, OMX_PARAM_PORTDEFINITIONTYPE *portdef, const OMX_U32 port) {
+int component_get_portdef(OMX_HANDLETYPE *component, OMX_PARAM_PORTDEFINITIONTYPE *portdef, OMX_U32 port) {
 	OMX_ERRORTYPE error;

 	OMX_INIT_STRUCTURE(*portdef);
@@ -81,8 +82,8 @@ int component_set_portdef(OMX_HANDLETYPE *component, OMX_PARAM_PORTDEFINITIONTYP
 	return 0;
 }

-int component_set_state(OMX_HANDLETYPE *component, const OMX_STATETYPE state) {
-	const char *const state_str = omx_state_to_string(state);
+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;

@@ -107,7 +108,7 @@ int component_set_state(OMX_HANDLETYPE *component, const OMX_STATETYPE state) {
 }


-static int _component_wait_port_changed(OMX_HANDLETYPE *component, const OMX_U32 port, const OMX_BOOL enabled) {
+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;
@@ -132,7 +133,7 @@ static int _component_wait_port_changed(OMX_HANDLETYPE *component, const OMX_U32
 	return (portdef.bEnabled == enabled ? 0 : -1);
 }

-static int _component_wait_state_changed(OMX_HANDLETYPE *component, const OMX_STATETYPE wanted) {
+static int _component_wait_state_changed(OMX_HANDLETYPE *component, OMX_STATETYPE wanted) {
 	OMX_ERRORTYPE error;
 	OMX_STATETYPE state;
 	int retries = 50;
--- a/src/omx/component.h
+++ b/src/omx/component.h
@@ -1,4 +1,5 @@
 /*****************************************************************************
+#                                                                            #
 #    uStreamer - Lightweight and fast MJPG-HTTP streamer.                    #
 #                                                                            #
 #    Copyright (C) 2018  Maxim Devaev <mdevaev@gmail.com>                    #
@@ -38,10 +39,10 @@
 	}


-int component_enable_port(OMX_HANDLETYPE *component, const OMX_U32 port);
-int component_disable_port(OMX_HANDLETYPE *component, const OMX_U32 port);
+int component_enable_port(OMX_HANDLETYPE *component, OMX_U32 port);
+int component_disable_port(OMX_HANDLETYPE *component, OMX_U32 port);

-int component_get_portdef(OMX_HANDLETYPE *component, OMX_PARAM_PORTDEFINITIONTYPE *portdef, const OMX_U32 port);
+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, const OMX_STATETYPE state);
+int component_set_state(OMX_HANDLETYPE *component, OMX_STATETYPE state);
--- a/src/omx/encoder.c
+++ b/src/omx/encoder.c
@@ -1,4 +1,5 @@
 /*****************************************************************************
+#                                                                            #
 #    uStreamer - Lightweight and fast MJPG-HTTP streamer.                    #
 #                                                                            #
 #    Copyright (C) 2018  Maxim Devaev <mdevaev@gmail.com>                    #
@@ -51,17 +52,20 @@ 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, const unsigned quality);
+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,
+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,
+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,
+static OMX_ERRORTYPE _omx_output_available_handler(
+	UNUSED OMX_HANDLETYPE encoder,
 	OMX_PTR v_omx, UNUSED OMX_BUFFERHEADERTYPE *buffer);


@@ -148,7 +152,7 @@ void omx_encoder_destroy(struct omx_encoder_t *omx) {
 	free(omx);
 }

-int omx_encoder_prepare_live(struct omx_encoder_t *omx, struct device_t *dev, const unsigned quality) {
+int omx_encoder_prepare_live(struct omx_encoder_t *omx, struct device_t *dev, unsigned quality) {
 	if (component_set_state(&omx->encoder, OMX_StateIdle) < 0) {
 		return -1;
 	}
@@ -167,7 +171,7 @@ int omx_encoder_prepare_live(struct omx_encoder_t *omx, struct device_t *dev, co
 	return 0;
 }

-int omx_encoder_compress_buffer(struct omx_encoder_t *omx, struct device_t *dev, const unsigned index) {
+int omx_encoder_compress_buffer(struct omx_encoder_t *omx, struct device_t *dev, unsigned index) {
 	OMX_ERRORTYPE error;
 	bool loaded = false;

@@ -329,7 +333,7 @@ static int _omx_setup_input(struct omx_encoder_t *omx, struct device_t *dev) {
 	return 0;
 }

-static int _omx_setup_output(struct omx_encoder_t *omx, const unsigned quality) {
+static int _omx_setup_output(struct omx_encoder_t *omx, unsigned quality) {
 	OMX_ERRORTYPE error;
 	OMX_PARAM_PORTDEFINITIONTYPE portdef;

@@ -433,7 +437,8 @@ static int _omx_encoder_clear_ports(struct omx_encoder_t *omx) {
 	return retcode;
 }

-static OMX_ERRORTYPE _omx_event_handler(UNUSED OMX_HANDLETYPE encoder,
+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) {

@@ -449,7 +454,8 @@ static OMX_ERRORTYPE _omx_event_handler(UNUSED OMX_HANDLETYPE encoder,
 	return OMX_ErrorNone;
 }

-static OMX_ERRORTYPE _omx_input_required_handler(UNUSED OMX_HANDLETYPE encoder,
+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
@@ -462,7 +468,8 @@ static OMX_ERRORTYPE _omx_input_required_handler(UNUSED OMX_HANDLETYPE encoder,
 	return OMX_ErrorNone;
 }

-static OMX_ERRORTYPE _omx_output_available_handler(UNUSED OMX_HANDLETYPE encoder,
+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
--- a/src/omx/encoder.h
+++ b/src/omx/encoder.h
@@ -1,4 +1,5 @@
 /*****************************************************************************
+#                                                                            #
 #    uStreamer - Lightweight and fast MJPG-HTTP streamer.                    #
 #                                                                            #
 #    Copyright (C) 2018  Maxim Devaev <mdevaev@gmail.com>                    #
@@ -51,5 +52,5 @@ struct omx_encoder_t {
 struct omx_encoder_t *omx_encoder_init();
 void omx_encoder_destroy(struct omx_encoder_t *omx);

-int omx_encoder_prepare_live(struct omx_encoder_t *omx, struct device_t *dev, const unsigned quality);
-int omx_encoder_compress_buffer(struct omx_encoder_t *omx, struct device_t *dev, const unsigned index);
+int omx_encoder_prepare_live(struct omx_encoder_t *omx, struct device_t *dev, unsigned quality);
+int omx_encoder_compress_buffer(struct omx_encoder_t *omx, struct device_t *dev, unsigned index);
--- a/src/omx/formatters.c
+++ b/src/omx/formatters.c
@@ -1,4 +1,5 @@
 /*****************************************************************************
+#                                                                            #
 #    uStreamer - Lightweight and fast MJPG-HTTP streamer.                    #
 #                                                                            #
 #    Copyright (C) 2018  Maxim Devaev <mdevaev@gmail.com>                    #
@@ -38,7 +39,7 @@
 		assert(0 && _buf); \
 	}

-const char *omx_error_to_string(const OMX_ERRORTYPE error) {
+const char *omx_error_to_string(OMX_ERRORTYPE error) {
 	switch (error) {
 		CASE_TO_STRING(OMX_ErrorNone);
 		CASE_TO_STRING(OMX_ErrorInsufficientResources);
@@ -69,7 +70,7 @@ const char *omx_error_to_string(const OMX_ERRORTYPE error) {
 	}
 }

-const char *omx_state_to_string(const OMX_STATETYPE state) {
+const char *omx_state_to_string(OMX_STATETYPE state) {
 	switch (state) {
 		CASE_TO_STRING(OMX_StateLoaded);
 		CASE_TO_STRING(OMX_StateIdle);
--- a/src/omx/formatters.h
+++ b/src/omx/formatters.h
@@ -1,4 +1,5 @@
 /*****************************************************************************
+#                                                                            #
 #    uStreamer - Lightweight and fast MJPG-HTTP streamer.                    #
 #                                                                            #
 #    Copyright (C) 2018  Maxim Devaev <mdevaev@gmail.com>                    #
@@ -41,5 +42,5 @@
 	}


-const char *omx_error_to_string(const OMX_ERRORTYPE error);
-const char *omx_state_to_string(const OMX_STATETYPE state);
+const char *omx_error_to_string(OMX_ERRORTYPE error);
+const char *omx_state_to_string(OMX_STATETYPE state);
--- a/src/stream.c
+++ b/src/stream.c
@@ -1,4 +1,5 @@
 /*****************************************************************************
+#                                                                            #
 #    uStreamer - Lightweight and fast MJPG-HTTP streamer.                    #
 #                                                                            #
 #    Copyright (C) 2018  Maxim Devaev <mdevaev@gmail.com>                    #
@@ -48,7 +49,7 @@ static void _stream_init_workers(struct device_t *dev, struct workers_pool_t *po
 static void *_stream_worker_thread(void *v_ctx);
 static void _stream_destroy_workers(struct device_t *dev, struct workers_pool_t *pool);

-static int _stream_control(struct device_t *dev, const bool enable);
+static int _stream_control(struct device_t *dev, bool enable);
 static int _stream_grab_buffer(struct device_t *dev, struct v4l2_buffer *buf_info);
 static int _stream_release_buffer(struct device_t *dev, struct v4l2_buffer *buf_info);
 static int _stream_handle_event(struct device_t *dev);
@@ -189,7 +190,7 @@ void stream_loop(struct stream_t *stream) {
 					// For example a VGA (640x480) webcam picture is normally >= 8kByte large,
 					// corrupted frames are smaller.
 					if (buf_info.bytesused < stream->dev->min_frame_size) {
-						LOG_DEBUG("Dropping too small frame sized %d bytes, assuming it as broken", buf_info.bytesused);
+						LOG_DEBUG("Dropping too small frame sized %u bytes, assuming it as broken", buf_info.bytesused);
 						goto pass_frame;
 					}

@@ -215,7 +216,7 @@ void stream_loop(struct stream_t *stream) {
 						LOG_VERBOSE("Fluency: delay=%.03Lf; grab_after=%.03Lf", fluency_delay, grab_after);
 					}

-					LOG_DEBUG("Grabbed a new frame to buffer %d", buf_info.index);
+					LOG_DEBUG("Grabbed a new frame to buffer %u", buf_info.index);
 					pool.workers[free_worker_number].ctx.buf_info = buf_info;

 					if (!oldest_worker) {
@@ -343,7 +344,7 @@ static int _stream_init_loop(struct device_t *dev, struct workers_pool_t *pool)
 	LOG_DEBUG("%s: *dev->stop = %d", __FUNCTION__, dev->stop);
 	while (!dev->stop) {
 		if ((retval = _stream_init(dev, pool)) < 0) {
-			LOG_INFO("Sleeping %d seconds before new stream init ...", dev->error_delay);
+			LOG_INFO("Sleeping %u seconds before new stream init ...", dev->error_delay);
 			sleep(dev->error_delay);
 		} else {
 			break;
@@ -378,7 +379,7 @@ static int _stream_init(struct device_t *dev, struct workers_pool_t *pool) {
 }

 static void _stream_init_workers(struct device_t *dev, struct workers_pool_t *pool) {
-	LOG_INFO("Spawning %d workers ...", dev->n_workers);
+	LOG_INFO("Spawning %u workers ...", dev->n_workers);

 	*pool->workers_stop = false;
 	A_CALLOC(pool->workers, dev->n_workers);
@@ -434,7 +435,7 @@ static void *_stream_worker_thread(void *v_ctx) {
 #	define PICTURE(_next) ctx->dev->run->pictures[ctx->buf_index]._next

 		if (!*ctx->workers_stop) {
-			LOG_DEBUG("Worker %u compressing JPEG from buffer %d ...", ctx->number, ctx->buf_index);
+			LOG_DEBUG("Worker %u compressing JPEG from buffer %u ...", ctx->number, ctx->buf_index);

 			PICTURE(encode_begin_time) = get_now_monotonic();
 			if (encoder_compress_buffer(ctx->encoder, ctx->dev, ctx->number, ctx->buf_index) < 0) {
@@ -453,7 +454,7 @@ static void *_stream_worker_thread(void *v_ctx) {
 				A_PTHREAD_M_UNLOCK(ctx->last_comp_time_mutex);

 				LOG_VERBOSE(
-					"Compressed JPEG size=%ld; time=%0.3Lf; worker=%u; buffer=%d",
+					"Compressed JPEG size=%ld; time=%0.3Lf; worker=%u; buffer=%u",
 					PICTURE(size), last_comp_time, ctx->number, ctx->buf_index
 				);
 			} else {
@@ -470,7 +471,7 @@ static void *_stream_worker_thread(void *v_ctx) {
 		A_PTHREAD_C_SIGNAL(ctx->free_workers_cond);
 	}

-	LOG_DEBUG("Bye-bye (worker %d)", ctx->number);
+	LOG_DEBUG("Bye-bye (worker %u)", ctx->number);
 	return NULL;
 }

@@ -499,7 +500,7 @@ static void _stream_destroy_workers(struct device_t *dev, struct workers_pool_t
 	pool->workers = NULL;
 }

-static int _stream_control(struct device_t *dev, const bool enable) {
+static int _stream_control(struct device_t *dev, bool enable) {
 	if (enable != dev->run->capturing) {
 		enum v4l2_buf_type type = V4L2_BUF_TYPE_VIDEO_CAPTURE;

@@ -528,9 +529,9 @@ static int _stream_grab_buffer(struct device_t *dev, struct v4l2_buffer *buf_inf
 		return -1;
 	}

-	LOG_DEBUG("Got a new frame in buffer index=%d; bytesused=%d", buf_info->index, buf_info->bytesused);
+	LOG_DEBUG("Got a new frame in buffer index=%u; bytesused=%u", buf_info->index, buf_info->bytesused);
 	if (buf_info->index >= dev->run->n_buffers) {
-		LOG_ERROR("Got invalid buffer index=%d; nbuffers=%d", buf_info->index, dev->run->n_buffers);
+		LOG_ERROR("Got invalid buffer index=%u; nbuffers=%u", buf_info->index, dev->run->n_buffers);
 		return -1;
 	}
 	return 0;
--- a/src/stream.h
+++ b/src/stream.h
@@ -1,4 +1,5 @@
 /*****************************************************************************
+#                                                                            #
 #    uStreamer - Lightweight and fast MJPG-HTTP streamer.                    #
 #                                                                            #
 #    Copyright (C) 2018  Maxim Devaev <mdevaev@gmail.com>                    #
--- a/src/tools.h
+++ b/src/tools.h
@@ -1,4 +1,5 @@
 /*****************************************************************************
+#                                                                            #
 #    uStreamer - Lightweight and fast MJPG-HTTP streamer.                    #
 #                                                                            #
 #    Copyright (C) 2018  Maxim Devaev <mdevaev@gmail.com>                    #
@@ -47,18 +48,18 @@
 #define A_PTHREAD_C_SIGNAL(...)		assert(!pthread_cond_signal(__VA_ARGS__))
 #define A_PTHREAD_C_WAIT_TRUE(_var, _cond, _mutex) { while(!_var) assert(!pthread_cond_wait(_cond, _mutex)); }

-
 #define A_CALLOC(_dest, _nmemb)		assert((_dest = calloc(_nmemb, sizeof(*(_dest)))))
 #define A_REALLOC(_dest, _nmemb)	assert((_dest = realloc(_dest, _nmemb * sizeof(*(_dest)))))
 #define MEMSET_ZERO(_obj)			memset(&(_obj), 0, sizeof(_obj))
 #define MEMSET_ZERO_PTR(_ptr)		memset(_ptr, 0, sizeof(*(_ptr)))

+#define ARRAY_LEN(_array) (sizeof(_array) / sizeof(_array[0]))

 #define INLINE inline __attribute__((always_inline))
 #define UNUSED __attribute__((unused))


-INLINE char *bool_to_string(const bool flag) {
+INLINE char *bool_to_string(bool flag) {
 	return (flag ? "true" : "false");
 }

--- a/src/xioctl.h
+++ b/src/xioctl.h
@@ -1,4 +1,5 @@
 /*****************************************************************************
+#                                                                            #
 #    uStreamer - Lightweight and fast MJPG-HTTP streamer.                    #
 #                                                                            #
 #    Copyright (C) 2018  Maxim Devaev <mdevaev@gmail.com>                    #
@@ -32,7 +33,7 @@
 #define XIOCTL_RETRIES 4


-INLINE int xioctl(const int fd, const int request, void *arg) {
+INLINE int xioctl(int fd, int request, void *arg) {
 	int retries = XIOCTL_RETRIES;
 	int retval = -1;

--- a/tools/make-html-h.py
+++ b/tools/make-html-h.py
@@ -44,6 +44,7 @@ def main():
    text = "const char *%s = \" \\\n%s\n\";\n" % (name, text)
    text = textwrap.dedent("""
        /*****************************************************************************
+        #                                                                            #
        #    uStreamer - Lightweight and fast MJPG-HTTP streamer.                    #
        #                                                                            #
        #    Copyright (C) 2018  Maxim Devaev <mdevaev@gmail.com>                    #
--- a/tools/make-jpeg-h.py
+++ b/tools/make-jpeg-h.py
@@ -42,7 +42,7 @@ def main():
    for ch in jpg_data:
        if len(rows[-1]) > 20:
            rows.append([])
-        rows[-1].append(hex(ch))
+        rows[-1].append("0x%.2X" % (ch))

    text = ",\n\t".join(", ".join(row) for row in rows)
    text = "const unsigned char %s_JPG_DATA[] = {\n\t%s\n};\n" % (prefix, text)
@@ -51,6 +51,7 @@ def main():
    text = "const unsigned %s_JPG_WIDTH = %d;\n" % (prefix, width) + text
    text = textwrap.dedent("""
        /*****************************************************************************
+        #                                                                            #
        #    uStreamer - Lightweight and fast MJPG-HTTP streamer.                    #
        #                                                                            #
        #    Copyright (C) 2018  Maxim Devaev <mdevaev@gmail.com>                    #
Author	SHA1	Message	Date
Devaev Maxim	cc25abcc00	Bump version: 0.50 → 0.51	2019-03-03 05:23:51 +03:00
Devaev Maxim	e80ee2f574	refactoring	2019-03-03 04:25:32 +03:00
Devaev Maxim	56a95c7f17	ARRAY_LEN()	2019-03-02 11:30:10 +03:00
Devaev Maxim	667e3610b2	encoder runtime	2019-03-02 11:29:57 +03:00
Devaev Maxim	142c8c84ac	Bump version: 0.49 → 0.50	2019-03-01 11:36:15 +03:00
Devaev Maxim	383075d323	refactoring	2019-03-01 10:44:50 +03:00
Devaev Maxim	e2922aa820	fixed short options	2019-03-01 07:48:03 +03:00
Devaev Maxim	dc9667cf0c	report about using pixelformat	2019-03-01 07:07:16 +03:00
Devaev Maxim	bbbfda0b5c	Bump version: 0.48 → 0.49	2019-02-22 02:55:13 +03:00
Devaev Maxim	aa3f079ee9	fixed memory leak in http_server_destroy()	2019-02-22 02:54:03 +03:00
Devaev Maxim	59bd4e8dd2	Bump version: 0.47 → 0.48	2019-02-21 08:02:31 +03:00
Devaev Maxim	ce6184b8cd	refactoring	2019-02-21 08:02:21 +03:00
Devaev Maxim	9ca511d29d	Bump version: 0.46 → 0.47	2019-02-19 04:38:14 +03:00
Devaev Maxim	74de28c64a	refactoring	2019-02-19 04:33:35 +03:00
Maxim Devaev	24060e8068	Update README.md	2019-01-28 17:33:57 +03:00
Maxim Devaev	3a03d48855	Update README.ru.md	2019-01-22 03:32:52 +03:00
Maxim Devaev	935a9125d6	Update README.md	2019-01-22 03:32:17 +03:00
Devaev Maxim	d4ea97ef2c	Bump version: 0.45 → 0.46	2018-12-18 03:17:44 +03:00
Devaev Maxim	867aa4e52a	proxy-revalidate	2018-12-18 03:17:34 +03:00
Devaev Maxim	bc2bb444dc	Bump version: 0.44 → 0.45	2018-12-18 01:37:50 +03:00
Devaev Maxim	19796f3b64	X-UStreamer-Dropped	2018-12-18 01:37:39 +03:00
Devaev Maxim	348a6e4a8f	Bump version: 0.43 → 0.44	2018-12-17 01:34:00 +03:00
Devaev Maxim	ba3300ddde	refactoring	2018-12-17 01:31:44 +03:00
Devaev Maxim	09526884f4	forbid incorrect resolutions	2018-12-17 01:02:04 +03:00
Devaev Maxim	160a0e8d29	Bump version: 0.42 → 0.43	2018-12-06 21:56:11 +03:00
Devaev Maxim	9dddd0075e	unix socket perms; strtol() error handling	2018-12-06 21:55:28 +03:00
Devaev Maxim	0e0e3939b2	Bump version: 0.41 → 0.42	2018-12-06 13:24:11 +03:00
Devaev Maxim	9c8d87412e	streaming via unix socket	2018-12-06 13:23:58 +03:00
Maxim Devaev	3666d92819	Update README.md	2018-12-06 13:23:37 +03:00
Maxim Devaev	9388d4dd22	Update README.ru.md	2018-12-06 13:23:20 +03:00
Maxim Devaev	6cf4924e05	Update README.ru.md	2018-12-06 13:23:01 +03:00
Maxim Devaev	713e3751b4	Update README.md	2018-12-06 13:22:29 +03:00