mirror of
https://github.com/pikvm/ustreamer.git
synced 2026-02-28 12:46:32 +00:00
Compare commits
3 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
abfc7b917b | ||
|
|
a0e488b0a5 | ||
|
|
6b99df2792 |
@@ -1,7 +1,7 @@
|
|||||||
[bumpversion]
|
[bumpversion]
|
||||||
commit = True
|
commit = True
|
||||||
tag = True
|
tag = True
|
||||||
current_version = 0.64
|
current_version = 0.65
|
||||||
parse = (?P<major>\d+)\.(?P<minor>\d+)(\.(?P<patch>\d+)(\-(?P<release>[a-z]+))?)?
|
parse = (?P<major>\d+)\.(?P<minor>\d+)(\.(?P<patch>\d+)(\-(?P<release>[a-z]+))?)?
|
||||||
serialize =
|
serialize =
|
||||||
{major}.{minor}
|
{major}.{minor}
|
||||||
|
|||||||
@@ -3,7 +3,7 @@
|
|||||||
|
|
||||||
|
|
||||||
pkgname=ustreamer
|
pkgname=ustreamer
|
||||||
pkgver=0.64
|
pkgver=0.65
|
||||||
pkgrel=1
|
pkgrel=1
|
||||||
pkgdesc="Lightweight and fast MJPG-HTTP streamer"
|
pkgdesc="Lightweight and fast MJPG-HTTP streamer"
|
||||||
url="https://github.com/pi-kvm/ustreamer"
|
url="https://github.com/pi-kvm/ustreamer"
|
||||||
|
|||||||
@@ -22,4 +22,4 @@
|
|||||||
|
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#define VERSION "0.64"
|
#define VERSION "0.65"
|
||||||
|
|||||||
@@ -27,6 +27,7 @@
|
|||||||
#include <strings.h>
|
#include <strings.h>
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
#include <fcntl.h>
|
#include <fcntl.h>
|
||||||
|
#include <errno.h>
|
||||||
#include <assert.h>
|
#include <assert.h>
|
||||||
|
|
||||||
#include <sys/mman.h>
|
#include <sys/mman.h>
|
||||||
@@ -432,7 +433,11 @@ static void _device_open_hw_fps(struct device_t *dev) {
|
|||||||
|
|
||||||
LOG_DEBUG("Calling ioctl(VIDIOC_G_PARM) ...");
|
LOG_DEBUG("Calling ioctl(VIDIOC_G_PARM) ...");
|
||||||
if (xioctl(dev->run->fd, VIDIOC_G_PARM, &setfps) < 0) {
|
if (xioctl(dev->run->fd, VIDIOC_G_PARM, &setfps) < 0) {
|
||||||
LOG_PERROR("Unable to query HW FPS changing");
|
if (errno == ENOTTY) { // Quiet message for Auvidea B101
|
||||||
|
LOG_INFO("Quierying HW FPS changing is not supported");
|
||||||
|
} else {
|
||||||
|
LOG_PERROR("Unable to query HW FPS changing");
|
||||||
|
}
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -454,7 +459,7 @@ static void _device_open_hw_fps(struct device_t *dev) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (dev->desired_fps != SETFPS_TPF(denominator)) {
|
if (dev->desired_fps != SETFPS_TPF(denominator)) {
|
||||||
LOG_INFO("Using HW FPS (coerced): %u -> %u", dev->desired_fps, SETFPS_TPF(denominator));
|
LOG_INFO("Using HW FPS: %u -> %u (coerced)", dev->desired_fps, SETFPS_TPF(denominator));
|
||||||
} else {
|
} else {
|
||||||
LOG_INFO("Using HW FPS: %u", dev->desired_fps);
|
LOG_INFO("Using HW FPS: %u", dev->desired_fps);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -171,7 +171,7 @@ static void _help(struct device_t *dev, struct encoder_t *encoder, struct http_s
|
|||||||
printf(" the CPU loading. Don't use this option with analog signal sources\n");
|
printf(" the CPU loading. Don't use this option with analog signal sources\n");
|
||||||
printf(" or webcams, it's useless. Default: disabled.\n\n");
|
printf(" or webcams, it's useless. Default: disabled.\n\n");
|
||||||
printf(" -l|--slowdown ────────────── Slowdown capturing to 1 FPS or less when no stream clients connected.\n");
|
printf(" -l|--slowdown ────────────── Slowdown capturing to 1 FPS or less when no stream clients connected.\n");
|
||||||
printf(" Useful to reduce CPU cosumption. Default: disabled.\n\n");
|
printf(" Useful to reduce CPU consumption. Default: disabled.\n\n");
|
||||||
printf(" --fake-width <N> ─────────── Override image width for /state. Default: disabled.\n\n");
|
printf(" --fake-width <N> ─────────── Override image width for /state. Default: disabled.\n\n");
|
||||||
printf(" --fake-height <N> ────────── Override image height for /state. Default: disabled.\n\n");
|
printf(" --fake-height <N> ────────── Override image height for /state. Default: disabled.\n\n");
|
||||||
printf(" --server-timeout <seconds> ─ Timeout for client connections. Default: %u.\n\n", server->timeout);
|
printf(" --server-timeout <seconds> ─ Timeout for client connections. Default: %u.\n\n", server->timeout);
|
||||||
|
|||||||
Reference in New Issue
Block a user