mirror of
https://github.com/pikvm/ustreamer.git
synced 2026-11-05 04:24:21 +00:00
Compare commits
6 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
db87e03ce7 | ||
|
|
27096fc20c | ||
|
|
84dc156b4a | ||
|
|
f627948a04 | ||
|
|
72bfd68514 | ||
|
|
6273fc187a |
@@ -171,11 +171,17 @@ void us_janus_client_recv(us_janus_client_s *client, janus_plugin_rtp *packet) {
|
||||
retry = true;
|
||||
// fall through
|
||||
case US_RUR_DEPACKETIZATION_FAILED:
|
||||
client->last_key_req_ts = us_get_now_monotonic();
|
||||
client->gw->send_pli(client->session);
|
||||
break;
|
||||
}
|
||||
} while (retry);
|
||||
}
|
||||
const ldf now_ts = us_get_now_monotonic();
|
||||
if (client->last_key_req_ts + 2 < now_ts) {
|
||||
client->last_key_req_ts = now_ts;
|
||||
client->gw->send_pli(client->session);
|
||||
}
|
||||
} else {
|
||||
if (header->type == US_RTP_OPUS_PAYLOAD && atomic_load(&client->transmit_aplay)) {
|
||||
if (seq >= client->aplay_seq_next || (client->aplay_seq_next - seq) > 50) {
|
||||
|
||||
@@ -64,6 +64,8 @@ typedef struct {
|
||||
us_rtpc_s *rtpc;
|
||||
us_ring_s *vplay_enc_ring;
|
||||
|
||||
ldf last_key_req_ts;
|
||||
|
||||
US_LIST_DECLARE;
|
||||
} us_janus_client_s;
|
||||
|
||||
|
||||
@@ -5,7 +5,8 @@
|
||||
# This source file based on code of Janys-Gateway. #
|
||||
# #
|
||||
# Copyright (C) Lorenzo Miniero <lorenzo@meetecho.com> #
|
||||
# Copyright (C) 2018-2024 Maxim Devaev <mdevaev@gmail.com> #
|
||||
# Copyright (C) 2026 Maxim Devaev <mdevaev@gmail.com> #
|
||||
# Copyright (C) 2026 Sergey Radionov <rsatom@gmail.com> #
|
||||
# #
|
||||
# This program is free software: you can redistribute it and/or modify #
|
||||
# it under the terms of the GNU General Public License as published by #
|
||||
|
||||
@@ -2,7 +2,8 @@
|
||||
# #
|
||||
# uStreamer - Lightweight and fast MJPEG-HTTP streamer. #
|
||||
# #
|
||||
# Copyright (C) 2018-2024 Maxim Devaev <mdevaev@gmail.com> #
|
||||
# Copyright (C) 2026 Maxim Devaev <mdevaev@gmail.com> #
|
||||
# Copyright (C) 2026 Sergey Radionov <rsatom@gmail.com> #
|
||||
# #
|
||||
# This program is free software: you can redistribute it and/or modify #
|
||||
# it under the terms of the GNU General Public License as published by #
|
||||
|
||||
@@ -545,14 +545,14 @@ static void *_vplay_thread(void *arg) {
|
||||
frame = _g_vplay_ring->items[in_ri];
|
||||
_g_vplay_ring->items[in_ri] = tmp_frame;
|
||||
us_ring_consumer_release(_g_vplay_ring, in_ri);
|
||||
} else {
|
||||
/*} else { // FIXME: Leads to spam with "Streaming to the camera ..."
|
||||
US_ONCE({
|
||||
_LOCK_VPLAY;
|
||||
if (_g_camera.active) {
|
||||
US_LOG_INFO("No frames have got from WebRTC");
|
||||
}
|
||||
_UNLOCK_VPLAY;
|
||||
});
|
||||
});*/
|
||||
}
|
||||
} else {
|
||||
usleep(1000); // Don't iterate too frequently
|
||||
|
||||
@@ -2,7 +2,8 @@
|
||||
# #
|
||||
# uStreamer - Lightweight and fast MJPEG-HTTP streamer. #
|
||||
# #
|
||||
# Copyright (C) 2018-2024 Maxim Devaev <mdevaev@gmail.com> #
|
||||
# Copyright (C) 2026 Maxim Devaev <mdevaev@gmail.com> #
|
||||
# Copyright (C) 2026 Sergey Radionov <rsatom@gmail.com> #
|
||||
# #
|
||||
# This program is free software: you can redistribute it and/or modify #
|
||||
# it under the terms of the GNU General Public License as published by #
|
||||
|
||||
@@ -2,7 +2,8 @@
|
||||
# #
|
||||
# uStreamer - Lightweight and fast MJPEG-HTTP streamer. #
|
||||
# #
|
||||
# Copyright (C) 2018-2024 Maxim Devaev <mdevaev@gmail.com> #
|
||||
# Copyright (C) 2026 Maxim Devaev <mdevaev@gmail.com> #
|
||||
# Copyright (C) 2026 Sergey Radionov <rsatom@gmail.com> #
|
||||
# #
|
||||
# This program is free software: you can redistribute it and/or modify #
|
||||
# it under the terms of the GNU General Public License as published by #
|
||||
|
||||
@@ -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.63" "January 2021"
|
||||
.TH USTREAMER-DUMP 1 "version 6.65" "January 2021"
|
||||
|
||||
.SH NAME
|
||||
ustreamer-dump \- Dump uStreamer's memory sink to file
|
||||
|
||||
@@ -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.63" "November 2020"
|
||||
.TH USTREAMER 1 "version 6.65" "November 2020"
|
||||
|
||||
.SH NAME
|
||||
ustreamer \- stream MJPEG video from any V4L2 device to the network
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
|
||||
|
||||
pkgname=ustreamer
|
||||
pkgver=6.63
|
||||
pkgver=6.65
|
||||
pkgrel=1
|
||||
pkgdesc="Lightweight and fast MJPEG-HTTP streamer"
|
||||
url="https://github.com/pikvm/ustreamer"
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
include $(TOPDIR)/rules.mk
|
||||
|
||||
PKG_NAME:=ustreamer
|
||||
PKG_VERSION:=6.63
|
||||
PKG_VERSION:=6.65
|
||||
PKG_RELEASE:=1
|
||||
PKG_MAINTAINER:=Maxim Devaev <mdevaev@gmail.com>
|
||||
|
||||
|
||||
@@ -34,7 +34,7 @@ def main() -> None:
|
||||
flags = _find_flags()
|
||||
setup(
|
||||
name="ustreamer",
|
||||
version="6.63",
|
||||
version="6.65",
|
||||
description="uStreamer tools",
|
||||
author="Maxim Devaev",
|
||||
author_email="mdevaev@gmail.com",
|
||||
|
||||
@@ -26,7 +26,7 @@
|
||||
|
||||
|
||||
#define US_VERSION_MAJOR 6
|
||||
#define US_VERSION_MINOR 63
|
||||
#define US_VERSION_MINOR 65
|
||||
|
||||
#define US_MAKE_VERSION2(_major, _minor) #_major "." #_minor
|
||||
#define US_MAKE_VERSION1(_major, _minor) US_MAKE_VERSION2(_major, _minor)
|
||||
|
||||
@@ -25,7 +25,7 @@
|
||||
#include <string.h>
|
||||
#include <signal.h>
|
||||
|
||||
#if defined(__GLIBC__) && __GLIBC__ >= 2 && __GLIBC_MINOR__ >= 32
|
||||
#if defined(_GNU_SOURCE) && defined(__GLIBC__) && __GLIBC__ >= 2 && __GLIBC_MINOR__ >= 32
|
||||
# define HAS_SIGABBREV_NP
|
||||
#endif
|
||||
|
||||
|
||||
Reference in New Issue
Block a user