mirror of
https://github.com/pikvm/ustreamer.git
synced 2026-02-27 12:16:31 +00:00
Compare commits
2 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
fcd70c3166 | ||
|
|
aaed14e9de |
@@ -1,7 +1,7 @@
|
|||||||
[bumpversion]
|
[bumpversion]
|
||||||
commit = True
|
commit = True
|
||||||
tag = True
|
tag = True
|
||||||
current_version = 0.80
|
current_version = 0.81
|
||||||
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.80
|
pkgver=0.81
|
||||||
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"
|
||||||
|
|||||||
@@ -6,7 +6,7 @@
|
|||||||
include $(TOPDIR)/rules.mk
|
include $(TOPDIR)/rules.mk
|
||||||
|
|
||||||
PKG_NAME:=ustreamer
|
PKG_NAME:=ustreamer
|
||||||
PKG_VERSION:=0.80
|
PKG_VERSION:=0.81
|
||||||
PKG_RELEASE:=1
|
PKG_RELEASE:=1
|
||||||
PKG_MAINTAINER:=Maxim Devaev <mdevaev@gmail.com>
|
PKG_MAINTAINER:=Maxim Devaev <mdevaev@gmail.com>
|
||||||
|
|
||||||
|
|||||||
@@ -23,5 +23,5 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#ifndef VERSION
|
#ifndef VERSION
|
||||||
# define VERSION "0.80"
|
# define VERSION "0.81"
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
10
src/device.h
10
src/device.h
@@ -28,11 +28,13 @@
|
|||||||
#include <linux/videodev2.h>
|
#include <linux/videodev2.h>
|
||||||
|
|
||||||
|
|
||||||
#define VIDEO_MIN_WIDTH 320
|
#define VIDEO_MIN_WIDTH 160
|
||||||
#define VIDEO_MAX_WIDTH 1920
|
#define VIDEO_MAX_WIDTH 10240
|
||||||
|
|
||||||
#define VIDEO_MIN_HEIGHT 180
|
#define VIDEO_MIN_HEIGHT 120
|
||||||
#define VIDEO_MAX_HEIGHT 1200
|
#define VIDEO_MAX_HEIGHT 4320
|
||||||
|
|
||||||
|
#define VIDEO_MAX_FPS 120
|
||||||
|
|
||||||
#define STANDARD_UNKNOWN V4L2_STD_UNKNOWN
|
#define STANDARD_UNKNOWN V4L2_STD_UNKNOWN
|
||||||
#define STANDARDS_STR "PAL, NTSC, SECAM"
|
#define STANDARDS_STR "PAL, NTSC, SECAM"
|
||||||
|
|||||||
@@ -381,7 +381,7 @@ static int _parse_options(int argc, char *argv[], struct device_t *dev, struct e
|
|||||||
case 'm': OPT_PARSE("pixel format", dev->format, device_parse_format, FORMAT_UNKNOWN);
|
case 'm': OPT_PARSE("pixel format", dev->format, device_parse_format, FORMAT_UNKNOWN);
|
||||||
# pragma GCC diagnostic pop
|
# pragma GCC diagnostic pop
|
||||||
case 'a': OPT_PARSE("TV standard", dev->standard, device_parse_standard, STANDARD_UNKNOWN);
|
case 'a': OPT_PARSE("TV standard", dev->standard, device_parse_standard, STANDARD_UNKNOWN);
|
||||||
case 'f': OPT_NUMBER("--desired-fps", dev->desired_fps, 0, 30, 0);
|
case 'f': OPT_NUMBER("--desired-fps", dev->desired_fps, 0, VIDEO_MAX_FPS, 0);
|
||||||
case 'z': OPT_NUMBER("--min-frame-size", dev->min_frame_size, 0, 8192, 0);
|
case 'z': OPT_NUMBER("--min-frame-size", dev->min_frame_size, 0, 8192, 0);
|
||||||
case 'n': OPT_SET(dev->persistent, true);
|
case 'n': OPT_SET(dev->persistent, true);
|
||||||
case 't': OPT_SET(dev->dv_timings, true);
|
case 't': OPT_SET(dev->dv_timings, true);
|
||||||
@@ -418,7 +418,7 @@ static int _parse_options(int argc, char *argv[], struct device_t *dev, struct e
|
|||||||
case 3001: OPT_SET(server->passwd, optarg);
|
case 3001: OPT_SET(server->passwd, optarg);
|
||||||
case 3002: OPT_SET(server->static_path, optarg);
|
case 3002: OPT_SET(server->static_path, optarg);
|
||||||
case 'k': OPT_SET(server->blank_path, optarg);
|
case 'k': OPT_SET(server->blank_path, optarg);
|
||||||
case 'e': OPT_NUMBER("--drop-same-frames", server->drop_same_frames, 0, 30, 0);
|
case 'e': OPT_NUMBER("--drop-same-frames", server->drop_same_frames, 0, VIDEO_MAX_FPS, 0);
|
||||||
case 'l': OPT_SET(server->slowdown, true);
|
case 'l': OPT_SET(server->slowdown, true);
|
||||||
case 'R': OPT_RESOLUTION("--fake-resolution", server->fake_width, server->fake_height, false);
|
case 'R': OPT_RESOLUTION("--fake-resolution", server->fake_width, server->fake_height, false);
|
||||||
case 3003: OPT_RESOLUTION_OBSOLETE("--fake-width", "--fake-resolution", server->fake_width, 0, UINT_MAX);
|
case 3003: OPT_RESOLUTION_OBSOLETE("--fake-width", "--fake-resolution", server->fake_width, 0, UINT_MAX);
|
||||||
|
|||||||
Reference in New Issue
Block a user