mirror of
https://github.com/pikvm/ustreamer.git
synced 2026-03-03 14:21:42 +00:00
Compare commits
4 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
da0e00252d | ||
|
|
526ae8c3e6 | ||
|
|
d5081b2c18 | ||
|
|
758b5558f9 |
@@ -1,7 +1,7 @@
|
|||||||
[bumpversion]
|
[bumpversion]
|
||||||
commit = True
|
commit = True
|
||||||
tag = True
|
tag = True
|
||||||
current_version = 0.29
|
current_version = 0.31
|
||||||
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}
|
||||||
|
|||||||
2
PKGBUILD
2
PKGBUILD
@@ -3,7 +3,7 @@
|
|||||||
|
|
||||||
|
|
||||||
pkgname=ustreamer
|
pkgname=ustreamer
|
||||||
pkgver=0.29
|
pkgver=0.31
|
||||||
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"
|
||||||
|
|||||||
@@ -21,4 +21,4 @@
|
|||||||
|
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#define VERSION "0.29"
|
#define VERSION "0.31"
|
||||||
|
|||||||
13
src/http.c
13
src/http.c
@@ -188,12 +188,13 @@ static void _http_callback_ping(struct evhttp_request *request, void *v_server)
|
|||||||
assert((buf = evbuffer_new()));
|
assert((buf = evbuffer_new()));
|
||||||
assert(evbuffer_add_printf(buf,
|
assert(evbuffer_add_printf(buf,
|
||||||
"{\"source\": {\"resolution\": {\"width\": %u, \"height\": %u},"
|
"{\"source\": {\"resolution\": {\"width\": %u, \"height\": %u},"
|
||||||
" \"online\": %s, \"quality\": %u, \"captured_fps\": %u},"
|
" \"online\": %s, \"quality\": %u, \"soft_fps\": %u, \"captured_fps\": %u},"
|
||||||
" \"stream\": {\"queued_fps\": %u, \"clients\": %u, \"clients_stat\": {",
|
" \"stream\": {\"queued_fps\": %u, \"clients\": %u, \"clients_stat\": {",
|
||||||
(server->fake_width ? server->fake_width : server->run->exposed->width),
|
(server->fake_width ? server->fake_width : server->run->exposed->width),
|
||||||
(server->fake_height ? server->fake_height : server->run->exposed->height),
|
(server->fake_height ? server->fake_height : server->run->exposed->height),
|
||||||
bool_to_string(server->run->exposed->online),
|
bool_to_string(server->run->exposed->online),
|
||||||
server->run->stream->encoder->quality,
|
server->run->stream->encoder->quality,
|
||||||
|
server->run->stream->dev->soft_fps,
|
||||||
server->run->exposed->captured_fps,
|
server->run->exposed->captured_fps,
|
||||||
server->run->exposed->queued_fps,
|
server->run->exposed->queued_fps,
|
||||||
server->run->stream_clients_count
|
server->run->stream_clients_count
|
||||||
@@ -306,8 +307,14 @@ static void _http_callback_stream(struct evhttp_request *request, void *v_server
|
|||||||
|
|
||||||
evhttp_connection_get_peer(conn, &client_addr, &client_port);
|
evhttp_connection_get_peer(conn, &client_addr, &client_port);
|
||||||
LOG_INFO(
|
LOG_INFO(
|
||||||
"HTTP: Registered the new stream client: [%s]:%u; id=%s; clients now: %u",
|
"HTTP: Registered the new stream client: [%s]:%u; id=%s;"
|
||||||
client_addr, client_port, client->id, server->run->stream_clients_count
|
" advance_headers=%s; dual_final_frames=%s; clients now: %u",
|
||||||
|
client_addr,
|
||||||
|
client_port,
|
||||||
|
client->id,
|
||||||
|
bool_to_string(client->advance_headers),
|
||||||
|
bool_to_string(client->dual_final_frames),
|
||||||
|
server->run->stream_clients_count
|
||||||
);
|
);
|
||||||
|
|
||||||
buf_event = evhttp_connection_get_bufferevent(conn);
|
buf_event = evhttp_connection_get_bufferevent(conn);
|
||||||
|
|||||||
Reference in New Issue
Block a user