forked/ustreamer
1
0
Fork 0
mirror of https://github.com/pikvm/ustreamer.git synced 2026-03-13 02:53:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactoring

Browse Source
This commit is contained in:
Maxim Devaev
2024-02-29 18:21:26 +02:00
parent d9401b70f5
commit a3f4294cd8
2 changed files with 70 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

129
src/ustreamer/http/server.c
View File

@@ -52,11 +52,10 @@ static char *_http_get_client_hostport(struct evhttp_request *request);
#define _A_EVBUFFER_ADD_PRINTF(x_buf, x_fmt, ...) assert(evbuffer_add_printf(x_buf, x_fmt, ##__VA_ARGS__) >= 0) #define _A_EVBUFFER_ADD_PRINTF(x_buf, x_fmt, ...) assert(evbuffer_add_printf(x_buf, x_fmt, ##__VA_ARGS__) >= 0)
#define _VID(x_next) server->run->stream->run->video->x_next #define _VID(x_next) server->run->stream->run->video->x_next
#define _EX(x_next) server->run->exposed->x_next
us_server_s *us_server_init(us_stream_s *stream) { us_server_s *us_server_init(us_stream_s *stream) {
us_exposed_s *exposed; us_server_exposed_s *exposed;
US_CALLOC(exposed, 1); US_CALLOC(exposed, 1);
exposed->frame = us_frame_init(); exposed->frame = us_frame_init();
@@ -123,6 +122,7 @@ void us_server_destroy(us_server_s *server) {
int us_server_listen(us_server_s *server) { int us_server_listen(us_server_s *server) {
us_server_runtime_s *const run = server->run; us_server_runtime_s *const run = server->run;
us_server_exposed_s *const ex = run->exposed;
us_stream_s *const stream = run->stream; us_stream_s *const stream = run->stream;
{ {
@@ -138,9 +138,9 @@ int us_server_listen(us_server_s *server) {
assert(!evhttp_set_cb(run->http, "/stream", _http_callback_stream, (void *)server)); assert(!evhttp_set_cb(run->http, "/stream", _http_callback_stream, (void *)server));
} }
us_frame_copy(stream->blank, _EX(frame)); us_frame_copy(stream->blank, ex->frame);
_EX(notify_last_width) = _EX(frame->width); ex->notify_last_width = ex->frame->width;
_EX(notify_last_height) = _EX(frame->height); ex->notify_last_height = ex->frame->height;
if (server->exit_on_no_clients > 0) { if (server->exit_on_no_clients > 0) {
run->last_request_ts = us_get_now_monotonic(); run->last_request_ts = us_get_now_monotonic();
@@ -404,6 +404,7 @@ cleanup:
static void _http_callback_state(struct evhttp_request *request, void *v_server) { static void _http_callback_state(struct evhttp_request *request, void *v_server) {
us_server_s *const server = (us_server_s *)v_server; us_server_s *const server = (us_server_s *)v_server;
us_server_runtime_s *const run = server->run; us_server_runtime_s *const run = server->run;
us_server_exposed_s *const ex = run->exposed;
us_stream_s *const stream = run->stream; us_stream_s *const stream = run->stream;
PREPROCESS_REQUEST; PREPROCESS_REQUEST;
@@ -455,12 +456,12 @@ static void _http_callback_state(struct evhttp_request *request, void *v_server)
" \"source\": {\"resolution\": {\"width\": %u, \"height\": %u}," " \"source\": {\"resolution\": {\"width\": %u, \"height\": %u},"
" \"online\": %s, \"desired_fps\": %u, \"captured_fps\": %u}," " \"online\": %s, \"desired_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 : _EX(frame->width)), (server->fake_width ? server->fake_width : ex->frame->width),
(server->fake_height ? server->fake_height : _EX(frame->height)), (server->fake_height ? server->fake_height : ex->frame->height),
us_bool_to_string(_EX(frame->online)), us_bool_to_string(ex->frame->online),
stream->dev->desired_fps, stream->dev->desired_fps,
_EX(captured_fps), ex->captured_fps,
_EX(queued_fps), ex->queued_fps,
run->stream_clients_count run->stream_clients_count
); );
@@ -488,12 +489,13 @@ static void _http_callback_state(struct evhttp_request *request, void *v_server)
static void _http_callback_snapshot(struct evhttp_request *request, void *v_server) { static void _http_callback_snapshot(struct evhttp_request *request, void *v_server) {
us_server_s *const server = (us_server_s *)v_server; us_server_s *const server = (us_server_s *)v_server;
us_server_exposed_s *const ex = server->run->exposed;
PREPROCESS_REQUEST; PREPROCESS_REQUEST;
struct evbuffer *buf; struct evbuffer *buf;
_A_EVBUFFER_NEW(buf); _A_EVBUFFER_NEW(buf);
_A_EVBUFFER_ADD(buf, (const void *)_EX(frame->data), _EX(frame->used)); _A_EVBUFFER_ADD(buf, (const void*)ex->frame->data, ex->frame->used);
ADD_HEADER("Cache-Control", "no-store, no-cache, must-revalidate, proxy-revalidate, pre-check=0, post-check=0, max-age=0"); ADD_HEADER("Cache-Control", "no-store, no-cache, must-revalidate, proxy-revalidate, pre-check=0, post-check=0, max-age=0");
ADD_HEADER("Pragma", "no-cache"); ADD_HEADER("Pragma", "no-cache");
@@ -513,16 +515,16 @@ static void _http_callback_snapshot(struct evhttp_request *request, void *v_serv
ADD_TIME_HEADER("X-Timestamp", us_get_now_real()); ADD_TIME_HEADER("X-Timestamp", us_get_now_real());
ADD_HEADER("X-UStreamer-Online", us_bool_to_string(_EX(frame->online))); ADD_HEADER("X-UStreamer-Online", us_bool_to_string(ex->frame->online));
ADD_UNSIGNED_HEADER("X-UStreamer-Dropped", _EX(dropped)); ADD_UNSIGNED_HEADER("X-UStreamer-Dropped", ex->dropped);
ADD_UNSIGNED_HEADER("X-UStreamer-Width", _EX(frame->width)); ADD_UNSIGNED_HEADER("X-UStreamer-Width", ex->frame->width);
ADD_UNSIGNED_HEADER("X-UStreamer-Height", _EX(frame->height)); ADD_UNSIGNED_HEADER("X-UStreamer-Height", ex->frame->height);
ADD_TIME_HEADER("X-UStreamer-Grab-Timestamp", _EX(frame->grab_ts)); ADD_TIME_HEADER("X-UStreamer-Grab-Timestamp", ex->frame->grab_ts);
ADD_TIME_HEADER("X-UStreamer-Encode-Begin-Timestamp", _EX(frame->encode_begin_ts)); ADD_TIME_HEADER("X-UStreamer-Encode-Begin-Timestamp", ex->frame->encode_begin_ts);
ADD_TIME_HEADER("X-UStreamer-Encode-End-Timestamp", _EX(frame->encode_end_ts)); ADD_TIME_HEADER("X-UStreamer-Encode-End-Timestamp", ex->frame->encode_end_ts);
ADD_TIME_HEADER("X-UStreamer-Expose-Begin-Timestamp", _EX(expose_begin_ts)); ADD_TIME_HEADER("X-UStreamer-Expose-Begin-Timestamp", ex->expose_begin_ts);
ADD_TIME_HEADER("X-UStreamer-Expose-Cmp-Timestamp", _EX(expose_cmp_ts)); ADD_TIME_HEADER("X-UStreamer-Expose-Cmp-Timestamp", ex->expose_cmp_ts);
ADD_TIME_HEADER("X-UStreamer-Expose-End-Timestamp", _EX(expose_end_ts)); ADD_TIME_HEADER("X-UStreamer-Expose-End-Timestamp", ex->expose_end_ts);
ADD_TIME_HEADER("X-UStreamer-Send-Timestamp", us_get_now_monotonic()); ADD_TIME_HEADER("X-UStreamer-Send-Timestamp", us_get_now_monotonic());
# undef ADD_UNSUGNED_HEADER # undef ADD_UNSUGNED_HEADER
@@ -605,6 +607,7 @@ static void _http_callback_stream(struct evhttp_request *request, void *v_server
static void _http_callback_stream_write(struct bufferevent *buf_event, void *v_client) { static void _http_callback_stream_write(struct bufferevent *buf_event, void *v_client) {
us_stream_client_s *const client = (us_stream_client_s *)v_client; us_stream_client_s *const client = (us_stream_client_s *)v_client;
us_server_s *const server = client->server; us_server_s *const server = client->server;
us_server_exposed_s *const ex = server->run->exposed;
const long double now = us_get_now_monotonic(); const long double now = us_get_now_monotonic();
const long long now_second = us_floor_ms(now); const long long now_second = us_floor_ms(now);
@@ -692,7 +695,7 @@ static void _http_callback_stream_write(struct bufferevent *buf_event, void *v_c
"Content-Length: %zu" RN "Content-Length: %zu" RN
"X-Timestamp: %.06Lf" RN "X-Timestamp: %.06Lf" RN
"%s", "%s",
(!client->zero_data ? _EX(frame->used) : 0), (!client->zero_data ? ex->frame->used : 0),
us_get_now_real(), us_get_now_real(),
(client->extra_headers ? "" : RN) (client->extra_headers ? "" : RN)
); );
@@ -712,25 +715,25 @@ static void _http_callback_stream_write(struct bufferevent *buf_event, void *v_c
"X-UStreamer-Send-Time: %.06Lf" RN "X-UStreamer-Send-Time: %.06Lf" RN
"X-UStreamer-Latency: %.06Lf" RN "X-UStreamer-Latency: %.06Lf" RN
RN, RN,
us_bool_to_string(_EX(frame->online)), us_bool_to_string(ex->frame->online),
_EX(dropped), ex->dropped,
_EX(frame->width), ex->frame->width,
_EX(frame->height), ex->frame->height,
client->fps, client->fps,
_EX(frame->grab_ts), ex->frame->grab_ts,
_EX(frame->encode_begin_ts), ex->frame->encode_begin_ts,
_EX(frame->encode_end_ts), ex->frame->encode_end_ts,
_EX(expose_begin_ts), ex->expose_begin_ts,
_EX(expose_cmp_ts), ex->expose_cmp_ts,
_EX(expose_end_ts), ex->expose_end_ts,
now, now,
now - _EX(frame->grab_ts) now - ex->frame->grab_ts
); );
} }
} }
if (!client->zero_data) { if (!client->zero_data) {
_A_EVBUFFER_ADD(buf, (void *)_EX(frame->data), _EX(frame->used)); _A_EVBUFFER_ADD(buf, (void*)ex->frame->data, ex->frame->used);
} }
_A_EVBUFFER_ADD_PRINTF(buf, RN "--" BOUNDARY RN); _A_EVBUFFER_ADD_PRINTF(buf, RN "--" BOUNDARY RN);
@@ -780,6 +783,7 @@ static void _http_callback_stream_error(struct bufferevent *buf_event, short wha
static void _http_queue_send_stream(us_server_s *server, bool stream_updated, bool frame_updated) { static void _http_queue_send_stream(us_server_s *server, bool stream_updated, bool frame_updated) {
us_server_runtime_s *const run = server->run; us_server_runtime_s *const run = server->run;
us_server_exposed_s *const ex = run->exposed;
bool has_clients = false; bool has_clients = false;
bool queued = false; bool queued = false;
@@ -822,13 +826,13 @@ static void _http_queue_send_stream(us_server_s *server, bool stream_updated, bo
static long long queued_fps_second = 0; static long long queued_fps_second = 0;
const long long now = us_floor_ms(us_get_now_monotonic()); const long long now = us_floor_ms(us_get_now_monotonic());
if (now != queued_fps_second) { if (now != queued_fps_second) {
_EX(queued_fps) = queued_fps_accum; ex->queued_fps = queued_fps_accum;
queued_fps_accum = 0; queued_fps_accum = 0;
queued_fps_second = now; queued_fps_second = now;
} }
queued_fps_accum += 1; queued_fps_accum += 1;
} else if (!has_clients) { } else if (!has_clients) {
_EX(queued_fps) = 0; ex->queued_fps = 0;
} }
} }
@@ -855,17 +859,18 @@ static void _http_refresher(int fd, short what, void *v_server) {
(void)what; (void)what;
us_server_s *server = (us_server_s *)v_server; us_server_s *server = (us_server_s *)v_server;
us_server_exposed_s *ex = server->run->exposed;
bool stream_updated = false; bool stream_updated = false;
bool frame_updated = false; bool frame_updated = false;
if (atomic_load(&_VID(updated))) { if (atomic_load(&_VID(updated))) {
frame_updated = _expose_new_frame(server); frame_updated = _expose_new_frame(server);
stream_updated = true; stream_updated = true;
} else if (_EX(expose_end_ts) + 1 < us_get_now_monotonic()) { } else if (ex->expose_end_ts + 1 < us_get_now_monotonic()) {
US_LOG_DEBUG("HTTP: Repeating exposed ..."); US_LOG_DEBUG("HTTP: Repeating exposed ...");
_EX(expose_begin_ts) = us_get_now_monotonic(); ex->expose_begin_ts = us_get_now_monotonic();
_EX(expose_cmp_ts) = _EX(expose_begin_ts); ex->expose_cmp_ts = ex->expose_begin_ts;
_EX(expose_end_ts) = _EX(expose_begin_ts); ex->expose_end_ts = ex->expose_begin_ts;
frame_updated = true; frame_updated = true;
stream_updated = true; stream_updated = true;
} }
@@ -876,56 +881,58 @@ static void _http_refresher(int fd, short what, void *v_server) {
frame_updated frame_updated
&& server->notify_parent && server->notify_parent
&& ( && (
_EX(notify_last_online) != _EX(frame->online) ex->notify_last_online != ex->frame->online
|| _EX(notify_last_width) != _EX(frame->width) || ex->notify_last_width != ex->frame->width
|| _EX(notify_last_height) != _EX(frame->height) || ex->notify_last_height != ex->frame->height
) )
) { ) {
_EX(notify_last_online) = _EX(frame->online); ex->notify_last_online = ex->frame->online;
_EX(notify_last_width) = _EX(frame->width); ex->notify_last_width = ex->frame->width;
_EX(notify_last_height) = _EX(frame->height); ex->notify_last_height = ex->frame->height;
us_process_notify_parent(); us_process_notify_parent();
} }
} }
static bool _expose_new_frame(us_server_s *server) { static bool _expose_new_frame(us_server_s *server) {
us_server_exposed_s *const ex = server->run->exposed;
bool updated = false; bool updated = false;
US_MUTEX_LOCK(_VID(mutex)); US_MUTEX_LOCK(_VID(mutex));
US_LOG_DEBUG("HTTP: Updating exposed frame (online=%d) ...", _VID(frame->online)); US_LOG_DEBUG("HTTP: Updating exposed frame (online=%d) ...", _VID(frame->online));
_EX(captured_fps) = _VID(captured_fps); ex->captured_fps = _VID(captured_fps);
_EX(expose_begin_ts) = us_get_now_monotonic(); ex->expose_begin_ts = us_get_now_monotonic();
if (server->drop_same_frames && _VID(frame->online)) { if (server->drop_same_frames && _VID(frame->online)) {
bool need_drop = false; bool need_drop = false;
bool maybe_same = false; bool maybe_same = false;
if ( if (
(need_drop = (_EX(dropped) < server->drop_same_frames)) (need_drop = (ex->dropped < server->drop_same_frames))
&& (maybe_same = us_frame_compare(_EX(frame), _VID(frame))) && (maybe_same = us_frame_compare(ex->frame, _VID(frame)))
) { ) {
_EX(expose_cmp_ts) = us_get_now_monotonic(); ex->expose_cmp_ts = us_get_now_monotonic();
_EX(expose_end_ts) = _EX(expose_cmp_ts); ex->expose_end_ts = ex->expose_cmp_ts;
US_LOG_VERBOSE("HTTP: Dropped same frame number %u; cmp_time=%.06Lf", US_LOG_VERBOSE("HTTP: Dropped same frame number %u; cmp_time=%.06Lf",
_EX(dropped), _EX(expose_cmp_ts) - _EX(expose_begin_ts)); ex->dropped, (ex->expose_cmp_ts - ex->expose_begin_ts));
_EX(dropped) += 1; ex->dropped += 1;
goto not_updated; goto not_updated;
} else { } else {
_EX(expose_cmp_ts) = us_get_now_monotonic(); ex->expose_cmp_ts = us_get_now_monotonic();
US_LOG_VERBOSE("HTTP: Passed same frame check (need_drop=%d, maybe_same=%d); cmp_time=%.06Lf", US_LOG_VERBOSE("HTTP: Passed same frame check (need_drop=%d, maybe_same=%d); cmp_time=%.06Lf",
need_drop, maybe_same, (_EX(expose_cmp_ts) - _EX(expose_begin_ts))); need_drop, maybe_same, (ex->expose_cmp_ts - ex->expose_begin_ts));
} }
} }
us_frame_copy(_VID(frame), _EX(frame)); us_frame_copy(_VID(frame), ex->frame);
_EX(dropped) = 0; ex->dropped = 0;
_EX(expose_cmp_ts) = _EX(expose_begin_ts); ex->expose_cmp_ts = ex->expose_begin_ts;
_EX(expose_end_ts) = us_get_now_monotonic(); ex->expose_end_ts = us_get_now_monotonic();
US_LOG_VERBOSE("HTTP: Exposed frame: online=%d, exp_time=%.06Lf", US_LOG_VERBOSE("HTTP: Exposed frame: online=%d, exp_time=%.06Lf",
_EX(frame->online), _EX(expose_end_ts) - _EX(expose_begin_ts)); ex->frame->online, (ex->expose_end_ts - ex->expose_begin_ts));
updated = true; updated = true;

4
src/ustreamer/http/server.h
View File

@@ -111,7 +111,7 @@ typedef struct {
bool notify_last_online; bool notify_last_online;
unsigned notify_last_width; unsigned notify_last_width;
unsigned notify_last_height; unsigned notify_last_height;
} us_exposed_s; } us_server_exposed_s;
typedef struct { typedef struct {
struct event_base *base; struct event_base *base;
@@ -125,7 +125,7 @@ typedef struct {
struct event *refresher; struct event *refresher;
us_stream_s *stream; us_stream_s *stream;
us_exposed_s *exposed; us_server_exposed_s *exposed;
us_stream_client_s *stream_clients; us_stream_client_s *stream_clients;
unsigned stream_clients_count; unsigned stream_clients_count;