Bump version: 6.54 → 6.55

.bumpversion.cfg

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

janus/src/rtp.h

@@ -27,8 +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
-// We take this and substract 50 bytes for possible RTP extensions, see sdp.c
+// But(!) Tailscale has 1200 MTU. So to fit it required to substract:
-#define US_RTP_TOTAL_SIZE		(1200 - 50)
+// 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
+#define US_RTP_TOTAL_SIZE		(1200 - 100)
 #define US_RTP_HEADER_SIZE		12
 #define US_RTP_PAYLOAD_SIZE		(US_RTP_TOTAL_SIZE - US_RTP_HEADER_SIZE)
 

janus/src/rtpv.c

@@ -106,6 +106,7 @@ void _rtpv_process_nalu(us_rtpv_s *rtpv, const u8 *data, uz size, u32 pts, bool
 	u8 *dg = rtpv->rtp->datagram;
 
 	// Set *_of_frame flags only for non-SPS/PPS packages
+/*
 #	define CALL_FOR_SERVICE { \
 			const bool m_fof = rtpv->rtp->first_of_frame; \
 			const bool m_lof = rtpv->rtp->last_of_frame; \
@@ -115,18 +116,19 @@ void _rtpv_process_nalu(us_rtpv_s *rtpv, const u8 *data, uz size, u32 pts, bool
 			rtpv->rtp->first_of_frame = m_fof; \
 			rtpv->rtp->last_of_frame = m_lof; \
 		}
+*/
 
 	if (size + US_RTP_HEADER_SIZE <= US_RTP_TOTAL_SIZE) {
 		us_rtp_write_header(rtpv->rtp, pts, marked);
 		memcpy(dg + US_RTP_HEADER_SIZE, data, size);
 		rtpv->rtp->used = size + US_RTP_HEADER_SIZE;
-		if (type == 7 || type == 8) {
+//		if (type == 7 || type == 8) {
-			CALL_FOR_SERVICE;
+//			CALL_FOR_SERVICE;
-		} else {
+//		} else {*/
 			rtpv->rtp->last_of_frame = true;
 			rtpv->callback(rtpv->rtp);
 			rtpv->rtp->first_of_frame = false;
-		}
+//		}
 		return;
 	}
 
@@ -158,13 +160,13 @@ void _rtpv_process_nalu(us_rtpv_s *rtpv, const u8 *data, uz size, u32 pts, bool
 
 		memcpy(dg + fu_overhead, src, frag_size);
 		rtpv->rtp->used = fu_overhead + frag_size;
-		if (type == 7 || type == 8) {
+//		if (type == 7 || type == 8) {
-			CALL_FOR_SERVICE;
+//			CALL_FOR_SERVICE;
-		} else {
+//		} else {
 			rtpv->rtp->last_of_frame = last;
 			rtpv->callback(rtpv->rtp);
 			rtpv->rtp->first_of_frame = false;
-		}
+//		}
 
 		src += frag_size;
 		remaining -= frag_size;

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.53" "January 2021"
+.TH USTREAMER-DUMP 1 "version 6.55" "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.53" "November 2020"
+.TH USTREAMER 1 "version 6.55" "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.53
+pkgver=6.55
 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.53
+PKG_VERSION:=6.55
 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.53",
+        version="6.55",
         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 53
+#define US_VERSION_MINOR 55
 
 #define US_MAKE_VERSION2(_major, _minor) #_major "." #_minor
 #define US_MAKE_VERSION1(_major, _minor) US_MAKE_VERSION2(_major, _minor)