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

refactoring

Browse Source
This commit is contained in:
Devaev Maxim
2018-09-30 02:52:17 +03:00
parent fb9a8e31b1
commit 3c086c2129
3 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/http.c
View File

@@ -62,14 +62,13 @@ struct http_server_t *http_server_init(struct stream_t *stream) {
struct http_server_runtime_t *run; struct http_server_runtime_t *run;
struct http_server_t *server; struct http_server_t *server;
struct exposed_t *exposed; struct exposed_t *exposed;
struct timeval refresh_interval;
A_CALLOC(exposed, 1); A_CALLOC(exposed, 1);
A_CALLOC(run, 1); A_CALLOC(run, 1);
run->stream = stream; run->stream = stream;
run->exposed = exposed; run->exposed = exposed;
run->refresh_interval.tv_sec = 0;
run->refresh_interval.tv_usec = 30000; // ~30 refreshes per second
run->drop_same_frames_blank = 10; run->drop_same_frames_blank = 10;
A_CALLOC(server, 1); A_CALLOC(server, 1);
@@ -90,8 +89,11 @@ struct http_server_t *http_server_init(struct stream_t *stream) {
assert(!evhttp_set_cb(run->http, "/snapshot", _http_callback_snapshot, (void *)exposed)); assert(!evhttp_set_cb(run->http, "/snapshot", _http_callback_snapshot, (void *)exposed));
assert(!evhttp_set_cb(run->http, "/stream", _http_callback_stream, (void *)server)); assert(!evhttp_set_cb(run->http, "/stream", _http_callback_stream, (void *)server));
refresh_interval.tv_sec = 0;
refresh_interval.tv_usec = 30000; // ~30 refreshes per second
assert((run->refresh = event_new(run->base, -1, EV_PERSIST, _http_exposed_refresh, server))); assert((run->refresh = event_new(run->base, -1, EV_PERSIST, _http_exposed_refresh, server)));
assert(!event_add(run->refresh, &run->refresh_interval)); assert(!event_add(run->refresh, &refresh_interval));
return server; return server;
} }

3
src/http.h
View File

@@ -20,7 +20,6 @@
#include <stdbool.h> #include <stdbool.h>
#include <time.h>
#include <event2/event.h> #include <event2/event.h>
#include <event2/http.h> #include <event2/http.h>
@@ -54,8 +53,6 @@ struct http_server_runtime_t {
struct event *refresh; struct event *refresh;
struct stream_t *stream; struct stream_t *stream;
struct exposed_t *exposed; struct exposed_t *exposed;
struct timeval refresh_interval;
struct stream_client_t *stream_clients; struct stream_client_t *stream_clients;
unsigned drop_same_frames_blank; unsigned drop_same_frames_blank;
}; };

2
src/main.c
View File

@@ -141,7 +141,7 @@ static int _parse_options(int argc, char *argv[], struct device_t *dev, struct e
# define OPT_UNSIGNED(_dest, _name, _min, _max) \ # define OPT_UNSIGNED(_dest, _name, _min, _max) \
{ errno = 0; int _tmp = strtol(optarg, NULL, 0); \ { errno = 0; int _tmp = strtol(optarg, NULL, 0); \
if (errno || _tmp < _min || _tmp > _max) \ if (errno || _tmp < _min || _tmp > _max) \
{ printf("Invalid value for '%s=%u'; minimal=%u; maximum=%u\n", _name, _tmp, _min, _max); return -1; } \ { printf("Invalid value for '%s=%u'; min=%u; max=%u\n", _name, _tmp, _min, _max); return -1; } \
_dest = _tmp; break; } _dest = _tmp; break; }
# define OPT_PARSE(_dest, _func, _invalid, _name) \ # define OPT_PARSE(_dest, _func, _invalid, _name) \