forked/ustreamer
1
0
Fork 0
mirror of https://github.com/pikvm/ustreamer.git synced 2026-05-27 07:46:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactoring

Browse Source
This commit is contained in:
Maxim Devaev
2022-02-14 00:50:55 +03:00
parent be2e0f11da
commit 3a8f035014
2 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -36,7 +36,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_ctx); static void _http_callback_stream_write(struct bufferevent *buf_event, void *v_ctx);
static void _http_callback_stream_error(struct bufferevent *buf_event, short what, void *v_ctx); static void _http_callback_stream_error(struct bufferevent *buf_event, short what, void *v_ctx);
static void _http_exposed_refresh(int fd, short event, void *v_server); static void _http_refresher(int fd, short event, void *v_server);
static void _http_queue_send_stream(server_s *server, bool stream_updated, bool frame_updated); static void _http_queue_send_stream(server_s *server, bool stream_updated, bool frame_updated);
static bool _expose_new_frame(server_s *server); static bool _expose_new_frame(server_s *server);
@@ -80,9 +80,9 @@ server_s *server_init(stream_s *stream) {
} }
void server_destroy(server_s *server) { void server_destroy(server_s *server) {
if (RUN(refresh)) { if (RUN(refresher)) {
event_del(RUN(refresh)); event_del(RUN(refresher));
event_free(RUN(refresh)); event_free(RUN(refresher));
} }
evhttp_free(RUN(http)); evhttp_free(RUN(http));
@@ -129,17 +129,15 @@ int server_listen(server_s *server) {
EX(notify_last_height) = EX(frame->height); EX(notify_last_height) = EX(frame->height);
{ {
struct timeval refresh_interval; struct timeval interval = {0};
refresh_interval.tv_sec = 0;
if (STREAM(dev->desired_fps) > 0) { if (STREAM(dev->desired_fps) > 0) {
refresh_interval.tv_usec = 1000000 / (STREAM(dev->desired_fps) * 2); interval.tv_usec = 1000000 / (STREAM(dev->desired_fps) * 2);
} else { } else {
refresh_interval.tv_usec = 16000; // ~60fps interval.tv_usec = 16000; // ~60fps
} }
assert((RUN(refresh) = event_new(RUN(base), -1, EV_PERSIST, _http_exposed_refresh, server))); assert((RUN(refresher) = event_new(RUN(base), -1, EV_PERSIST, _http_refresher, server)));
assert(!event_add(RUN(refresh), &refresh_interval)); assert(!event_add(RUN(refresher), &interval));
} }
evhttp_set_timeout(RUN(http), server->timeout); evhttp_set_timeout(RUN(http), server->timeout);
@@ -781,7 +779,7 @@ static void _http_queue_send_stream(server_s *server, bool stream_updated, bool
} }
} }
static void _http_exposed_refresh(UNUSED int fd, UNUSED short what, void *v_server) { static void _http_refresher(UNUSED int fd, UNUSED short what, void *v_server) {
server_s *server = (server_s *)v_server; server_s *server = (server_s *)v_server;
bool stream_updated = false; bool stream_updated = false;
bool frame_updated = false; bool frame_updated = false;

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

@@ -116,10 +116,13 @@ typedef struct {
struct event_base *base; struct event_base *base;
struct evhttp *http; struct evhttp *http;
evutil_socket_t ext_fd; // Unix or socket activation evutil_socket_t ext_fd; // Unix or socket activation
char *auth_token; char *auth_token;
struct event *refresh;
struct event *refresher;
stream_s *stream; stream_s *stream;
exposed_s *exposed; exposed_s *exposed;
stream_client_s *stream_clients; stream_client_s *stream_clients;
unsigned stream_clients_count; unsigned stream_clients_count;
} server_runtime_s; } server_runtime_s;