Bump version: 6.55 → 6.56

With this change, it's possible to use ustreamer to handle 4k HDMI input
on RK3588-based boards (tested on Orange Pi 5+ and Radxa ROCK 5B+).

.bumpversion.cfg

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

janus/src/plugin.c

@@ -719,11 +719,15 @@ static void _plugin_incoming_rtp(janus_plugin_session *session, janus_plugin_rtp
 
 static void _plugin_incoming_rtcp(janus_plugin_session *session, janus_plugin_rtcp *packet) {
 	_IF_DISABLED({ return; });
-	if (session == NULL || packet == NULL || !packet->video) {
+	if (session == NULL || packet == NULL /*|| !packet->video*/) {
+		// FIXME: Since Chromium 147 we can't distinguish video/audio packets
+		// so we just disable !package->video condition for now.
 		return; // Accept only valid video
 	}
-	if (janus_rtcp_has_pli(packet->buffer, packet->length)) {
+	if (
-		// US_JLOG_INFO("main", "Got video PLI");
+		janus_rtcp_has_pli(packet->buffer, packet->length)
+		|| janus_rtcp_has_fir(packet->buffer, packet->length)
+	) {
 		atomic_store(&_g_key_required, true);
 	}
 }

janus/src/rtp.h

@@ -27,13 +27,13 @@
 
 // Max RTP size for WebRTC is 1200 bytes:
 //   - https://stackoverflow.com/questions/47635545/why-webrtc-chose-rtp-max-packet-size-to-1200-bytes
-// But(!) Tailscale has 1200 MTU. So to fit it required to substract:
+// But(!) Tailscale has 1280 MTU. So to fit it required to subtract:
 // 1. possible RTP extensions (see sdp.c)
 // 2. additional SRTP fields (>= 10 bytes)
 // 3. UDP header (8 bytes)
 // 4. IPv6 header (40 bytes)
-// Finally it looks like 100 bytes for all above should be enough
+// Finally it looks like below value should be good enought for all cases
-#define US_RTP_TOTAL_SIZE		(1200 - 100)
+#define US_RTP_TOTAL_SIZE		1150
 #define US_RTP_HEADER_SIZE		12
 #define US_RTP_PAYLOAD_SIZE		(US_RTP_TOTAL_SIZE - US_RTP_HEADER_SIZE)
 

janus/src/sdp.c

@@ -46,6 +46,7 @@ char *us_sdp_create(us_rtpv_s *rtpv, us_rtpa_s *rtpa, bool mic) {
 			"c=IN IP4 0.0.0.0" RN
 			"a=rtpmap:%u H264/90000" RN
 			"a=fmtp:%u profile-level-id=42E01F;packetization-mode=1" RN
+			"a=rtcp-fb:%u ccm fir" RN
 			"a=rtcp-fb:%u nack" RN
 			"a=rtcp-fb:%u nack pli" RN
 			"a=rtcp-fb:%u goog-remb" RN
@@ -56,7 +57,7 @@ char *us_sdp_create(us_rtpv_s *rtpv, us_rtpa_s *rtpa, bool mic) {
 			"a=extmap:2/sendonly http://www.webrtc.org/experiments/rtp-hdrext/playout-delay" RN
 			"a=extmap:3/sendonly http://www.webrtc.org/experiments/rtp-hdrext/abs-capture-time" RN
 			"a=sendonly" RN,
-			pl, pl, pl, pl, pl, pl,
+			pl, pl, pl, pl, pl, pl, pl,
 			rtpv->rtp->ssrc);
 	}
 
@@ -71,16 +72,13 @@ char *us_sdp_create(us_rtpv_s *rtpv, us_rtpa_s *rtpa, bool mic) {
 			"c=IN IP4 0.0.0.0" RN
 			"a=rtpmap:%u OPUS/%u/%u" RN
 			"a=fmtp:%u sprop-stereo=1" RN // useinbandfec=1
-			"a=rtcp-fb:%u nack" RN
-			"a=rtcp-fb:%u nack pli" RN
-			"a=rtcp-fb:%u goog-remb" RN
 			"a=mid:a" RN
 			"a=msid:audio a" RN
 			"a=ssrc:%" PRIu32 " cname:ustreamer" RN
 			"a=%s" RN,
 			pl, pl,
 			US_RTP_OPUS_HZ, US_RTP_OPUS_CH,
-			pl, pl, pl, pl,
+			pl,
 			rtpa->rtp->ssrc,
 			(mic ? "sendrecv" : "sendonly"));
 	}

linters/tox.ini

@@ -37,7 +37,7 @@ deps =
 
 [testenv:mypy]
 allowlist_externals = bash
-commands = bash -c 'mypy --config-file=linters/mypy.ini tools/*.py python/*.py'
+commands = bash -c 'mypy --config-file=linters/mypy.ini --cache-dir=/dev/null tools/*.py python/*.py'
 deps =
 	mypy
 

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.55" "January 2021"
+.TH USTREAMER-DUMP 1 "version 6.56" "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.55" "November 2020"
+.TH USTREAMER 1 "version 6.56" "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.55
+pkgver=6.56
 pkgrel=1
 pkgdesc="Lightweight and fast MJPEG-HTTP streamer"
 url="https://github.com/pikvm/ustreamer"

pkg/openwrt/Makefile

@@ -9,7 +9,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ustreamer
-PKG_VERSION:=6.55
+PKG_VERSION:=6.56
 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.55",
+        version="6.56",
         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 55
+#define US_VERSION_MINOR 56
 
 #define US_MAKE_VERSION2(_major, _minor) #_major "." #_minor
 #define US_MAKE_VERSION1(_major, _minor) US_MAKE_VERSION2(_major, _minor)

src/libs/memsinksh.c

@@ -61,7 +61,7 @@ uz us_memsink_calculate_size(const char *obj) {
 		} else if (!strcasecmp(ptr, "h264")) {
 			return 2 * 1024 * 1024;
 		} else if (!strcasecmp(ptr, "raw")) {
-			return 1920 * 1200 * 3; // RGB
+			return 3840 * 2160 * 3; // RGB
 		}
 	}
 	return 0;

src/libs/memsinksh.h

@@ -27,7 +27,7 @@
 
 
 #define US_MEMSINK_MAGIC	((u64)0xCAFEBABECAFEBABE)
-#define US_MEMSINK_VERSION	((u32)7)
+#define US_MEMSINK_VERSION	((u32)8)
 
 
 typedef struct {