mirror of
https://github.com/pikvm/ustreamer.git
synced 2026-02-28 20:56:33 +00:00
Compare commits
3 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
8f0acb2176 | ||
|
|
8edeff8160 | ||
|
|
cacec0d25c |
@@ -1,7 +1,7 @@
|
|||||||
[bumpversion]
|
[bumpversion]
|
||||||
commit = True
|
commit = True
|
||||||
tag = True
|
tag = True
|
||||||
current_version = 5.56
|
current_version = 5.57
|
||||||
parse = (?P<major>\d+)\.(?P<minor>\d+)
|
parse = (?P<major>\d+)\.(?P<minor>\d+)
|
||||||
serialize =
|
serialize =
|
||||||
{major}.{minor}
|
{major}.{minor}
|
||||||
|
|||||||
4
Makefile
4
Makefile
@@ -36,8 +36,8 @@ endif
|
|||||||
|
|
||||||
apps:
|
apps:
|
||||||
$(MAKE) -C src
|
$(MAKE) -C src
|
||||||
for i in src/ustreamer.bin src/ustreamer-*.bin; do \
|
for i in src/*.bin; do \
|
||||||
test ! -x $$i || ln -sf $$i .; \
|
test ! -x $$i || ln -sf $$i `basename $$i .bin`; \
|
||||||
done
|
done
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -170,7 +170,7 @@ int us_audio_get_encoded(us_audio_s *audio, uint8_t *data, size_t *size, uint64_
|
|||||||
if (ri < 0) {
|
if (ri < 0) {
|
||||||
return -2;
|
return -2;
|
||||||
}
|
}
|
||||||
_enc_buffer_s *const buf = audio->enc_ring->items[ri];
|
const _enc_buffer_s *const buf = audio->enc_ring->items[ri];
|
||||||
if (*size < buf->used) {
|
if (*size < buf->used) {
|
||||||
us_ring_consumer_release(audio->enc_ring, ri);
|
us_ring_consumer_release(audio->enc_ring, ri);
|
||||||
return -3;
|
return -3;
|
||||||
|
|||||||
@@ -107,7 +107,7 @@ static void *_video_rtp_thread(void *arg) {
|
|||||||
while (!_STOP) {
|
while (!_STOP) {
|
||||||
const int ri = us_ring_consumer_acquire(_g_video_ring, 0.1);
|
const int ri = us_ring_consumer_acquire(_g_video_ring, 0.1);
|
||||||
if (ri >= 0) {
|
if (ri >= 0) {
|
||||||
us_frame_s *frame = _g_video_ring->items[ri];
|
const us_frame_s *const frame = _g_video_ring->items[ri];
|
||||||
_LOCK_VIDEO;
|
_LOCK_VIDEO;
|
||||||
const bool zero_playout_delay = (frame->gop == 0);
|
const bool zero_playout_delay = (frame->gop == 0);
|
||||||
us_rtpv_wrap(_g_rtpv, frame, zero_playout_delay);
|
us_rtpv_wrap(_g_rtpv, frame, zero_playout_delay);
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
.\" Manpage for ustreamer-dump.
|
.\" Manpage for ustreamer-dump.
|
||||||
.\" Open an issue or pull request to https://github.com/pikvm/ustreamer to correct errors or typos
|
.\" Open an issue or pull request to https://github.com/pikvm/ustreamer to correct errors or typos
|
||||||
.TH USTREAMER-DUMP 1 "version 5.56" "January 2021"
|
.TH USTREAMER-DUMP 1 "version 5.57" "January 2021"
|
||||||
|
|
||||||
.SH NAME
|
.SH NAME
|
||||||
ustreamer-dump \- Dump uStreamer's memory sink to file
|
ustreamer-dump \- Dump uStreamer's memory sink to file
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
.\" Manpage for ustreamer.
|
.\" Manpage for ustreamer.
|
||||||
.\" Open an issue or pull request to https://github.com/pikvm/ustreamer to correct errors or typos
|
.\" Open an issue or pull request to https://github.com/pikvm/ustreamer to correct errors or typos
|
||||||
.TH USTREAMER 1 "version 5.56" "November 2020"
|
.TH USTREAMER 1 "version 5.57" "November 2020"
|
||||||
|
|
||||||
.SH NAME
|
.SH NAME
|
||||||
ustreamer \- stream MJPEG video from any V4L2 device to the network
|
ustreamer \- stream MJPEG video from any V4L2 device to the network
|
||||||
|
|||||||
@@ -3,7 +3,7 @@
|
|||||||
|
|
||||||
|
|
||||||
pkgname=ustreamer
|
pkgname=ustreamer
|
||||||
pkgver=5.56
|
pkgver=5.57
|
||||||
pkgrel=1
|
pkgrel=1
|
||||||
pkgdesc="Lightweight and fast MJPEG-HTTP streamer"
|
pkgdesc="Lightweight and fast MJPEG-HTTP streamer"
|
||||||
url="https://github.com/pikvm/ustreamer"
|
url="https://github.com/pikvm/ustreamer"
|
||||||
|
|||||||
@@ -6,7 +6,7 @@
|
|||||||
include $(TOPDIR)/rules.mk
|
include $(TOPDIR)/rules.mk
|
||||||
|
|
||||||
PKG_NAME:=ustreamer
|
PKG_NAME:=ustreamer
|
||||||
PKG_VERSION:=5.56
|
PKG_VERSION:=5.57
|
||||||
PKG_RELEASE:=1
|
PKG_RELEASE:=1
|
||||||
PKG_MAINTAINER:=Maxim Devaev <mdevaev@gmail.com>
|
PKG_MAINTAINER:=Maxim Devaev <mdevaev@gmail.com>
|
||||||
|
|
||||||
|
|||||||
@@ -17,7 +17,7 @@ def _find_sources(suffix: str) -> list[str]:
|
|||||||
if __name__ == "__main__":
|
if __name__ == "__main__":
|
||||||
setup(
|
setup(
|
||||||
name="ustreamer",
|
name="ustreamer",
|
||||||
version="5.56",
|
version="5.57",
|
||||||
description="uStreamer tools",
|
description="uStreamer tools",
|
||||||
author="Maxim Devaev",
|
author="Maxim Devaev",
|
||||||
author_email="mdevaev@gmail.com",
|
author_email="mdevaev@gmail.com",
|
||||||
|
|||||||
@@ -26,7 +26,7 @@
|
|||||||
|
|
||||||
|
|
||||||
#define US_VERSION_MAJOR 5
|
#define US_VERSION_MAJOR 5
|
||||||
#define US_VERSION_MINOR 56
|
#define US_VERSION_MINOR 57
|
||||||
|
|
||||||
#define US_MAKE_VERSION2(_major, _minor) #_major "." #_minor
|
#define US_MAKE_VERSION2(_major, _minor) #_major "." #_minor
|
||||||
#define US_MAKE_VERSION1(_major, _minor) US_MAKE_VERSION2(_major, _minor)
|
#define US_MAKE_VERSION1(_major, _minor) US_MAKE_VERSION2(_major, _minor)
|
||||||
|
|||||||
Reference in New Issue
Block a user