Bump version: 6.44 → 6.45

An alternative implementation of pikvm/ustreamer#304.
Thanks for the idea.

.bumpversion.cfg

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

janus/Makefile

@@ -10,8 +10,8 @@ LDFLAGS ?=
 # =====
 _PLUGIN = libjanus_ustreamer.so
 
-_CFLAGS = -fPIC -MD -c -std=c17 -Wall -Wextra -D_GNU_SOURCE $(shell $(PKG_CONFIG) --cflags glib-2.0) $(CFLAGS)
-_LDFLAGS = -shared -lm -pthread -lrt -ljansson -lopus -lasound -lspeexdsp $(shell $(PKG_CONFIG) --libs glib-2.0) $(LDFLAGS)
+_CFLAGS = -fPIC -MD -c -std=c17 -Wall -Wextra -D_GNU_SOURCE $(shell $(PKG_CONFIG) --cflags janus-gateway) $(CFLAGS)
+_LDFLAGS = -shared -lm -pthread -lrt -ljansson -lopus -lasound -lspeexdsp $(shell $(PKG_CONFIG) --libs janus-gateway) $(LDFLAGS)
 
 _SRCS = $(shell ls src/uslibs/*.c src/*.c)
 

janus/src/acap.c

@@ -47,19 +47,6 @@ static void *_pcm_thread(void *v_acap);
 static void *_encoder_thread(void *v_acap);
 
 
-bool us_acap_probe(const char *name) {
-	snd_pcm_t *dev;
-	int err;
-	US_JLOG_INFO("acap", "Probing PCM capture ...");
-	if ((err = snd_pcm_open(&dev, name, SND_PCM_STREAM_CAPTURE, 0)) < 0) {
-		US_JLOG_PERROR_ALSA(err, "acap", "Can't probe PCM capture");
-		return false;
-	}
-	snd_pcm_close(dev);
-	US_JLOG_INFO("acap", "PCM capture is available");
-	return true;
-}
-
 us_acap_s *us_acap_init(const char *name, uint pcm_hz) {
 	us_acap_s *acap;
 	US_CALLOC(acap, 1);

janus/src/acap.h

@@ -53,8 +53,6 @@ typedef struct {
 } us_acap_s;
 
 
-bool us_acap_probe(const char *name);
-
 us_acap_s *us_acap_init(const char *name, uint pcm_hz);
 void us_acap_destroy(us_acap_s *acap);
 

janus/src/au.c

@@ -23,10 +23,78 @@
 #include "au.h"
 
 #include <stdlib.h>
+#include <string.h>
+#include <ctype.h>
+
+#include <sys/stat.h>
 
 #include "uslibs/tools.h"
 
 
+bool us_au_probe(const char *name) {
+	// This function is very limited. It takes something like:
+	//   hw:0,0 or hw:tc358743,0 or plughw:UAC2Gadget,0
+	// parses card name (0, tc358743, UAC2Gadget) and checks
+	// the existence of it in /proc/asound/.
+	// It's enough for our case.
+
+	if (name == NULL) {
+		return false;
+	}
+
+	if (strchr(name, '/') || strchr(name, '.')) {
+		return false;
+	}
+
+	const char *begin = strchr(name, ':');
+	if (begin == NULL) {
+		return false;
+	}
+	begin += 1;
+	if (*begin == '\0') {
+		return false;
+	}
+
+	const char *end = strchr(begin, ',');
+	if (end == NULL) {
+		return false;
+	}
+	if (end - begin < 1) {
+		return false;
+	}
+
+	char *card = us_strdup(begin);
+	card[end - begin] = '\0';
+
+	bool numeric = true;
+	for (uz index = 0; card[index] != '\0'; ++index) {
+		if (!isdigit(card[index])) {
+			numeric = false;
+			break;
+		}
+	}
+
+	char *path;
+	if (numeric) {
+		US_ASPRINTF(path, "/proc/asound/card%s", card);
+	} else {
+		US_ASPRINTF(path, "/proc/asound/%s", card);
+	}
+
+	bool ok = false;
+	struct stat st;
+	if (lstat(path, &st) == 0) {
+		if (numeric && S_ISDIR(st.st_mode)) {
+			ok = true;
+		} else if (!numeric && S_ISLNK(st.st_mode)) {
+			ok = true;
+		}
+	}
+	free(path);
+	free(card);
+	return ok;
+}
+
 us_au_pcm_s *us_au_pcm_init(void) {
 	us_au_pcm_s *pcm;
 	US_CALLOC(pcm, 1);

janus/src/au.h

@@ -51,6 +51,7 @@ typedef struct {
 	u64		pts;
 } us_au_encoded_s;
 
+bool us_au_probe(const char *name);
 
 us_au_pcm_s *us_au_pcm_init(void);
 void us_au_pcm_destroy(us_au_pcm_s *pcm);

janus/src/config.c

@@ -24,11 +24,11 @@
 
 #include <stdlib.h>
 #include <string.h>
-#include <unistd.h>
 
 #include <janus/config.h>
 #include <janus/plugins/plugin.h>
 
+#include "uslibs/types.h"
 #include "uslibs/tools.h"
 
 #include "const.h"
@@ -36,6 +36,7 @@
 
 
 static char *_get_value(janus_config *jcfg, const char *section, const char *option);
+static uint _get_uint(janus_config *jcfg, const char *section, const char *option, uint def);
 // static bool _get_bool(janus_config *jcfg, const char *section, const char *option, bool def);
 
 
@@ -61,20 +62,13 @@ us_config_s *us_config_init(const char *config_dir_path) {
 		goto error;
 	}
 	if ((config->acap_dev_name = _get_value(jcfg, "acap", "device")) != NULL) {
-		if ((config->tc358743_dev_path = _get_value(jcfg, "acap", "tc358743")) == NULL) {
-			US_JLOG_INFO("config", "Missing config value: acap.tc358743");
+		config->acap_hz = _get_uint(jcfg, "acap", "sampling_rate", 0);
+		config->tc358743_dev_path = _get_value(jcfg, "acap", "tc358743");
+		if (config->acap_hz == 0 && config->tc358743_dev_path == NULL) {
+			US_JLOG_ERROR("config", "Either acap.sampling_rate or acap.tc358743 required");
 			goto error;
 		}
-		if ((config->aplay_dev_name = _get_value(jcfg, "aplay", "device")) != NULL) {
-			char *path = _get_value(jcfg, "aplay", "check");
-			if (path != NULL) {
-				if (access(path, F_OK) != 0) {
-					US_JLOG_INFO("config", "No check file found, aplay will be disabled");
-					US_DELETE(config->aplay_dev_name, free);
-				}
-				US_DELETE(path, free);
-			}
-		}
+		config->aplay_dev_name = _get_value(jcfg, "aplay", "device");
 	}
 
 	goto ok;
@@ -105,6 +99,20 @@ static char *_get_value(janus_config *jcfg, const char *section, const char *opt
 	return us_strdup(option_obj->value);
 }
 
+static uint _get_uint(janus_config *jcfg, const char *section, const char *option, uint def) {
+	char *const tmp = _get_value(jcfg, section, option);
+	uint value = def;
+	if (tmp != NULL) {
+		errno = 0;
+		value = (uint)strtoul(tmp, NULL, 10);
+		if (errno != 0) {
+			value = def;
+		}
+		free(tmp);
+	}
+	return value;
+}
+
 /*static bool _get_bool(janus_config *jcfg, const char *section, const char *option, bool def) {
 	char *const tmp = _get_value(jcfg, section, option);
 	bool value = def;

janus/src/config.h

@@ -23,10 +23,14 @@
 #pragma once
 
 
+#include "uslibs/types.h"
+
+
 typedef struct {
 	char	*video_sink_name;
 
 	char	*acap_dev_name;
+	uint	acap_hz;
 	char	*tc358743_dev_path;
 
 	char	*aplay_dev_name;

janus/src/plugin.c

@@ -69,7 +69,7 @@ static us_janus_client_s	*_g_clients = NULL;
 static janus_callbacks		*_g_gw = NULL;
 static us_ring_s			*_g_video_ring = NULL;
 static us_rtpv_s			*_g_rtpv = NULL;
-static us_rtpa_s			*_g_rtpa = NULL; // Also indicates "audio capture is available"
+static us_rtpa_s			*_g_rtpa = NULL;
 
 static pthread_t		_g_video_rtp_tid;
 static atomic_bool		_g_video_rtp_tid_created = false;
@@ -214,7 +214,15 @@ static void *_video_sink_thread(void *arg) {
 	return NULL;
 }
 
-static int _check_tc358743_acap(uint *hz) {
+static int _get_acap_hz(uint *hz) {
+	if (_g_config->acap_hz != 0) {
+		*hz = _g_config->acap_hz;
+		return 0;
+	}
+	if (_g_config->tc358743_dev_path == NULL) {
+		US_JLOG_ERROR("acap", "No configured sampling rate");
+		return -1;
+	}
 	int fd;
 	if ((fd = open(_g_config->tc358743_dev_path, O_RDWR)) < 0) {
 		US_JLOG_PERROR("acap", "Can't open TC358743 V4L2 device");
@@ -236,7 +244,6 @@ static void *_acap_thread(void *arg) {
 	atomic_store(&_g_acap_tid_created, true);
 
 	assert(_g_config->acap_dev_name != NULL);
-	assert(_g_config->tc358743_dev_path != NULL);
 	assert(_g_rtpa != NULL);
 
 	int once = 0;
@@ -250,7 +257,11 @@ static void *_acap_thread(void *arg) {
 		uint hz = 0;
 		us_acap_s *acap = NULL;
 
-		if (_check_tc358743_acap(&hz) < 0) {
+		if (!us_au_probe(_g_config->acap_dev_name)) {
+			US_ONCE({ US_JLOG_ERROR("acap", "No PCM capture device"); });
+			goto close_acap;
+		}
+		if (_get_acap_hz(&hz) < 0) {
 			goto close_acap;
 		}
 		if (hz == 0) {
@@ -265,7 +276,7 @@ static void *_acap_thread(void *arg) {
 		once = 0;
 
 		while (!_STOP && _HAS_WATCHERS && _HAS_LISTENERS) {
-			if (_check_tc358743_acap(&hz) < 0 || acap->pcm_hz != hz) {
+			if (_get_acap_hz(&hz) < 0 || acap->pcm_hz != hz) {
 				goto close_acap;
 			}
 			uz size = US_RTP_DATAGRAM_SIZE - US_RTP_HEADER_SIZE;
@@ -339,6 +350,11 @@ static void *_aplay_thread(void *arg) {
 			}
 
 			if (dev == NULL) {
+				if (!us_au_probe(_g_config->aplay_dev_name)) {
+					US_ONCE({ US_JLOG_ERROR("aplay", "No PCM playback device"); });
+					goto close_aplay;
+				}
+
 				int err = snd_pcm_open(&dev, _g_config->aplay_dev_name, SND_PCM_STREAM_PLAYBACK, 0);
 				if (err < 0) {
 					US_ONCE({ US_JLOG_PERROR_ALSA(err, "aplay", "Can't open PCM playback"); });
@@ -424,7 +440,7 @@ static int _plugin_init(janus_callbacks *gw, const char *config_dir_path) {
 
 	US_RING_INIT_WITH_ITEMS(_g_video_ring, 64, us_frame_init);
 	_g_rtpv = us_rtpv_init(_relay_rtp_clients);
-	if (_g_config->acap_dev_name != NULL && us_acap_probe(_g_config->acap_dev_name)) {
+	if (_g_config->acap_dev_name != NULL) {
 		_g_rtpa = us_rtpa_init(_relay_rtp_clients);
 		US_THREAD_CREATE(_g_acap_tid, _acap_thread, NULL);
 		if (_g_config->aplay_dev_name != NULL) {
@@ -602,13 +618,13 @@ static struct janus_plugin_result *_plugin_handle_message(
 				{
 					json_t *const obj = json_object_get(params, "audio");
 					if (obj != NULL && json_is_boolean(obj)) {
-						with_acap = (_g_rtpa != NULL && json_boolean_value(obj));
+						with_acap = (us_au_probe(_g_config->acap_dev_name) && json_boolean_value(obj));
 					}
 				}
 				{
 					json_t *const obj = json_object_get(params, "mic");
 					if (obj != NULL && json_is_boolean(obj)) {
-						with_aplay = (_g_config->aplay_dev_name != NULL && with_acap && json_boolean_value(obj));
+						with_aplay = (us_au_probe(_g_config->aplay_dev_name) && json_boolean_value(obj));
 					}
 				}
 				{
@@ -673,10 +689,11 @@ static struct janus_plugin_result *_plugin_handle_message(
 
 	} else if (!strcmp(request_str, "features")) {
 		const char *const ice_url = getenv("JANUS_USTREAMER_WEB_ICE_URL");
+		const bool acap_avail = us_au_probe(_g_config->acap_dev_name);
 		json_t *const features = json_pack(
 			"{s:b, s:b, s:{s:s?}}",
-			"audio", (_g_rtpa != NULL),
-			"mic", (_g_rtpa != NULL && _g_config->aplay_dev_name != NULL),
+			"audio", acap_avail,
+			"mic", (acap_avail && us_au_probe(_g_config->aplay_dev_name)),
 			"ice", "url", (ice_url != NULL ? ice_url : default_ice_url)
 		);
 		PUSH_STATUS("features", features, NULL);

janus/src/rtpa.c

@@ -54,6 +54,8 @@ char *us_rtpa_make_sdp(us_rtpa_s *rtpa, bool mic) {
 		"a=rtcp-fb:%u nack" RN
 		"a=rtcp-fb:%u nack pli" RN
 		"a=rtcp-fb:%u goog-remb" RN
+		"a=mid:a" RN
+		"a=msid:audio a" RN
 		"a=ssrc:%" PRIu32 " cname:ustreamer" RN
 		"a=%s" RN,
 		pl, pl,

janus/src/rtpv.c

@@ -69,6 +69,8 @@ char *us_rtpv_make_sdp(us_rtpv_s *rtpv) {
 		"a=rtcp-fb:%u nack" RN
 		"a=rtcp-fb:%u nack pli" RN
 		"a=rtcp-fb:%u goog-remb" RN
+		"a=mid:v" RN
+		"a=msid:video v" RN
 		"a=ssrc:%" PRIu32 " cname:ustreamer" RN
 		"a=extmap:1 http://www.webrtc.org/experiments/rtp-hdrext/playout-delay" RN
 		"a=extmap:2 urn:3gpp:video-orientation" RN

linters/mypy.ini

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

linters/tox.ini

@@ -3,7 +3,7 @@ envlist = cppcheck, flake8, pylint, mypy, vulture, htmlhint
 skipsdist = true
 
 [testenv]
-basepython = python3.13
+basepython = python3.14
 changedir = /src
 
 [testenv:cppcheck]

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.40" "January 2021"
+.TH USTREAMER-DUMP 1 "version 6.45" "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.40" "November 2020"
+.TH USTREAMER 1 "version 6.45" "November 2020"
 
 .SH NAME
 ustreamer \- stream MJPEG video from any V4L2 device to the network

pkg/arch/PKGBUILD

@@ -3,7 +3,7 @@
 
 
 pkgname=ustreamer
-pkgver=6.40
+pkgver=6.45
 pkgrel=1
 pkgdesc="Lightweight and fast MJPEG-HTTP streamer"
 url="https://github.com/pikvm/ustreamer"
@@ -18,7 +18,7 @@ md5sums=(SKIP)
 _options="WITH_GPIO=1 WITH_SYSTEMD=1"
 if [ -e /usr/bin/python3 ]; then
 	_options="$_options WITH_PYTHON=1"
-	depends+=("python>=3.13" "python<3.14")
+	depends+=("python>=3.14" "python<3.15")
 	makedepends+=(python-setuptools python-pip python-build python-wheel)
 fi
 if [ -e /usr/include/janus/plugins/plugin.h ];then

pkg/openwrt/Makefile

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

python/setup.py

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

src/libs/const.h

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

src/libs/frame.c

@@ -36,7 +36,7 @@
 us_frame_s *us_frame_init(void) {
 	us_frame_s *frame;
 	US_CALLOC(frame, 1);
-	us_frame_realloc_data(frame, 512 * 1024);
+	us_frame_realloc_data(frame, 32 * 1024);
 	frame->dma_fd = -1;
 	return frame;
 }

src/ustreamer/encoder.c

@@ -131,7 +131,7 @@ void us_encoder_open(us_encoder_s *enc, us_capture_s *cap) {
 		} else {
 			US_LOG_INFO("Switching to CPU encoder: the input format is not (M)JPEG ...");
 			type = US_ENCODER_TYPE_CPU;
-			quality = cap->jpeg_quality;
+			quality = cap->jpeg_quality; // cppcheck-suppress redundantAssignment
 		}
 
 	} else if (type == US_ENCODER_TYPE_M2M_VIDEO || type == US_ENCODER_TYPE_M2M_IMAGE) {

src/v4p/main.c

@@ -242,7 +242,7 @@ static void _main_loop(void) {
 	us_drm_destroy(drm);
 }
 
-static void *_follower_thread(void *v_unix_follow) {
+static void *_follower_thread(void *v_unix_follow) { // cppcheck-suppress constParameterCallback
 	US_THREAD_SETTLE("follower");
 	const char *path = v_unix_follow;
 	assert(path != NULL);