Bump version: 5.29 → 5.30

.bumpversion.cfg

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

janus/src/plugin.c

@@ -35,6 +35,7 @@
 #include <pthread.h>
 #include <jansson.h>
 #include <janus/plugins/plugin.h>
+#include <janus/rtcp.h>
 
 #include "uslibs/const.h"
 #include "uslibs/tools.h"
@@ -455,7 +456,7 @@ static struct janus_plugin_result *_plugin_handle_message(
 		json_decref(offer_jsep);
 
 	} else if (!strcmp(request_str, "key_required")) {
-		US_JLOG_INFO("main", "Got keyframe request from a client");
+		// US_JLOG_INFO("main", "Got key_required message");
 		atomic_store(&_g_key_required, true);
 
 	} else {
@@ -471,6 +472,13 @@ static struct janus_plugin_result *_plugin_handle_message(
 #	undef FREE_MSG_JSEP
 }
 
+static void _plugin_incoming_rtcp(UNUSED janus_plugin_session *handle, UNUSED janus_plugin_rtcp *packet) {
+	if (packet->video && janus_rtcp_has_pli(packet->buffer, packet->length)) {
+		// US_JLOG_INFO("main", "Got video PLI");
+		atomic_store(&_g_key_required, true);
+	}
+}
+
 
 // ***** Plugin *****
 
@@ -482,10 +490,6 @@ static const char *_plugin_get_name(void)			{ return US_PLUGIN_NAME; }
 static const char *_plugin_get_author(void)			{ return "Maxim Devaev <mdevaev@gmail.com>"; }
 static const char *_plugin_get_package(void)		{ return US_PLUGIN_PACKAGE; }
 
-static void _plugin_incoming_rtp(UNUSED janus_plugin_session *handle, UNUSED janus_plugin_rtp *packet) {
-	// Just a stub to avoid logging spam about the plugin's purpose
-}
-
 janus_plugin *create(void) {
 #	pragma GCC diagnostic push
 #	pragma GCC diagnostic ignored "-Woverride-init"
@@ -510,7 +514,7 @@ janus_plugin *create(void) {
 		.get_author = _plugin_get_author,
 		.get_package = _plugin_get_package,
 
-		.incoming_rtp = _plugin_incoming_rtp,
+		.incoming_rtcp = _plugin_incoming_rtcp,
 	);
 #	pragma GCC diagnostic pop
 	return &plugin;

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 5.29" "January 2021"
+.TH USTREAMER-DUMP 1 "version 5.30" "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 5.29" "November 2020"
+.TH USTREAMER 1 "version 5.30" "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=5.29
+pkgver=5.30
 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:=5.29
+PKG_VERSION:=5.30
 PKG_RELEASE:=1
 PKG_MAINTAINER:=Maxim Devaev <mdevaev@gmail.com>
 

python/setup.py

@@ -17,7 +17,7 @@ def _find_sources(suffix: str) -> list[str]:
 if __name__ == "__main__":
     setup(
         name="ustreamer",
-        version="5.29",
+        version="5.30",
         description="uStreamer tools",
         author="Maxim Devaev",
         author_email="mdevaev@gmail.com",

src/Makefile

@@ -23,7 +23,7 @@ _USTR_SRCS = $(shell ls \
 	ustreamer/data/*.c \
 	ustreamer/encoders/cpu/*.c \
 	ustreamer/encoders/hw/*.c \
-	ustreamer/h264/*.c \
+	ustreamer/*.c \
 )
 
 _DUMP_LIBS = $(_COMMON_LIBS)

src/libs/const.h

@@ -23,7 +23,7 @@
 #pragma once
 
 #define US_VERSION_MAJOR 5
-#define US_VERSION_MINOR 29
+#define US_VERSION_MINOR 30
 
 #define US_MAKE_VERSION2(_major, _minor) #_major "." #_minor
 #define US_MAKE_VERSION1(_major, _minor) US_MAKE_VERSION2(_major, _minor)

src/ustreamer/h264.c

@@ -20,7 +20,7 @@
 *****************************************************************************/
 
 
-#include "stream.h"
+#include "h264.h"
 
 
 us_h264_stream_s *us_h264_stream_init(us_memsink_s *sink, const char *path, unsigned bitrate, unsigned gop) {

src/ustreamer/h264.h

@@ -26,12 +26,12 @@
 #include <stdatomic.h>
 #include <assert.h>
 
-#include "../../libs/tools.h"
-#include "../../libs/logging.h"
-#include "../../libs/frame.h"
-#include "../../libs/memsink.h"
-#include "../../libs/unjpeg.h"
-#include "../m2m.h"
+#include "../libs/tools.h"
+#include "../libs/logging.h"
+#include "../libs/frame.h"
+#include "../libs/memsink.h"
+#include "../libs/unjpeg.h"
+#include "m2m.h"
 
 
 typedef struct {

src/ustreamer/stream.h

@@ -42,7 +42,7 @@
 #include "device.h"
 #include "encoder.h"
 #include "workers.h"
-#include "h264/stream.h"
+#include "h264.h"
 #ifdef WITH_GPIO
 #	include "gpio/gpio.h"
 #endif