mirror of
https://github.com/pikvm/ustreamer.git
synced 2026-03-02 05:36:31 +00:00
Compare commits
8 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
548c261d92 | ||
|
|
d4560fcba9 | ||
|
|
370434601c | ||
|
|
09359cb957 | ||
|
|
71b93a2a38 | ||
|
|
aeb5930483 | ||
|
|
b17b87018b | ||
|
|
602ca16178 |
@@ -1,7 +1,7 @@
|
|||||||
[bumpversion]
|
[bumpversion]
|
||||||
commit = True
|
commit = True
|
||||||
tag = True
|
tag = True
|
||||||
current_version = 5.38
|
current_version = 5.41
|
||||||
parse = (?P<major>\d+)\.(?P<minor>\d+)
|
parse = (?P<major>\d+)\.(?P<minor>\d+)
|
||||||
serialize =
|
serialize =
|
||||||
{major}.{minor}
|
{major}.{minor}
|
||||||
|
|||||||
21
README.md
21
README.md
@@ -88,7 +88,7 @@ Without arguments, ```ustreamer``` will try to open ```/dev/video0``` with 640x4
|
|||||||
:exclamation: Please note that since µStreamer v2.0 cross-domain requests were disabled by default for [security reasons](https://developer.mozilla.org/en-US/docs/Web/HTTP/CORS). To enable the old behavior, use the option `--allow-origin=\*`.
|
:exclamation: Please note that since µStreamer v2.0 cross-domain requests were disabled by default for [security reasons](https://developer.mozilla.org/en-US/docs/Web/HTTP/CORS). To enable the old behavior, use the option `--allow-origin=\*`.
|
||||||
|
|
||||||
The recommended way of running µStreamer with [Auvidea B101](https://www.raspberrypi.org/forums/viewtopic.php?f=38&t=120702&start=400#p1339178) on Raspberry Pi:
|
The recommended way of running µStreamer with [Auvidea B101](https://www.raspberrypi.org/forums/viewtopic.php?f=38&t=120702&start=400#p1339178) on Raspberry Pi:
|
||||||
```bash
|
```
|
||||||
$ ./ustreamer \
|
$ ./ustreamer \
|
||||||
--format=uyvy \ # Device input format
|
--format=uyvy \ # Device input format
|
||||||
--encoder=m2m-image \ # Hardware encoding on V4L2 M2M driver
|
--encoder=m2m-image \ # Hardware encoding on V4L2 M2M driver
|
||||||
@@ -115,7 +115,7 @@ dtoverlay=tc358743
|
|||||||
|
|
||||||
Check size of CMA:
|
Check size of CMA:
|
||||||
|
|
||||||
```bash
|
```
|
||||||
$ dmesg | grep cma-reserved
|
$ dmesg | grep cma-reserved
|
||||||
[ 0.000000] Memory: 7700524K/8244224K available (11772K kernel code, 1278K rwdata, 4320K rodata, 4096K init, 1077K bss, 281556K reserved, 262144K cma-reserved)
|
[ 0.000000] Memory: 7700524K/8244224K available (11772K kernel code, 1278K rwdata, 4320K rodata, 4096K init, 1077K bss, 281556K reserved, 262144K cma-reserved)
|
||||||
```
|
```
|
||||||
@@ -131,14 +131,14 @@ Save changes and reboot.
|
|||||||
## Launch
|
## Launch
|
||||||
Start container:
|
Start container:
|
||||||
|
|
||||||
```bash
|
```
|
||||||
$ docker run --device /dev/video0:/dev/video0 -e EDID=1 -p 8080:8080 pikvm/ustreamer:latest
|
$ docker run --device /dev/video0:/dev/video0 -e EDID=1 -p 8080:8080 pikvm/ustreamer:latest
|
||||||
```
|
```
|
||||||
|
|
||||||
Then access the web interface at port 8080 (e.g. http://raspberrypi.local:8080).
|
Then access the web interface at port 8080 (e.g. http://raspberrypi.local:8080).
|
||||||
|
|
||||||
## Custom config
|
## Custom config
|
||||||
```bash
|
```
|
||||||
$ docker run --rm pikvm/ustreamer:latest \
|
$ docker run --rm pikvm/ustreamer:latest \
|
||||||
--format=uyvy \
|
--format=uyvy \
|
||||||
--workers=3 \
|
--workers=3 \
|
||||||
@@ -153,8 +153,15 @@ Add `-e EDID=1` to set HDMI EDID before starting ustreamer. Use together with `-
|
|||||||
-----
|
-----
|
||||||
# Raspberry Pi Camera Example
|
# Raspberry Pi Camera Example
|
||||||
|
|
||||||
|
Example usage for the Raspberry Pi v3 camera (required `libcamerify` which is located in `libcamera-tools` on Raspbian):
|
||||||
|
```
|
||||||
|
$ sudo modprobe bcm2835-v4l2
|
||||||
|
$ libcamerify ./ustreamer --host :: -e m2m-image
|
||||||
|
```
|
||||||
|
|
||||||
|
|
||||||
Example usage for the Raspberry Pi v1 camera:
|
Example usage for the Raspberry Pi v1 camera:
|
||||||
```bash
|
```
|
||||||
$ sudo modprobe bcm2835-v4l2
|
$ sudo modprobe bcm2835-v4l2
|
||||||
$ ./ustreamer --host :: -m jpeg --device-timeout=5 --buffers=3 -r 2592x1944
|
$ ./ustreamer --host :: -m jpeg --device-timeout=5 --buffers=3 -r 2592x1944
|
||||||
```
|
```
|
||||||
@@ -163,7 +170,7 @@ $ ./ustreamer --host :: -m jpeg --device-timeout=5 --buffers=3 -r 2592x1944
|
|||||||
|
|
||||||
:exclamation: If you get a poor framerate, it could be that the camera is switched to photo mode, which produces a low framerate (but a higher quality picture). This is because `bcm2835-v4l2` switches to photo mode at resolutions higher than `1280x720`. To work around this, pass the `max_video_width` and `max_video_height` module parameters like so:
|
:exclamation: If you get a poor framerate, it could be that the camera is switched to photo mode, which produces a low framerate (but a higher quality picture). This is because `bcm2835-v4l2` switches to photo mode at resolutions higher than `1280x720`. To work around this, pass the `max_video_width` and `max_video_height` module parameters like so:
|
||||||
|
|
||||||
```bash
|
```
|
||||||
$ modprobe bcm2835-v4l2 max_video_width=2592 max_video_height=1944
|
$ modprobe bcm2835-v4l2 max_video_width=2592 max_video_height=1944
|
||||||
```
|
```
|
||||||
|
|
||||||
@@ -203,7 +210,7 @@ v4l2 utilities provide the tools to manage USB webcam setting and information. S
|
|||||||
|
|
||||||
-----
|
-----
|
||||||
# License
|
# License
|
||||||
Copyright (C) 2018-2022 by Maxim Devaev mdevaev@gmail.com
|
Copyright (C) 2018-2023 by Maxim Devaev mdevaev@gmail.com
|
||||||
|
|
||||||
This program is free software: you can redistribute it and/or modify
|
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
|
it under the terms of the GNU General Public License as published by
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
# #
|
# #
|
||||||
# uStreamer - Lightweight and fast MJPEG-HTTP streamer. #
|
# uStreamer - Lightweight and fast MJPEG-HTTP streamer. #
|
||||||
# #
|
# #
|
||||||
# Copyright (C) 2018-2022 Maxim Devaev <mdevaev@gmail.com> #
|
# Copyright (C) 2018-2023 Maxim Devaev <mdevaev@gmail.com> #
|
||||||
# #
|
# #
|
||||||
# This program is free software: you can redistribute it and/or modify #
|
# 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 #
|
# it under the terms of the GNU General Public License as published by #
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
# #
|
# #
|
||||||
# uStreamer - Lightweight and fast MJPEG-HTTP streamer. #
|
# uStreamer - Lightweight and fast MJPEG-HTTP streamer. #
|
||||||
# #
|
# #
|
||||||
# Copyright (C) 2018-2022 Maxim Devaev <mdevaev@gmail.com> #
|
# Copyright (C) 2018-2023 Maxim Devaev <mdevaev@gmail.com> #
|
||||||
# #
|
# #
|
||||||
# This program is free software: you can redistribute it and/or modify #
|
# 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 #
|
# it under the terms of the GNU General Public License as published by #
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
# #
|
# #
|
||||||
# uStreamer - Lightweight and fast MJPEG-HTTP streamer. #
|
# uStreamer - Lightweight and fast MJPEG-HTTP streamer. #
|
||||||
# #
|
# #
|
||||||
# Copyright (C) 2018-2022 Maxim Devaev <mdevaev@gmail.com> #
|
# Copyright (C) 2018-2023 Maxim Devaev <mdevaev@gmail.com> #
|
||||||
# #
|
# #
|
||||||
# This program is free software: you can redistribute it and/or modify #
|
# 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 #
|
# it under the terms of the GNU General Public License as published by #
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
# #
|
# #
|
||||||
# uStreamer - Lightweight and fast MJPEG-HTTP streamer. #
|
# uStreamer - Lightweight and fast MJPEG-HTTP streamer. #
|
||||||
# #
|
# #
|
||||||
# Copyright (C) 2018-2022 Maxim Devaev <mdevaev@gmail.com> #
|
# Copyright (C) 2018-2023 Maxim Devaev <mdevaev@gmail.com> #
|
||||||
# #
|
# #
|
||||||
# This program is free software: you can redistribute it and/or modify #
|
# 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 #
|
# it under the terms of the GNU General Public License as published by #
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
# #
|
# #
|
||||||
# uStreamer - Lightweight and fast MJPEG-HTTP streamer. #
|
# uStreamer - Lightweight and fast MJPEG-HTTP streamer. #
|
||||||
# #
|
# #
|
||||||
# Copyright (C) 2018-2022 Maxim Devaev <mdevaev@gmail.com> #
|
# Copyright (C) 2018-2023 Maxim Devaev <mdevaev@gmail.com> #
|
||||||
# #
|
# #
|
||||||
# This program is free software: you can redistribute it and/or modify #
|
# 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 #
|
# it under the terms of the GNU General Public License as published by #
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
# #
|
# #
|
||||||
# uStreamer - Lightweight and fast MJPEG-HTTP streamer. #
|
# uStreamer - Lightweight and fast MJPEG-HTTP streamer. #
|
||||||
# #
|
# #
|
||||||
# Copyright (C) 2018-2022 Maxim Devaev <mdevaev@gmail.com> #
|
# Copyright (C) 2018-2023 Maxim Devaev <mdevaev@gmail.com> #
|
||||||
# #
|
# #
|
||||||
# This program is free software: you can redistribute it and/or modify #
|
# 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 #
|
# it under the terms of the GNU General Public License as published by #
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
# #
|
# #
|
||||||
# uStreamer - Lightweight and fast MJPEG-HTTP streamer. #
|
# uStreamer - Lightweight and fast MJPEG-HTTP streamer. #
|
||||||
# #
|
# #
|
||||||
# Copyright (C) 2018-2022 Maxim Devaev <mdevaev@gmail.com> #
|
# Copyright (C) 2018-2023 Maxim Devaev <mdevaev@gmail.com> #
|
||||||
# #
|
# #
|
||||||
# This program is free software: you can redistribute it and/or modify #
|
# 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 #
|
# it under the terms of the GNU General Public License as published by #
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
# #
|
# #
|
||||||
# uStreamer - Lightweight and fast MJPEG-HTTP streamer. #
|
# uStreamer - Lightweight and fast MJPEG-HTTP streamer. #
|
||||||
# #
|
# #
|
||||||
# Copyright (C) 2018-2022 Maxim Devaev <mdevaev@gmail.com> #
|
# Copyright (C) 2018-2023 Maxim Devaev <mdevaev@gmail.com> #
|
||||||
# #
|
# #
|
||||||
# This program is free software: you can redistribute it and/or modify #
|
# 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 #
|
# it under the terms of the GNU General Public License as published by #
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
# #
|
# #
|
||||||
# uStreamer - Lightweight and fast MJPEG-HTTP streamer. #
|
# uStreamer - Lightweight and fast MJPEG-HTTP streamer. #
|
||||||
# #
|
# #
|
||||||
# Copyright (C) 2018-2022 Maxim Devaev <mdevaev@gmail.com> #
|
# Copyright (C) 2018-2023 Maxim Devaev <mdevaev@gmail.com> #
|
||||||
# #
|
# #
|
||||||
# This program is free software: you can redistribute it and/or modify #
|
# 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 #
|
# it under the terms of the GNU General Public License as published by #
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
# #
|
# #
|
||||||
# uStreamer - Lightweight and fast MJPEG-HTTP streamer. #
|
# uStreamer - Lightweight and fast MJPEG-HTTP streamer. #
|
||||||
# #
|
# #
|
||||||
# Copyright (C) 2018-2022 Maxim Devaev <mdevaev@gmail.com> #
|
# Copyright (C) 2018-2023 Maxim Devaev <mdevaev@gmail.com> #
|
||||||
# #
|
# #
|
||||||
# This program is free software: you can redistribute it and/or modify #
|
# 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 #
|
# it under the terms of the GNU General Public License as published by #
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
# #
|
# #
|
||||||
# uStreamer - Lightweight and fast MJPEG-HTTP streamer. #
|
# uStreamer - Lightweight and fast MJPEG-HTTP streamer. #
|
||||||
# #
|
# #
|
||||||
# Copyright (C) 2018-2022 Maxim Devaev <mdevaev@gmail.com> #
|
# Copyright (C) 2018-2023 Maxim Devaev <mdevaev@gmail.com> #
|
||||||
# #
|
# #
|
||||||
# This program is free software: you can redistribute it and/or modify #
|
# 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 #
|
# it under the terms of the GNU General Public License as published by #
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
# #
|
# #
|
||||||
# uStreamer - Lightweight and fast MJPEG-HTTP streamer. #
|
# uStreamer - Lightweight and fast MJPEG-HTTP streamer. #
|
||||||
# #
|
# #
|
||||||
# Copyright (C) 2018-2022 Maxim Devaev <mdevaev@gmail.com> #
|
# Copyright (C) 2018-2023 Maxim Devaev <mdevaev@gmail.com> #
|
||||||
# #
|
# #
|
||||||
# This program is free software: you can redistribute it and/or modify #
|
# 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 #
|
# it under the terms of the GNU General Public License as published by #
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
# #
|
# #
|
||||||
# uStreamer - Lightweight and fast MJPEG-HTTP streamer. #
|
# uStreamer - Lightweight and fast MJPEG-HTTP streamer. #
|
||||||
# #
|
# #
|
||||||
# Copyright (C) 2018-2022 Maxim Devaev <mdevaev@gmail.com> #
|
# Copyright (C) 2018-2023 Maxim Devaev <mdevaev@gmail.com> #
|
||||||
# #
|
# #
|
||||||
# This program is free software: you can redistribute it and/or modify #
|
# 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 #
|
# it under the terms of the GNU General Public License as published by #
|
||||||
|
|||||||
@@ -5,7 +5,7 @@
|
|||||||
# This source file is partially based on this code: #
|
# This source file is partially based on this code: #
|
||||||
# - https://github.com/catid/kvm/blob/master/kvm_pipeline/src #
|
# - https://github.com/catid/kvm/blob/master/kvm_pipeline/src #
|
||||||
# #
|
# #
|
||||||
# Copyright (C) 2018-2022 Maxim Devaev <mdevaev@gmail.com> #
|
# Copyright (C) 2018-2023 Maxim Devaev <mdevaev@gmail.com> #
|
||||||
# #
|
# #
|
||||||
# This program is free software: you can redistribute it and/or modify #
|
# 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 #
|
# it under the terms of the GNU General Public License as published by #
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
# #
|
# #
|
||||||
# uStreamer - Lightweight and fast MJPEG-HTTP streamer. #
|
# uStreamer - Lightweight and fast MJPEG-HTTP streamer. #
|
||||||
# #
|
# #
|
||||||
# Copyright (C) 2018-2022 Maxim Devaev <mdevaev@gmail.com> #
|
# Copyright (C) 2018-2023 Maxim Devaev <mdevaev@gmail.com> #
|
||||||
# #
|
# #
|
||||||
# This program is free software: you can redistribute it and/or modify #
|
# 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 #
|
# it under the terms of the GNU General Public License as published by #
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
# #
|
# #
|
||||||
# uStreamer - Lightweight and fast MJPEG-HTTP streamer. #
|
# uStreamer - Lightweight and fast MJPEG-HTTP streamer. #
|
||||||
# #
|
# #
|
||||||
# Copyright (C) 2018-2022 Maxim Devaev <mdevaev@gmail.com> #
|
# Copyright (C) 2018-2023 Maxim Devaev <mdevaev@gmail.com> #
|
||||||
# #
|
# #
|
||||||
# This program is free software: you can redistribute it and/or modify #
|
# 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 #
|
# it under the terms of the GNU General Public License as published by #
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
# #
|
# #
|
||||||
# uStreamer - Lightweight and fast MJPEG-HTTP streamer. #
|
# uStreamer - Lightweight and fast MJPEG-HTTP streamer. #
|
||||||
# #
|
# #
|
||||||
# Copyright (C) 2018-2022 Maxim Devaev <mdevaev@gmail.com> #
|
# Copyright (C) 2018-2023 Maxim Devaev <mdevaev@gmail.com> #
|
||||||
# #
|
# #
|
||||||
# This program is free software: you can redistribute it and/or modify #
|
# 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 #
|
# it under the terms of the GNU General Public License as published by #
|
||||||
|
|||||||
@@ -5,7 +5,7 @@
|
|||||||
# This source file is partially based on this code: #
|
# This source file is partially based on this code: #
|
||||||
# - https://github.com/catid/kvm/blob/master/kvm_pipeline/src #
|
# - https://github.com/catid/kvm/blob/master/kvm_pipeline/src #
|
||||||
# #
|
# #
|
||||||
# Copyright (C) 2018-2022 Maxim Devaev <mdevaev@gmail.com> #
|
# Copyright (C) 2018-2023 Maxim Devaev <mdevaev@gmail.com> #
|
||||||
# #
|
# #
|
||||||
# This program is free software: you can redistribute it and/or modify #
|
# 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 #
|
# it under the terms of the GNU General Public License as published by #
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
# #
|
# #
|
||||||
# uStreamer - Lightweight and fast MJPEG-HTTP streamer. #
|
# uStreamer - Lightweight and fast MJPEG-HTTP streamer. #
|
||||||
# #
|
# #
|
||||||
# Copyright (C) 2018-2022 Maxim Devaev <mdevaev@gmail.com> #
|
# Copyright (C) 2018-2023 Maxim Devaev <mdevaev@gmail.com> #
|
||||||
# #
|
# #
|
||||||
# This program is free software: you can redistribute it and/or modify #
|
# 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 #
|
# it under the terms of the GNU General Public License as published by #
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
# #
|
# #
|
||||||
# uStreamer - Lightweight and fast MJPEG-HTTP streamer. #
|
# uStreamer - Lightweight and fast MJPEG-HTTP streamer. #
|
||||||
# #
|
# #
|
||||||
# Copyright (C) 2018-2022 Maxim Devaev <mdevaev@gmail.com> #
|
# Copyright (C) 2018-2023 Maxim Devaev <mdevaev@gmail.com> #
|
||||||
# #
|
# #
|
||||||
# This program is free software: you can redistribute it and/or modify #
|
# 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 #
|
# it under the terms of the GNU General Public License as published by #
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
# #
|
# #
|
||||||
# uStreamer - Lightweight and fast MJPEG-HTTP streamer. #
|
# uStreamer - Lightweight and fast MJPEG-HTTP streamer. #
|
||||||
# #
|
# #
|
||||||
# Copyright (C) 2018-2022 Maxim Devaev <mdevaev@gmail.com> #
|
# Copyright (C) 2018-2023 Maxim Devaev <mdevaev@gmail.com> #
|
||||||
# #
|
# #
|
||||||
# This program is free software: you can redistribute it and/or modify #
|
# 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 #
|
# it under the terms of the GNU General Public License as published by #
|
||||||
|
|||||||
@@ -3,11 +3,11 @@ envlist = cppcheck, flake8, pylint, mypy, vulture, htmlhint
|
|||||||
skipsdist = true
|
skipsdist = true
|
||||||
|
|
||||||
[testenv]
|
[testenv]
|
||||||
basepython = python3.10
|
basepython = python3.11
|
||||||
changedir = /src
|
changedir = /src
|
||||||
|
|
||||||
[testenv:cppcheck]
|
[testenv:cppcheck]
|
||||||
whitelist_externals = cppcheck
|
allowlist_externals = cppcheck
|
||||||
commands = cppcheck \
|
commands = cppcheck \
|
||||||
-j4 \
|
-j4 \
|
||||||
--force \
|
--force \
|
||||||
@@ -23,30 +23,30 @@ commands = cppcheck \
|
|||||||
src python/*.? janus/*.?
|
src python/*.? janus/*.?
|
||||||
|
|
||||||
[testenv:flake8]
|
[testenv:flake8]
|
||||||
whitelist_externals = bash
|
allowlist_externals = bash
|
||||||
commands = bash -c 'flake8 --config=linters/flake8.ini tools/*.py' python/*.py
|
commands = bash -c 'flake8 --config=linters/flake8.ini tools/*.py' python/*.py
|
||||||
deps =
|
deps =
|
||||||
flake8==5.0.4
|
flake8==5.0.4
|
||||||
flake8-quotes
|
flake8-quotes
|
||||||
|
|
||||||
[testenv:pylint]
|
[testenv:pylint]
|
||||||
whitelist_externals = bash
|
allowlist_externals = bash
|
||||||
commands = bash -c 'pylint --rcfile=linters/pylint.ini --output-format=colorized --reports=no tools/*.py python/*.py'
|
commands = bash -c 'pylint --rcfile=linters/pylint.ini --output-format=colorized --reports=no tools/*.py python/*.py'
|
||||||
deps =
|
deps =
|
||||||
pylint
|
pylint
|
||||||
|
|
||||||
[testenv:mypy]
|
[testenv:mypy]
|
||||||
whitelist_externals = bash
|
allowlist_externals = bash
|
||||||
commands = bash -c 'mypy --config-file=linters/mypy.ini tools/*.py python/*.py'
|
commands = bash -c 'mypy --config-file=linters/mypy.ini tools/*.py python/*.py'
|
||||||
deps =
|
deps =
|
||||||
mypy
|
mypy
|
||||||
|
|
||||||
[testenv:vulture]
|
[testenv:vulture]
|
||||||
whitelist_externals = bash
|
allowlist_externals = bash
|
||||||
commands = bash -c 'vulture tools/*.py python/*.py'
|
commands = bash -c 'vulture tools/*.py python/*.py'
|
||||||
deps =
|
deps =
|
||||||
vulture
|
vulture
|
||||||
|
|
||||||
[testenv:htmlhint]
|
[testenv:htmlhint]
|
||||||
whitelist_externals = htmlhint
|
allowlist_externals = htmlhint
|
||||||
commands = htmlhint src/ustreamer/http/data/*.html
|
commands = htmlhint src/ustreamer/http/data/*.html
|
||||||
|
|||||||
@@ -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.38" "January 2021"
|
.TH USTREAMER-DUMP 1 "version 5.41" "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.38" "November 2020"
|
.TH USTREAMER 1 "version 5.41" "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.38
|
pkgver=5.41
|
||||||
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.38
|
PKG_VERSION:=5.41
|
||||||
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.38",
|
version="5.41",
|
||||||
description="uStreamer tools",
|
description="uStreamer tools",
|
||||||
author="Maxim Devaev",
|
author="Maxim Devaev",
|
||||||
author_email="mdevaev@gmail.com",
|
author_email="mdevaev@gmail.com",
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
# #
|
# #
|
||||||
# uStreamer - Lightweight and fast MJPEG-HTTP streamer. #
|
# uStreamer - Lightweight and fast MJPEG-HTTP streamer. #
|
||||||
# #
|
# #
|
||||||
# Copyright (C) 2018-2022 Maxim Devaev <mdevaev@gmail.com> #
|
# Copyright (C) 2018-2023 Maxim Devaev <mdevaev@gmail.com> #
|
||||||
# #
|
# #
|
||||||
# This program is free software: you can redistribute it and/or modify #
|
# 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 #
|
# it under the terms of the GNU General Public License as published by #
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
# #
|
# #
|
||||||
# uStreamer - Lightweight and fast MJPEG-HTTP streamer. #
|
# uStreamer - Lightweight and fast MJPEG-HTTP streamer. #
|
||||||
# #
|
# #
|
||||||
# Copyright (C) 2018-2022 Maxim Devaev <mdevaev@gmail.com> #
|
# Copyright (C) 2018-2023 Maxim Devaev <mdevaev@gmail.com> #
|
||||||
# #
|
# #
|
||||||
# This program is free software: you can redistribute it and/or modify #
|
# 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 #
|
# it under the terms of the GNU General Public License as published by #
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
# #
|
# #
|
||||||
# uStreamer - Lightweight and fast MJPEG-HTTP streamer. #
|
# uStreamer - Lightweight and fast MJPEG-HTTP streamer. #
|
||||||
# #
|
# #
|
||||||
# Copyright (C) 2018-2022 Maxim Devaev <mdevaev@gmail.com> #
|
# Copyright (C) 2018-2023 Maxim Devaev <mdevaev@gmail.com> #
|
||||||
# #
|
# #
|
||||||
# This program is free software: you can redistribute it and/or modify #
|
# 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 #
|
# it under the terms of the GNU General Public License as published by #
|
||||||
@@ -319,7 +319,7 @@ static void _help(FILE *fp) {
|
|||||||
SAY("\nuStreamer-dump - Dump uStreamer's memory sink to file");
|
SAY("\nuStreamer-dump - Dump uStreamer's memory sink to file");
|
||||||
SAY("═════════════════════════════════════════════════════");
|
SAY("═════════════════════════════════════════════════════");
|
||||||
SAY("Version: %s; license: GPLv3", US_VERSION);
|
SAY("Version: %s; license: GPLv3", US_VERSION);
|
||||||
SAY("Copyright (C) 2018-2022 Maxim Devaev <mdevaev@gmail.com>\n");
|
SAY("Copyright (C) 2018-2023 Maxim Devaev <mdevaev@gmail.com>\n");
|
||||||
SAY("Example:");
|
SAY("Example:");
|
||||||
SAY("════════");
|
SAY("════════");
|
||||||
SAY(" ustreamer-dump --sink test --output - \\");
|
SAY(" ustreamer-dump --sink test --output - \\");
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
# #
|
# #
|
||||||
# uStreamer - Lightweight and fast MJPEG-HTTP streamer. #
|
# uStreamer - Lightweight and fast MJPEG-HTTP streamer. #
|
||||||
# #
|
# #
|
||||||
# Copyright (C) 2018-2022 Maxim Devaev <mdevaev@gmail.com> #
|
# Copyright (C) 2018-2023 Maxim Devaev <mdevaev@gmail.com> #
|
||||||
# #
|
# #
|
||||||
# This program is free software: you can redistribute it and/or modify #
|
# 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 #
|
# it under the terms of the GNU General Public License as published by #
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
# #
|
# #
|
||||||
# uStreamer - Lightweight and fast MJPEG-HTTP streamer. #
|
# uStreamer - Lightweight and fast MJPEG-HTTP streamer. #
|
||||||
# #
|
# #
|
||||||
# Copyright (C) 2018-2022 Maxim Devaev <mdevaev@gmail.com> #
|
# Copyright (C) 2018-2023 Maxim Devaev <mdevaev@gmail.com> #
|
||||||
# #
|
# #
|
||||||
# This program is free software: you can redistribute it and/or modify #
|
# 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 #
|
# it under the terms of the GNU General Public License as published by #
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
# #
|
# #
|
||||||
# uStreamer - Lightweight and fast MJPEG-HTTP streamer. #
|
# uStreamer - Lightweight and fast MJPEG-HTTP streamer. #
|
||||||
# #
|
# #
|
||||||
# Copyright (C) 2018-2022 Maxim Devaev <mdevaev@gmail.com> #
|
# Copyright (C) 2018-2023 Maxim Devaev <mdevaev@gmail.com> #
|
||||||
# #
|
# #
|
||||||
# This program is free software: you can redistribute it and/or modify #
|
# 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 #
|
# it under the terms of the GNU General Public License as published by #
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
# #
|
# #
|
||||||
# uStreamer - Lightweight and fast MJPEG-HTTP streamer. #
|
# uStreamer - Lightweight and fast MJPEG-HTTP streamer. #
|
||||||
# #
|
# #
|
||||||
# Copyright (C) 2018-2022 Maxim Devaev <mdevaev@gmail.com> #
|
# Copyright (C) 2018-2023 Maxim Devaev <mdevaev@gmail.com> #
|
||||||
# #
|
# #
|
||||||
# This program is free software: you can redistribute it and/or modify #
|
# 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 #
|
# it under the terms of the GNU General Public License as published by #
|
||||||
@@ -23,7 +23,7 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#define US_VERSION_MAJOR 5
|
#define US_VERSION_MAJOR 5
|
||||||
#define US_VERSION_MINOR 38
|
#define US_VERSION_MINOR 41
|
||||||
|
|
||||||
#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)
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
# #
|
# #
|
||||||
# uStreamer - Lightweight and fast MJPEG-HTTP streamer. #
|
# uStreamer - Lightweight and fast MJPEG-HTTP streamer. #
|
||||||
# #
|
# #
|
||||||
# Copyright (C) 2018-2022 Maxim Devaev <mdevaev@gmail.com> #
|
# Copyright (C) 2018-2023 Maxim Devaev <mdevaev@gmail.com> #
|
||||||
# #
|
# #
|
||||||
# This program is free software: you can redistribute it and/or modify #
|
# 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 #
|
# it under the terms of the GNU General Public License as published by #
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
# #
|
# #
|
||||||
# uStreamer - Lightweight and fast MJPEG-HTTP streamer. #
|
# uStreamer - Lightweight and fast MJPEG-HTTP streamer. #
|
||||||
# #
|
# #
|
||||||
# Copyright (C) 2018-2022 Maxim Devaev <mdevaev@gmail.com> #
|
# Copyright (C) 2018-2023 Maxim Devaev <mdevaev@gmail.com> #
|
||||||
# #
|
# #
|
||||||
# This program is free software: you can redistribute it and/or modify #
|
# 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 #
|
# it under the terms of the GNU General Public License as published by #
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
# #
|
# #
|
||||||
# uStreamer - Lightweight and fast MJPEG-HTTP streamer. #
|
# uStreamer - Lightweight and fast MJPEG-HTTP streamer. #
|
||||||
# #
|
# #
|
||||||
# Copyright (C) 2018-2022 Maxim Devaev <mdevaev@gmail.com> #
|
# Copyright (C) 2018-2023 Maxim Devaev <mdevaev@gmail.com> #
|
||||||
# #
|
# #
|
||||||
# This program is free software: you can redistribute it and/or modify #
|
# 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 #
|
# it under the terms of the GNU General Public License as published by #
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
# #
|
# #
|
||||||
# uStreamer - Lightweight and fast MJPEG-HTTP streamer. #
|
# uStreamer - Lightweight and fast MJPEG-HTTP streamer. #
|
||||||
# #
|
# #
|
||||||
# Copyright (C) 2018-2022 Maxim Devaev <mdevaev@gmail.com> #
|
# Copyright (C) 2018-2023 Maxim Devaev <mdevaev@gmail.com> #
|
||||||
# #
|
# #
|
||||||
# This program is free software: you can redistribute it and/or modify #
|
# 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 #
|
# it under the terms of the GNU General Public License as published by #
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
# #
|
# #
|
||||||
# uStreamer - Lightweight and fast MJPEG-HTTP streamer. #
|
# uStreamer - Lightweight and fast MJPEG-HTTP streamer. #
|
||||||
# #
|
# #
|
||||||
# Copyright (C) 2018-2022 Maxim Devaev <mdevaev@gmail.com> #
|
# Copyright (C) 2018-2023 Maxim Devaev <mdevaev@gmail.com> #
|
||||||
# #
|
# #
|
||||||
# This program is free software: you can redistribute it and/or modify #
|
# 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 #
|
# it under the terms of the GNU General Public License as published by #
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
# #
|
# #
|
||||||
# uStreamer - Lightweight and fast MJPEG-HTTP streamer. #
|
# uStreamer - Lightweight and fast MJPEG-HTTP streamer. #
|
||||||
# #
|
# #
|
||||||
# Copyright (C) 2018-2022 Maxim Devaev <mdevaev@gmail.com> #
|
# Copyright (C) 2018-2023 Maxim Devaev <mdevaev@gmail.com> #
|
||||||
# #
|
# #
|
||||||
# This program is free software: you can redistribute it and/or modify #
|
# 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 #
|
# it under the terms of the GNU General Public License as published by #
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
# #
|
# #
|
||||||
# uStreamer - Lightweight and fast MJPEG-HTTP streamer. #
|
# uStreamer - Lightweight and fast MJPEG-HTTP streamer. #
|
||||||
# #
|
# #
|
||||||
# Copyright (C) 2018-2022 Maxim Devaev <mdevaev@gmail.com> #
|
# Copyright (C) 2018-2023 Maxim Devaev <mdevaev@gmail.com> #
|
||||||
# #
|
# #
|
||||||
# This program is free software: you can redistribute it and/or modify #
|
# 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 #
|
# it under the terms of the GNU General Public License as published by #
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
# #
|
# #
|
||||||
# uStreamer - Lightweight and fast MJPEG-HTTP streamer. #
|
# uStreamer - Lightweight and fast MJPEG-HTTP streamer. #
|
||||||
# #
|
# #
|
||||||
# Copyright (C) 2018-2022 Maxim Devaev <mdevaev@gmail.com> #
|
# Copyright (C) 2018-2023 Maxim Devaev <mdevaev@gmail.com> #
|
||||||
# #
|
# #
|
||||||
# This program is free software: you can redistribute it and/or modify #
|
# 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 #
|
# it under the terms of the GNU General Public License as published by #
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
# #
|
# #
|
||||||
# uStreamer - Lightweight and fast MJPEG-HTTP streamer. #
|
# uStreamer - Lightweight and fast MJPEG-HTTP streamer. #
|
||||||
# #
|
# #
|
||||||
# Copyright (C) 2018-2022 Maxim Devaev <mdevaev@gmail.com> #
|
# Copyright (C) 2018-2023 Maxim Devaev <mdevaev@gmail.com> #
|
||||||
# #
|
# #
|
||||||
# This program is free software: you can redistribute it and/or modify #
|
# 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 #
|
# it under the terms of the GNU General Public License as published by #
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
# #
|
# #
|
||||||
# uStreamer - Lightweight and fast MJPEG-HTTP streamer. #
|
# uStreamer - Lightweight and fast MJPEG-HTTP streamer. #
|
||||||
# #
|
# #
|
||||||
# Copyright (C) 2018-2022 Maxim Devaev <mdevaev@gmail.com> #
|
# Copyright (C) 2018-2023 Maxim Devaev <mdevaev@gmail.com> #
|
||||||
# #
|
# #
|
||||||
# This program is free software: you can redistribute it and/or modify #
|
# 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 #
|
# it under the terms of the GNU General Public License as published by #
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
# #
|
# #
|
||||||
# uStreamer - Lightweight and fast MJPEG-HTTP streamer. #
|
# uStreamer - Lightweight and fast MJPEG-HTTP streamer. #
|
||||||
# #
|
# #
|
||||||
# Copyright (C) 2018-2022 Maxim Devaev <mdevaev@gmail.com> #
|
# Copyright (C) 2018-2023 Maxim Devaev <mdevaev@gmail.com> #
|
||||||
# #
|
# #
|
||||||
# This program is free software: you can redistribute it and/or modify #
|
# 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 #
|
# it under the terms of the GNU General Public License as published by #
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
# #
|
# #
|
||||||
# uStreamer - Lightweight and fast MJPEG-HTTP streamer. #
|
# uStreamer - Lightweight and fast MJPEG-HTTP streamer. #
|
||||||
# #
|
# #
|
||||||
# Copyright (C) 2018-2022 Maxim Devaev <mdevaev@gmail.com> #
|
# Copyright (C) 2018-2023 Maxim Devaev <mdevaev@gmail.com> #
|
||||||
# #
|
# #
|
||||||
# This program is free software: you can redistribute it and/or modify #
|
# 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 #
|
# it under the terms of the GNU General Public License as published by #
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
# #
|
# #
|
||||||
# uStreamer - Lightweight and fast MJPEG-HTTP streamer. #
|
# uStreamer - Lightweight and fast MJPEG-HTTP streamer. #
|
||||||
# #
|
# #
|
||||||
# Copyright (C) 2018-2022 Maxim Devaev <mdevaev@gmail.com> #
|
# Copyright (C) 2018-2023 Maxim Devaev <mdevaev@gmail.com> #
|
||||||
# #
|
# #
|
||||||
# This program is free software: you can redistribute it and/or modify #
|
# 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 #
|
# it under the terms of the GNU General Public License as published by #
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
# #
|
# #
|
||||||
# uStreamer - Lightweight and fast MJPEG-HTTP streamer. #
|
# uStreamer - Lightweight and fast MJPEG-HTTP streamer. #
|
||||||
# #
|
# #
|
||||||
# Copyright (C) 2018-2022 Maxim Devaev <mdevaev@gmail.com> #
|
# Copyright (C) 2018-2023 Maxim Devaev <mdevaev@gmail.com> #
|
||||||
# #
|
# #
|
||||||
# This program is free software: you can redistribute it and/or modify #
|
# 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 #
|
# it under the terms of the GNU General Public License as published by #
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
# #
|
# #
|
||||||
# uStreamer - Lightweight and fast MJPEG-HTTP streamer. #
|
# uStreamer - Lightweight and fast MJPEG-HTTP streamer. #
|
||||||
# #
|
# #
|
||||||
# Copyright (C) 2018-2022 Maxim Devaev <mdevaev@gmail.com> #
|
# Copyright (C) 2018-2023 Maxim Devaev <mdevaev@gmail.com> #
|
||||||
# #
|
# #
|
||||||
# This program is free software: you can redistribute it and/or modify #
|
# 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 #
|
# it under the terms of the GNU General Public License as published by #
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
# #
|
# #
|
||||||
# uStreamer - Lightweight and fast MJPEG-HTTP streamer. #
|
# uStreamer - Lightweight and fast MJPEG-HTTP streamer. #
|
||||||
# #
|
# #
|
||||||
# Copyright (C) 2018-2022 Maxim Devaev <mdevaev@gmail.com> #
|
# Copyright (C) 2018-2023 Maxim Devaev <mdevaev@gmail.com> #
|
||||||
# #
|
# #
|
||||||
# This program is free software: you can redistribute it and/or modify #
|
# 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 #
|
# it under the terms of the GNU General Public License as published by #
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
# #
|
# #
|
||||||
# uStreamer - Lightweight and fast MJPEG-HTTP streamer. #
|
# uStreamer - Lightweight and fast MJPEG-HTTP streamer. #
|
||||||
# #
|
# #
|
||||||
# Copyright (C) 2018-2022 Maxim Devaev <mdevaev@gmail.com> #
|
# Copyright (C) 2018-2023 Maxim Devaev <mdevaev@gmail.com> #
|
||||||
# #
|
# #
|
||||||
# This program is free software: you can redistribute it and/or modify #
|
# 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 #
|
# it under the terms of the GNU General Public License as published by #
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
# #
|
# #
|
||||||
# uStreamer - Lightweight and fast MJPEG-HTTP streamer. #
|
# uStreamer - Lightweight and fast MJPEG-HTTP streamer. #
|
||||||
# #
|
# #
|
||||||
# Copyright (C) 2018-2022 Maxim Devaev <mdevaev@gmail.com> #
|
# Copyright (C) 2018-2023 Maxim Devaev <mdevaev@gmail.com> #
|
||||||
# #
|
# #
|
||||||
# This program is free software: you can redistribute it and/or modify #
|
# 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 #
|
# it under the terms of the GNU General Public License as published by #
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
# #
|
# #
|
||||||
# uStreamer - Lightweight and fast MJPEG-HTTP streamer. #
|
# uStreamer - Lightweight and fast MJPEG-HTTP streamer. #
|
||||||
# #
|
# #
|
||||||
# Copyright (C) 2018-2022 Maxim Devaev <mdevaev@gmail.com> #
|
# Copyright (C) 2018-2023 Maxim Devaev <mdevaev@gmail.com> #
|
||||||
# #
|
# #
|
||||||
# This program is free software: you can redistribute it and/or modify #
|
# 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 #
|
# it under the terms of the GNU General Public License as published by #
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
# #
|
# #
|
||||||
# uStreamer - Lightweight and fast MJPEG-HTTP streamer. #
|
# uStreamer - Lightweight and fast MJPEG-HTTP streamer. #
|
||||||
# #
|
# #
|
||||||
# Copyright (C) 2018-2022 Maxim Devaev <mdevaev@gmail.com> #
|
# Copyright (C) 2018-2023 Maxim Devaev <mdevaev@gmail.com> #
|
||||||
# #
|
# #
|
||||||
# This program is free software: you can redistribute it and/or modify #
|
# 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 #
|
# it under the terms of the GNU General Public License as published by #
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
# #
|
# #
|
||||||
# uStreamer - Lightweight and fast MJPEG-HTTP streamer. #
|
# uStreamer - Lightweight and fast MJPEG-HTTP streamer. #
|
||||||
# #
|
# #
|
||||||
# Copyright (C) 2018-2022 Maxim Devaev <mdevaev@gmail.com> #
|
# Copyright (C) 2018-2023 Maxim Devaev <mdevaev@gmail.com> #
|
||||||
# #
|
# #
|
||||||
# This program is free software: you can redistribute it and/or modify #
|
# 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 #
|
# it under the terms of the GNU General Public License as published by #
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
# #
|
# #
|
||||||
# uStreamer - Lightweight and fast MJPEG-HTTP streamer. #
|
# uStreamer - Lightweight and fast MJPEG-HTTP streamer. #
|
||||||
# #
|
# #
|
||||||
# Copyright (C) 2018-2022 Maxim Devaev <mdevaev@gmail.com> #
|
# Copyright (C) 2018-2023 Maxim Devaev <mdevaev@gmail.com> #
|
||||||
# #
|
# #
|
||||||
# This program is free software: you can redistribute it and/or modify #
|
# 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 #
|
# it under the terms of the GNU General Public License as published by #
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
# #
|
# #
|
||||||
# uStreamer - Lightweight and fast MJPEG-HTTP streamer. #
|
# uStreamer - Lightweight and fast MJPEG-HTTP streamer. #
|
||||||
# #
|
# #
|
||||||
# Copyright (C) 2018-2022 Maxim Devaev <mdevaev@gmail.com> #
|
# Copyright (C) 2018-2023 Maxim Devaev <mdevaev@gmail.com> #
|
||||||
# #
|
# #
|
||||||
# This program is free software: you can redistribute it and/or modify #
|
# 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 #
|
# it under the terms of the GNU General Public License as published by #
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
# #
|
# #
|
||||||
# uStreamer - Lightweight and fast MJPEG-HTTP streamer. #
|
# uStreamer - Lightweight and fast MJPEG-HTTP streamer. #
|
||||||
# #
|
# #
|
||||||
# Copyright (C) 2018-2022 Maxim Devaev <mdevaev@gmail.com> #
|
# Copyright (C) 2018-2023 Maxim Devaev <mdevaev@gmail.com> #
|
||||||
# #
|
# #
|
||||||
# This program is free software: you can redistribute it and/or modify #
|
# 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 #
|
# it under the terms of the GNU General Public License as published by #
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
# #
|
# #
|
||||||
# uStreamer - Lightweight and fast MJPEG-HTTP streamer. #
|
# uStreamer - Lightweight and fast MJPEG-HTTP streamer. #
|
||||||
# #
|
# #
|
||||||
# Copyright (C) 2018-2022 Maxim Devaev <mdevaev@gmail.com> #
|
# Copyright (C) 2018-2023 Maxim Devaev <mdevaev@gmail.com> #
|
||||||
# #
|
# #
|
||||||
# This program is free software: you can redistribute it and/or modify #
|
# 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 #
|
# it under the terms of the GNU General Public License as published by #
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
# #
|
# #
|
||||||
# uStreamer - Lightweight and fast MJPEG-HTTP streamer. #
|
# uStreamer - Lightweight and fast MJPEG-HTTP streamer. #
|
||||||
# #
|
# #
|
||||||
# Copyright (C) 2018-2022 Maxim Devaev <mdevaev@gmail.com> #
|
# Copyright (C) 2018-2023 Maxim Devaev <mdevaev@gmail.com> #
|
||||||
# #
|
# #
|
||||||
# This program is free software: you can redistribute it and/or modify #
|
# 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 #
|
# it under the terms of the GNU General Public License as published by #
|
||||||
@@ -50,10 +50,10 @@
|
|||||||
|
|
||||||
|
|
||||||
#define US_VIDEO_MIN_WIDTH ((unsigned)160)
|
#define US_VIDEO_MIN_WIDTH ((unsigned)160)
|
||||||
#define US_VIDEO_MAX_WIDTH ((unsigned)10240)
|
#define US_VIDEO_MAX_WIDTH ((unsigned)15360)
|
||||||
|
|
||||||
#define US_VIDEO_MIN_HEIGHT ((unsigned)120)
|
#define US_VIDEO_MIN_HEIGHT ((unsigned)120)
|
||||||
#define US_VIDEO_MAX_HEIGHT ((unsigned)4320)
|
#define US_VIDEO_MAX_HEIGHT ((unsigned)8640)
|
||||||
|
|
||||||
#define US_VIDEO_MAX_FPS ((unsigned)120)
|
#define US_VIDEO_MAX_FPS ((unsigned)120)
|
||||||
|
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
# #
|
# #
|
||||||
# uStreamer - Lightweight and fast MJPEG-HTTP streamer. #
|
# uStreamer - Lightweight and fast MJPEG-HTTP streamer. #
|
||||||
# #
|
# #
|
||||||
# Copyright (C) 2018-2022 Maxim Devaev <mdevaev@gmail.com> #
|
# Copyright (C) 2018-2023 Maxim Devaev <mdevaev@gmail.com> #
|
||||||
# #
|
# #
|
||||||
# This program is free software: you can redistribute it and/or modify #
|
# 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 #
|
# it under the terms of the GNU General Public License as published by #
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
# #
|
# #
|
||||||
# uStreamer - Lightweight and fast MJPEG-HTTP streamer. #
|
# uStreamer - Lightweight and fast MJPEG-HTTP streamer. #
|
||||||
# #
|
# #
|
||||||
# Copyright (C) 2018-2022 Maxim Devaev <mdevaev@gmail.com> #
|
# Copyright (C) 2018-2023 Maxim Devaev <mdevaev@gmail.com> #
|
||||||
# #
|
# #
|
||||||
# This program is free software: you can redistribute it and/or modify #
|
# 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 #
|
# it under the terms of the GNU General Public License as published by #
|
||||||
|
|||||||
@@ -7,7 +7,7 @@
|
|||||||
# Copyright (C) 2005-2006 Laurent Pinchart & Michel Xhaard #
|
# Copyright (C) 2005-2006 Laurent Pinchart & Michel Xhaard #
|
||||||
# Copyright (C) 2006 Gabriel A. Devenyi #
|
# Copyright (C) 2006 Gabriel A. Devenyi #
|
||||||
# Copyright (C) 2007 Tom Stöveken #
|
# Copyright (C) 2007 Tom Stöveken #
|
||||||
# Copyright (C) 2018-2022 Maxim Devaev <mdevaev@gmail.com> #
|
# Copyright (C) 2018-2023 Maxim Devaev <mdevaev@gmail.com> #
|
||||||
# #
|
# #
|
||||||
# This program is free software: you can redistribute it and/or modify #
|
# 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 #
|
# it under the terms of the GNU General Public License as published by #
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
# #
|
# #
|
||||||
# uStreamer - Lightweight and fast MJPEG-HTTP streamer. #
|
# uStreamer - Lightweight and fast MJPEG-HTTP streamer. #
|
||||||
# #
|
# #
|
||||||
# Copyright (C) 2018-2022 Maxim Devaev <mdevaev@gmail.com> #
|
# Copyright (C) 2018-2023 Maxim Devaev <mdevaev@gmail.com> #
|
||||||
# #
|
# #
|
||||||
# This program is free software: you can redistribute it and/or modify #
|
# 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 #
|
# it under the terms of the GNU General Public License as published by #
|
||||||
|
|||||||
@@ -7,7 +7,7 @@
|
|||||||
# Copyright (C) 2005-2006 Laurent Pinchart & Michel Xhaard #
|
# Copyright (C) 2005-2006 Laurent Pinchart & Michel Xhaard #
|
||||||
# Copyright (C) 2006 Gabriel A. Devenyi #
|
# Copyright (C) 2006 Gabriel A. Devenyi #
|
||||||
# Copyright (C) 2007 Tom Stöveken #
|
# Copyright (C) 2007 Tom Stöveken #
|
||||||
# Copyright (C) 2018-2022 Maxim Devaev <mdevaev@gmail.com> #
|
# Copyright (C) 2018-2023 Maxim Devaev <mdevaev@gmail.com> #
|
||||||
# #
|
# #
|
||||||
# This program is free software: you can redistribute it and/or modify #
|
# 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 #
|
# it under the terms of the GNU General Public License as published by #
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
# #
|
# #
|
||||||
# uStreamer - Lightweight and fast MJPEG-HTTP streamer. #
|
# uStreamer - Lightweight and fast MJPEG-HTTP streamer. #
|
||||||
# #
|
# #
|
||||||
# Copyright (C) 2018-2022 Maxim Devaev <mdevaev@gmail.com> #
|
# Copyright (C) 2018-2023 Maxim Devaev <mdevaev@gmail.com> #
|
||||||
# #
|
# #
|
||||||
# This program is free software: you can redistribute it and/or modify #
|
# 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 #
|
# it under the terms of the GNU General Public License as published by #
|
||||||
|
|||||||
@@ -7,7 +7,7 @@
|
|||||||
# Copyright (C) 2005-2006 Laurent Pinchart & Michel Xhaard #
|
# Copyright (C) 2005-2006 Laurent Pinchart & Michel Xhaard #
|
||||||
# Copyright (C) 2006 Gabriel A. Devenyi #
|
# Copyright (C) 2006 Gabriel A. Devenyi #
|
||||||
# Copyright (C) 2007 Tom Stöveken #
|
# Copyright (C) 2007 Tom Stöveken #
|
||||||
# Copyright (C) 2018-2022 Maxim Devaev <mdevaev@gmail.com> #
|
# Copyright (C) 2018-2023 Maxim Devaev <mdevaev@gmail.com> #
|
||||||
# #
|
# #
|
||||||
# This program is free software: you can redistribute it and/or modify #
|
# 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 #
|
# it under the terms of the GNU General Public License as published by #
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
# #
|
# #
|
||||||
# uStreamer - Lightweight and fast MJPEG-HTTP streamer. #
|
# uStreamer - Lightweight and fast MJPEG-HTTP streamer. #
|
||||||
# #
|
# #
|
||||||
# Copyright (C) 2018-2022 Maxim Devaev <mdevaev@gmail.com> #
|
# Copyright (C) 2018-2023 Maxim Devaev <mdevaev@gmail.com> #
|
||||||
# #
|
# #
|
||||||
# This program is free software: you can redistribute it and/or modify #
|
# 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 #
|
# it under the terms of the GNU General Public License as published by #
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
# #
|
# #
|
||||||
# uStreamer - Lightweight and fast MJPEG-HTTP streamer. #
|
# uStreamer - Lightweight and fast MJPEG-HTTP streamer. #
|
||||||
# #
|
# #
|
||||||
# Copyright (C) 2018-2022 Maxim Devaev <mdevaev@gmail.com> #
|
# Copyright (C) 2018-2023 Maxim Devaev <mdevaev@gmail.com> #
|
||||||
# #
|
# #
|
||||||
# This program is free software: you can redistribute it and/or modify #
|
# 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 #
|
# it under the terms of the GNU General Public License as published by #
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
# #
|
# #
|
||||||
# uStreamer - Lightweight and fast MJPEG-HTTP streamer. #
|
# uStreamer - Lightweight and fast MJPEG-HTTP streamer. #
|
||||||
# #
|
# #
|
||||||
# Copyright (C) 2018-2022 Maxim Devaev <mdevaev@gmail.com> #
|
# Copyright (C) 2018-2023 Maxim Devaev <mdevaev@gmail.com> #
|
||||||
# #
|
# #
|
||||||
# This program is free software: you can redistribute it and/or modify #
|
# 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 #
|
# it under the terms of the GNU General Public License as published by #
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
# #
|
# #
|
||||||
# uStreamer - Lightweight and fast MJPEG-HTTP streamer. #
|
# uStreamer - Lightweight and fast MJPEG-HTTP streamer. #
|
||||||
# #
|
# #
|
||||||
# Copyright (C) 2018-2022 Maxim Devaev <mdevaev@gmail.com> #
|
# Copyright (C) 2018-2023 Maxim Devaev <mdevaev@gmail.com> #
|
||||||
# #
|
# #
|
||||||
# This program is free software: you can redistribute it and/or modify #
|
# 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 #
|
# it under the terms of the GNU General Public License as published by #
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
# #
|
# #
|
||||||
# uStreamer - Lightweight and fast MJPEG-HTTP streamer. #
|
# uStreamer - Lightweight and fast MJPEG-HTTP streamer. #
|
||||||
# #
|
# #
|
||||||
# Copyright (C) 2018-2022 Maxim Devaev <mdevaev@gmail.com> #
|
# Copyright (C) 2018-2023 Maxim Devaev <mdevaev@gmail.com> #
|
||||||
# #
|
# #
|
||||||
# This program is free software: you can redistribute it and/or modify #
|
# 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 #
|
# it under the terms of the GNU General Public License as published by #
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
# #
|
# #
|
||||||
# uStreamer - Lightweight and fast MJPEG-HTTP streamer. #
|
# uStreamer - Lightweight and fast MJPEG-HTTP streamer. #
|
||||||
# #
|
# #
|
||||||
# Copyright (C) 2018-2022 Maxim Devaev <mdevaev@gmail.com> #
|
# Copyright (C) 2018-2023 Maxim Devaev <mdevaev@gmail.com> #
|
||||||
# #
|
# #
|
||||||
# This program is free software: you can redistribute it and/or modify #
|
# 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 #
|
# it under the terms of the GNU General Public License as published by #
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
# #
|
# #
|
||||||
# uStreamer - Lightweight and fast MJPEG-HTTP streamer. #
|
# uStreamer - Lightweight and fast MJPEG-HTTP streamer. #
|
||||||
# #
|
# #
|
||||||
# Copyright (C) 2018-2022 Maxim Devaev <mdevaev@gmail.com> #
|
# Copyright (C) 2018-2023 Maxim Devaev <mdevaev@gmail.com> #
|
||||||
# #
|
# #
|
||||||
# This program is free software: you can redistribute it and/or modify #
|
# 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 #
|
# it under the terms of the GNU General Public License as published by #
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
# #
|
# #
|
||||||
# uStreamer - Lightweight and fast MJPEG-HTTP streamer. #
|
# uStreamer - Lightweight and fast MJPEG-HTTP streamer. #
|
||||||
# #
|
# #
|
||||||
# Copyright (C) 2018-2022 Maxim Devaev <mdevaev@gmail.com> #
|
# Copyright (C) 2018-2023 Maxim Devaev <mdevaev@gmail.com> #
|
||||||
# #
|
# #
|
||||||
# This program is free software: you can redistribute it and/or modify #
|
# 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 #
|
# it under the terms of the GNU General Public License as published by #
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
# #
|
# #
|
||||||
# uStreamer - Lightweight and fast MJPEG-HTTP streamer. #
|
# uStreamer - Lightweight and fast MJPEG-HTTP streamer. #
|
||||||
# #
|
# #
|
||||||
# Copyright (C) 2018-2022 Maxim Devaev <mdevaev@gmail.com> #
|
# Copyright (C) 2018-2023 Maxim Devaev <mdevaev@gmail.com> #
|
||||||
# #
|
# #
|
||||||
# This program is free software: you can redistribute it and/or modify #
|
# 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 #
|
# it under the terms of the GNU General Public License as published by #
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
# #
|
# #
|
||||||
# uStreamer - Lightweight and fast MJPEG-HTTP streamer. #
|
# uStreamer - Lightweight and fast MJPEG-HTTP streamer. #
|
||||||
# #
|
# #
|
||||||
# Copyright (C) 2018-2022 Maxim Devaev <mdevaev@gmail.com> #
|
# Copyright (C) 2018-2023 Maxim Devaev <mdevaev@gmail.com> #
|
||||||
# #
|
# #
|
||||||
# This program is free software: you can redistribute it and/or modify #
|
# 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 #
|
# it under the terms of the GNU General Public License as published by #
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
# #
|
# #
|
||||||
# uStreamer - Lightweight and fast MJPEG-HTTP streamer. #
|
# uStreamer - Lightweight and fast MJPEG-HTTP streamer. #
|
||||||
# #
|
# #
|
||||||
# Copyright (C) 2018-2022 Maxim Devaev <mdevaev@gmail.com> #
|
# Copyright (C) 2018-2023 Maxim Devaev <mdevaev@gmail.com> #
|
||||||
# #
|
# #
|
||||||
# This program is free software: you can redistribute it and/or modify #
|
# 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 #
|
# it under the terms of the GNU General Public License as published by #
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
# #
|
# #
|
||||||
# uStreamer - Lightweight and fast MJPEG-HTTP streamer. #
|
# uStreamer - Lightweight and fast MJPEG-HTTP streamer. #
|
||||||
# #
|
# #
|
||||||
# Copyright (C) 2018-2022 Maxim Devaev <mdevaev@gmail.com> #
|
# Copyright (C) 2018-2023 Maxim Devaev <mdevaev@gmail.com> #
|
||||||
# #
|
# #
|
||||||
# This program is free software: you can redistribute it and/or modify #
|
# 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 #
|
# it under the terms of the GNU General Public License as published by #
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
# #
|
# #
|
||||||
# uStreamer - Lightweight and fast MJPEG-HTTP streamer. #
|
# uStreamer - Lightweight and fast MJPEG-HTTP streamer. #
|
||||||
# #
|
# #
|
||||||
# Copyright (C) 2018-2022 Maxim Devaev <mdevaev@gmail.com> #
|
# Copyright (C) 2018-2023 Maxim Devaev <mdevaev@gmail.com> #
|
||||||
# #
|
# #
|
||||||
# This program is free software: you can redistribute it and/or modify #
|
# 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 #
|
# it under the terms of the GNU General Public License as published by #
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
# #
|
# #
|
||||||
# uStreamer - Lightweight and fast MJPEG-HTTP streamer. #
|
# uStreamer - Lightweight and fast MJPEG-HTTP streamer. #
|
||||||
# #
|
# #
|
||||||
# Copyright (C) 2018-2022 Maxim Devaev <mdevaev@gmail.com> #
|
# Copyright (C) 2018-2023 Maxim Devaev <mdevaev@gmail.com> #
|
||||||
# #
|
# #
|
||||||
# This program is free software: you can redistribute it and/or modify #
|
# 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 #
|
# it under the terms of the GNU General Public License as published by #
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
# #
|
# #
|
||||||
# uStreamer - Lightweight and fast MJPEG-HTTP streamer. #
|
# uStreamer - Lightweight and fast MJPEG-HTTP streamer. #
|
||||||
# #
|
# #
|
||||||
# Copyright (C) 2018-2022 Maxim Devaev <mdevaev@gmail.com> #
|
# Copyright (C) 2018-2023 Maxim Devaev <mdevaev@gmail.com> #
|
||||||
# #
|
# #
|
||||||
# This program is free software: you can redistribute it and/or modify #
|
# 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 #
|
# it under the terms of the GNU General Public License as published by #
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
# #
|
# #
|
||||||
# uStreamer - Lightweight and fast MJPEG-HTTP streamer. #
|
# uStreamer - Lightweight and fast MJPEG-HTTP streamer. #
|
||||||
# #
|
# #
|
||||||
# Copyright (C) 2018-2022 Maxim Devaev <mdevaev@gmail.com> #
|
# Copyright (C) 2018-2023 Maxim Devaev <mdevaev@gmail.com> #
|
||||||
# #
|
# #
|
||||||
# This program is free software: you can redistribute it and/or modify #
|
# 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 #
|
# it under the terms of the GNU General Public License as published by #
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
# #
|
# #
|
||||||
# uStreamer - Lightweight and fast MJPEG-HTTP streamer. #
|
# uStreamer - Lightweight and fast MJPEG-HTTP streamer. #
|
||||||
# #
|
# #
|
||||||
# Copyright (C) 2018-2022 Maxim Devaev <mdevaev@gmail.com> #
|
# Copyright (C) 2018-2023 Maxim Devaev <mdevaev@gmail.com> #
|
||||||
# #
|
# #
|
||||||
# This program is free software: you can redistribute it and/or modify #
|
# 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 #
|
# it under the terms of the GNU General Public License as published by #
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
# #
|
# #
|
||||||
# uStreamer - Lightweight and fast MJPEG-HTTP streamer. #
|
# uStreamer - Lightweight and fast MJPEG-HTTP streamer. #
|
||||||
# #
|
# #
|
||||||
# Copyright (C) 2018-2022 Maxim Devaev <mdevaev@gmail.com> #
|
# Copyright (C) 2018-2023 Maxim Devaev <mdevaev@gmail.com> #
|
||||||
# #
|
# #
|
||||||
# This program is free software: you can redistribute it and/or modify #
|
# 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 #
|
# it under the terms of the GNU General Public License as published by #
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
# #
|
# #
|
||||||
# uStreamer - Lightweight and fast MJPEG-HTTP streamer. #
|
# uStreamer - Lightweight and fast MJPEG-HTTP streamer. #
|
||||||
# #
|
# #
|
||||||
# Copyright (C) 2018-2022 Maxim Devaev <mdevaev@gmail.com> #
|
# Copyright (C) 2018-2023 Maxim Devaev <mdevaev@gmail.com> #
|
||||||
# #
|
# #
|
||||||
# This program is free software: you can redistribute it and/or modify #
|
# 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 #
|
# it under the terms of the GNU General Public License as published by #
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
# #
|
# #
|
||||||
# uStreamer - Lightweight and fast MJPEG-HTTP streamer. #
|
# uStreamer - Lightweight and fast MJPEG-HTTP streamer. #
|
||||||
# #
|
# #
|
||||||
# Copyright (C) 2018-2022 Maxim Devaev <mdevaev@gmail.com> #
|
# Copyright (C) 2018-2023 Maxim Devaev <mdevaev@gmail.com> #
|
||||||
# #
|
# #
|
||||||
# This program is free software: you can redistribute it and/or modify #
|
# 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 #
|
# it under the terms of the GNU General Public License as published by #
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
# #
|
# #
|
||||||
# uStreamer - Lightweight and fast MJPEG-HTTP streamer. #
|
# uStreamer - Lightweight and fast MJPEG-HTTP streamer. #
|
||||||
# #
|
# #
|
||||||
# Copyright (C) 2018-2022 Maxim Devaev <mdevaev@gmail.com> #
|
# Copyright (C) 2018-2023 Maxim Devaev <mdevaev@gmail.com> #
|
||||||
# #
|
# #
|
||||||
# This program is free software: you can redistribute it and/or modify #
|
# 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 #
|
# it under the terms of the GNU General Public License as published by #
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
# #
|
# #
|
||||||
# uStreamer - Lightweight and fast MJPEG-HTTP streamer. #
|
# uStreamer - Lightweight and fast MJPEG-HTTP streamer. #
|
||||||
# #
|
# #
|
||||||
# Copyright (C) 2018-2022 Maxim Devaev <mdevaev@gmail.com> #
|
# Copyright (C) 2018-2023 Maxim Devaev <mdevaev@gmail.com> #
|
||||||
# #
|
# #
|
||||||
# This program is free software: you can redistribute it and/or modify #
|
# 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 #
|
# it under the terms of the GNU General Public License as published by #
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
# #
|
# #
|
||||||
# uStreamer - Lightweight and fast MJPEG-HTTP streamer. #
|
# uStreamer - Lightweight and fast MJPEG-HTTP streamer. #
|
||||||
# #
|
# #
|
||||||
# Copyright (C) 2018-2022 Maxim Devaev <mdevaev@gmail.com> #
|
# Copyright (C) 2018-2023 Maxim Devaev <mdevaev@gmail.com> #
|
||||||
# #
|
# #
|
||||||
# This program is free software: you can redistribute it and/or modify #
|
# 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 #
|
# it under the terms of the GNU General Public License as published by #
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
# #
|
# #
|
||||||
# uStreamer - Lightweight and fast MJPEG-HTTP streamer. #
|
# uStreamer - Lightweight and fast MJPEG-HTTP streamer. #
|
||||||
# #
|
# #
|
||||||
# Copyright (C) 2018-2022 Maxim Devaev <mdevaev@gmail.com> #
|
# Copyright (C) 2018-2023 Maxim Devaev <mdevaev@gmail.com> #
|
||||||
# #
|
# #
|
||||||
# This program is free software: you can redistribute it and/or modify #
|
# 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 #
|
# it under the terms of the GNU General Public License as published by #
|
||||||
@@ -591,7 +591,7 @@ static void _help(FILE *fp, us_device_s *dev, us_encoder_s *enc, us_stream_s *st
|
|||||||
SAY("\nuStreamer - Lightweight and fast MJPEG-HTTP streamer");
|
SAY("\nuStreamer - Lightweight and fast MJPEG-HTTP streamer");
|
||||||
SAY("═══════════════════════════════════════════════════");
|
SAY("═══════════════════════════════════════════════════");
|
||||||
SAY("Version: %s; license: GPLv3", US_VERSION);
|
SAY("Version: %s; license: GPLv3", US_VERSION);
|
||||||
SAY("Copyright (C) 2018-2022 Maxim Devaev <mdevaev@gmail.com>\n");
|
SAY("Copyright (C) 2018-2023 Maxim Devaev <mdevaev@gmail.com>\n");
|
||||||
SAY("Capturing options:");
|
SAY("Capturing options:");
|
||||||
SAY("══════════════════");
|
SAY("══════════════════");
|
||||||
SAY(" -d|--device </dev/path> ───────────── Path to V4L2 device. Default: %s.\n", dev->path);
|
SAY(" -d|--device </dev/path> ───────────── Path to V4L2 device. Default: %s.\n", dev->path);
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
# #
|
# #
|
||||||
# uStreamer - Lightweight and fast MJPEG-HTTP streamer. #
|
# uStreamer - Lightweight and fast MJPEG-HTTP streamer. #
|
||||||
# #
|
# #
|
||||||
# Copyright (C) 2018-2022 Maxim Devaev <mdevaev@gmail.com> #
|
# Copyright (C) 2018-2023 Maxim Devaev <mdevaev@gmail.com> #
|
||||||
# #
|
# #
|
||||||
# This program is free software: you can redistribute it and/or modify #
|
# 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 #
|
# it under the terms of the GNU General Public License as published by #
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
# #
|
# #
|
||||||
# uStreamer - Lightweight and fast MJPEG-HTTP streamer. #
|
# uStreamer - Lightweight and fast MJPEG-HTTP streamer. #
|
||||||
# #
|
# #
|
||||||
# Copyright (C) 2018-2022 Maxim Devaev <mdevaev@gmail.com> #
|
# Copyright (C) 2018-2023 Maxim Devaev <mdevaev@gmail.com> #
|
||||||
# #
|
# #
|
||||||
# This program is free software: you can redistribute it and/or modify #
|
# 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 #
|
# it under the terms of the GNU General Public License as published by #
|
||||||
@@ -198,10 +198,13 @@ void us_stream_loop(us_stream_s *stream) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (has_write) {
|
// Это условие было добавлено из параноидальных соображений, и мы ни разу не сталкивались
|
||||||
|
// с подобными ошибками, кроме случая с libcamerify, который генерит эвенты на запись.
|
||||||
|
// Судя по всему, игнорирование has_write не делает никому плохо.
|
||||||
|
/*if (has_write) {
|
||||||
US_LOG_ERROR("Got unexpected writing event, seems device was disconnected");
|
US_LOG_ERROR("Got unexpected writing event, seems device was disconnected");
|
||||||
break;
|
break;
|
||||||
}
|
}*/
|
||||||
|
|
||||||
if (has_error) {
|
if (has_error) {
|
||||||
US_LOG_INFO("Got V4L2 event");
|
US_LOG_INFO("Got V4L2 event");
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
# #
|
# #
|
||||||
# uStreamer - Lightweight and fast MJPEG-HTTP streamer. #
|
# uStreamer - Lightweight and fast MJPEG-HTTP streamer. #
|
||||||
# #
|
# #
|
||||||
# Copyright (C) 2018-2022 Maxim Devaev <mdevaev@gmail.com> #
|
# Copyright (C) 2018-2023 Maxim Devaev <mdevaev@gmail.com> #
|
||||||
# #
|
# #
|
||||||
# This program is free software: you can redistribute it and/or modify #
|
# 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 #
|
# it under the terms of the GNU General Public License as published by #
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
# #
|
# #
|
||||||
# uStreamer - Lightweight and fast MJPEG-HTTP streamer. #
|
# uStreamer - Lightweight and fast MJPEG-HTTP streamer. #
|
||||||
# #
|
# #
|
||||||
# Copyright (C) 2018-2022 Maxim Devaev <mdevaev@gmail.com> #
|
# Copyright (C) 2018-2023 Maxim Devaev <mdevaev@gmail.com> #
|
||||||
# #
|
# #
|
||||||
# This program is free software: you can redistribute it and/or modify #
|
# 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 #
|
# it under the terms of the GNU General Public License as published by #
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
# #
|
# #
|
||||||
# uStreamer - Lightweight and fast MJPEG-HTTP streamer. #
|
# uStreamer - Lightweight and fast MJPEG-HTTP streamer. #
|
||||||
# #
|
# #
|
||||||
# Copyright (C) 2018-2022 Maxim Devaev <mdevaev@gmail.com> #
|
# Copyright (C) 2018-2023 Maxim Devaev <mdevaev@gmail.com> #
|
||||||
# #
|
# #
|
||||||
# This program is free software: you can redistribute it and/or modify #
|
# 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 #
|
# it under the terms of the GNU General Public License as published by #
|
||||||
|
|||||||
@@ -3,7 +3,7 @@
|
|||||||
# #
|
# #
|
||||||
# uStreamer - Lightweight and fast MJPEG-HTTP streamer. #
|
# uStreamer - Lightweight and fast MJPEG-HTTP streamer. #
|
||||||
# #
|
# #
|
||||||
# Copyright (C) 2018-2022 Maxim Devaev <mdevaev@gmail.com> #
|
# Copyright (C) 2018-2023 Maxim Devaev <mdevaev@gmail.com> #
|
||||||
# #
|
# #
|
||||||
# This program is free software: you can redistribute it and/or modify #
|
# 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 #
|
# it under the terms of the GNU General Public License as published by #
|
||||||
@@ -30,7 +30,7 @@ C_PREPEND = textwrap.dedent("""
|
|||||||
# #
|
# #
|
||||||
# uStreamer - Lightweight and fast MJPEG-HTTP streamer. #
|
# uStreamer - Lightweight and fast MJPEG-HTTP streamer. #
|
||||||
# #
|
# #
|
||||||
# Copyright (C) 2018-2022 Maxim Devaev <mdevaev@gmail.com> #
|
# Copyright (C) 2018-2023 Maxim Devaev <mdevaev@gmail.com> #
|
||||||
# #
|
# #
|
||||||
# This program is free software: you can redistribute it and/or modify #
|
# 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 #
|
# it under the terms of the GNU General Public License as published by #
|
||||||
|
|||||||
@@ -3,7 +3,7 @@
|
|||||||
# #
|
# #
|
||||||
# uStreamer - Lightweight and fast MJPEG-HTTP streamer. #
|
# uStreamer - Lightweight and fast MJPEG-HTTP streamer. #
|
||||||
# #
|
# #
|
||||||
# Copyright (C) 2018-2022 Maxim Devaev <mdevaev@gmail.com> #
|
# Copyright (C) 2018-2023 Maxim Devaev <mdevaev@gmail.com> #
|
||||||
# #
|
# #
|
||||||
# This program is free software: you can redistribute it and/or modify #
|
# 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 #
|
# it under the terms of the GNU General Public License as published by #
|
||||||
|
|||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user