Bump version: 6.35 → 6.36

Fixes #170

Monochrome cameras send only Y component of YUV image

.bumpversion.cfg

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

README.md

@@ -44,7 +44,7 @@ You need to download the µStreamer onto your system and build it from the sourc
 * FreeBSD port: https://www.freshports.org/multimedia/ustreamer.
 
 ### Preconditions
-You'll need  ```make```, ```gcc```, ```libevent``` with ```pthreads``` support, ```libjpeg9```/```libjpeg-turbo``` and ```libbsd``` (only for Linux).
+You'll need  ```make```, ```gcc```, ```pkg-config```, ```libevent``` with ```pthreads``` support, ```libjpeg9```/```libjpeg-turbo``` and ```libbsd``` (only for Linux).
 
 * Arch: `sudo pacman -S libevent libjpeg-turbo libutil-linux libbsd`.
 * Raspberry OS Bullseye: `sudo apt install libevent-dev libjpeg62-turbo libbsd-dev`. Add `libgpiod-dev` for `WITH_GPIO=1` and `libsystemd-dev` for `WITH_SYSTEMD=1` and `libasound2-dev libspeex-dev libspeexdsp-dev libopus-dev` for `WITH_JANUS=1`.

janus/Makefile

@@ -18,6 +18,11 @@ _SRCS = $(shell ls src/uslibs/*.c src/*.c)
 _BUILD = build
 
 
+# =====
+ifneq ($(shell sh -c 'uname 2>/dev/null || echo Unknown'),FreeBSD)
+override _LDFLAGS += -latomic
+endif
+
 ifneq ($(MK_WITH_PTHREAD_NP),)
 override _CFLAGS += -DWITH_PTHREAD_NP
 endif

janus/src/plugin.c

@@ -60,6 +60,8 @@
 #include "config.h"
 
 
+static const char *const	default_ice_url = "stun:stun.l.google.com:19302";
+
 static us_config_s		*_g_config = NULL;
 static const useconds_t	_g_watchers_polling = 100000;
 
@@ -670,15 +672,12 @@ static struct janus_plugin_result *_plugin_handle_message(
 		}
 
 	} else if (!strcmp(request_str, "features")) {
-		const char *const stun_host = getenv("JANUS_USTREAMER_STUN_HOST");
-		const char *const stun_port = getenv("JANUS_USTREAMER_STUN_PORT");
+		const char *const ice_url = getenv("JANUS_USTREAMER_WEB_ICE_URL");
 		json_t *const features = json_pack(
-			"{s:b, s:b, s:{s:s, s:i}}",
+			"{s:b, s:b, s:{s:s?}}",
 			"audio", (_g_rtpa != NULL),
 			"mic", (_g_rtpa != NULL && _g_config->aplay_dev_name != NULL),
-			"stun",
-			"host", (stun_host != NULL ? stun_host : ""),
-			"port", (stun_port != NULL ? atoi(stun_port) : 0)
+			"ice", "url", (ice_url != NULL ? ice_url : default_ice_url)
 		);
 		PUSH_STATUS("features", features, NULL);
 		json_decref(features);

man/ustreamer-dump.1

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

man/ustreamer.1

@@ -1,6 +1,6 @@
 .\" Manpage for ustreamer.
 .\" Open an issue or pull request to https://github.com/pikvm/ustreamer to correct errors or typos
-.TH USTREAMER 1 "version 6.32" "November 2020"
+.TH USTREAMER 1 "version 6.36" "November 2020"
 
 .SH NAME
 ustreamer \- stream MJPEG video from any V4L2 device to the network
@@ -52,7 +52,7 @@ Initial image resolution. Default: 640x480.
 .TP
 .BR \-m\ \fIfmt ", " \-\-format\ \fIfmt
 Image format.
-Available: YUYV, YVYU, UYVY, YUV420, YVU420, RGB565, RGB24, JPEG; default: YUYV.
+Available: YUYV, YVYU, UYVY, YUV420, YVU420, RGB565, RGB24, GREY, MJPEG, JPEG; default: YUYV.
 .TP
 .BR \-a\ \fIstd ", " \-\-tv\-standard\ \fIstd
 Force TV standard.

pkg/arch/PKGBUILD

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

pkg/openwrt/Makefile

@@ -6,7 +6,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ustreamer
-PKG_VERSION:=6.32
+PKG_VERSION:=6.36
 PKG_RELEASE:=1
 PKG_MAINTAINER:=Maxim Devaev <mdevaev@gmail.com>
 
@@ -25,7 +25,7 @@ define Package/ustreamer
   SECTION:=multimedia
   CATEGORY:=Multimedia
   TITLE:=uStreamer
-  DEPENDS:=+libpthread +libjpeg +libv4l +libbsd +libevent2 +libevent2-core +libevent2-extra +libevent2-pthreads
+  DEPENDS:=+libatomic +libpthread +libjpeg +libv4l +libbsd +libevent2 +libevent2-core +libevent2-extra +libevent2-pthreads
   URL:=https://github.com/pikvm/ustreamer
 endef
 

python/setup.py

@@ -34,7 +34,7 @@ def main() -> None:
     flags = _find_flags()
     setup(
         name="ustreamer",
-        version="6.32",
+        version="6.36",
         description="uStreamer tools",
         author="Maxim Devaev",
         author_email="mdevaev@gmail.com",

src/Makefile

@@ -14,9 +14,9 @@ _V4P = ustreamer-v4p.bin
 
 _CFLAGS = -MD -c -std=c17 -Wall -Wextra -D_GNU_SOURCE $(CFLAGS)
 
-_USTR_LDFLAGS = $(LDFLAGS) -lm -ljpeg -pthread -lrt -latomic -levent -levent_pthreads
-_DUMP_LDFLAGS = $(LDFLAGS) -lm -ljpeg -pthread -lrt -latomic
-_V4P_LDFLAGS = $(LDFLAGS) -lm -ljpeg -pthread -lrt -latomic
+_USTR_LDFLAGS = $(LDFLAGS) -lm -ljpeg -pthread -lrt -levent -levent_pthreads
+_DUMP_LDFLAGS = $(LDFLAGS) -lm -ljpeg -pthread -lrt
+_V4P_LDFLAGS = $(LDFLAGS) -lm -ljpeg -pthread -lrt
 
 _USTR_SRCS = $(shell ls \
 	libs/*.c \
@@ -46,6 +46,12 @@ _OBJS = $(_USTR_SRCS:%.c=$(_BUILD)/%.o) $(_DUMP_SRCS:%.c=$(_BUILD)/%.o)
 
 
 # =====
+ifneq ($(shell sh -c 'uname 2>/dev/null || echo Unknown'),FreeBSD)
+override _USTR_LDFLAGS += -latomic
+override _DUMP_LDFLAGS += -latomic
+override _V4P_LDFLAGS += -latomic
+endif
+
 ifneq ($(MK_WITH_PYTHON),)
 override _CFLAGS += -DMK_WITH_PYTHON
 endif

src/libs/capture.c

@@ -69,6 +69,7 @@ static const struct {
 	{"UYVY",	V4L2_PIX_FMT_UYVY},
 	{"YUV420",	V4L2_PIX_FMT_YUV420},
 	{"YVU420",	V4L2_PIX_FMT_YVU420},
+	{"GREY",	V4L2_PIX_FMT_GREY},
 	{"RGB565",	V4L2_PIX_FMT_RGB565},
 	{"RGB24",	V4L2_PIX_FMT_RGB24},
 	{"BGR24",	V4L2_PIX_FMT_BGR24},

src/libs/capture.h

@@ -39,7 +39,7 @@
 #define US_VIDEO_MAX_FPS		((uint)120)
 
 #define US_STANDARDS_STR		"PAL, NTSC, SECAM"
-#define US_FORMATS_STR			"YUYV, YVYU, UYVY, YUV420, YVU420, RGB565, RGB24, BGR24, MJPEG, JPEG"
+#define US_FORMATS_STR			"YUYV, YVYU, UYVY, YUV420, YVU420, RGB565, RGB24, BGR24, GREY, MJPEG, JPEG"
 #define US_IO_METHODS_STR		"MMAP, USERPTR"
 
 

src/libs/const.h

@@ -26,7 +26,7 @@
 
 
 #define US_VERSION_MAJOR 6
-#define US_VERSION_MINOR 32
+#define US_VERSION_MINOR 36
 
 #define US_MAKE_VERSION2(_major, _minor) #_major "." #_minor
 #define US_MAKE_VERSION1(_major, _minor) US_MAKE_VERSION2(_major, _minor)

src/libs/drm/drm.c

@@ -28,7 +28,9 @@
 
 #include <sys/mman.h>
 #include <sys/stat.h>
-#include <sys/sysmacros.h>
+#ifdef __linux__
+#	include <sys/sysmacros.h>
+#endif
 
 #include <linux/videodev2.h>
 
@@ -664,6 +666,15 @@ static drmModeModeInfo *_find_best_mode(drmModeConnector *conn, uint width, uint
 			continue; // Discard interlaced
 		}
 		const float mode_hz = _get_refresh_rate(mode);
+		if (width == 640 && height == 416 && mode->hdisplay == 640 && mode->vdisplay == 480) {
+			// A special case for some ancient DOS device with VGA converter.
+			// @CapnKirk in Discord
+			if (hz > 0 && mode_hz < hz) {
+				best = mode;
+				best->vdisplay = 416;
+				break;
+			}
+		}
 		if (mode->hdisplay == width && mode->vdisplay == height) {
 			best = mode; // Any mode with exact resolution
 			if (hz > 0 && mode_hz == hz) {

src/libs/frame.c

@@ -84,6 +84,7 @@ uint us_frame_get_padding(const us_frame_s *frame) {
 	switch (frame->format) {
 		case V4L2_PIX_FMT_YUV420:
 		case V4L2_PIX_FMT_YVU420:
+		case V4L2_PIX_FMT_GREY:
 			bytes_per_pixel = 1;
 			break;
 

src/ustreamer/encoders/cpu/encoder.c

@@ -39,6 +39,7 @@ static void _jpeg_set_dest_frame(j_compress_ptr jpeg, us_frame_s *frame);
 
 static void _jpeg_write_scanlines_yuv(struct jpeg_compress_struct *jpeg, const us_frame_s *frame);
 static void _jpeg_write_scanlines_yuv_planar(struct jpeg_compress_struct *jpeg, const us_frame_s *frame);
+static void _jpeg_write_scanlines_grey(struct jpeg_compress_struct *jpeg, const us_frame_s *frame);
 static void _jpeg_write_scanlines_rgb565(struct jpeg_compress_struct *jpeg, const us_frame_s *frame);
 static void _jpeg_write_scanlines_rgb24(struct jpeg_compress_struct *jpeg, const us_frame_s *frame);
 #ifndef JCS_EXTENSIONS
@@ -75,6 +76,10 @@ void us_cpu_encoder_compress(const us_frame_s *src, us_frame_s *dest, uint quali
 		case V4L2_PIX_FMT_YVU420:
 			jpeg.in_color_space = JCS_YCbCr;
 			break;
+		case V4L2_PIX_FMT_GREY:
+			jpeg.input_components = 1;
+			jpeg.in_color_space = JCS_GRAYSCALE;
+			break;
 #		ifdef JCS_EXTENSIONS
 		case V4L2_PIX_FMT_BGR24:
 			jpeg.in_color_space = JCS_EXT_BGR;
@@ -102,6 +107,10 @@ void us_cpu_encoder_compress(const us_frame_s *src, us_frame_s *dest, uint quali
 		case V4L2_PIX_FMT_YVU420:
 			_jpeg_write_scanlines_yuv_planar(&jpeg, src);
 			break;
+		
+		case V4L2_PIX_FMT_GREY:
+			_jpeg_write_scanlines_grey(&jpeg, src);
+			break;
 
 		case V4L2_PIX_FMT_RGB565:
 			_jpeg_write_scanlines_rgb565(&jpeg, src);
@@ -249,6 +258,30 @@ static void _jpeg_write_scanlines_yuv_planar(struct jpeg_compress_struct *jpeg,
 	free(line_buf);
 }
 
+static void _jpeg_write_scanlines_grey(struct jpeg_compress_struct *jpeg, const us_frame_s *frame) {
+	u8 *line_buf;
+	US_CALLOC(line_buf, frame->width);
+
+	const uint padding = us_frame_get_padding(frame);
+	const u8 *data = frame->data;
+
+	while (jpeg->next_scanline < frame->height) {
+		u8 *ptr = line_buf;
+
+		for (uint x = 0; x < frame->width; ++x) {
+			ptr[0] = data[x];
+			ptr += 1;
+		}
+
+		data += frame->width + padding;
+
+		JSAMPROW scanlines[1] = {line_buf};
+		jpeg_write_scanlines(jpeg, scanlines, 1);
+	}
+
+	free(line_buf);
+}
+
 static void _jpeg_write_scanlines_rgb565(struct jpeg_compress_struct *jpeg, const us_frame_s *frame) {
 	u8 *line_buf;
 	US_CALLOC(line_buf, frame->width * 3);

src/ustreamer/options.c

@@ -138,7 +138,7 @@ static const struct option _LONG_OPTS[] = {
 	{"input",					required_argument,	NULL,	_O_INPUT},
 	{"resolution",				required_argument,	NULL,	_O_RESOLUTION},
 	{"format",					required_argument,	NULL,	_O_FORMAT},
-	{"format-swap-rgb",			required_argument,	NULL,	_O_FORMAT_SWAP_RGB},
+	{"format-swap-rgb",			no_argument,		NULL,	_O_FORMAT_SWAP_RGB},
 	{"tv-standard",				required_argument,	NULL,	_O_TV_STANDARD},
 	{"io-method",				required_argument,	NULL,	_O_IO_METHOD},
 	{"desired-fps",				required_argument,	NULL,	_O_DESIRED_FPS},