mirror of
https://github.com/pikvm/ustreamer.git
synced 2026-03-02 05:36:31 +00:00
Compare commits
2 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
077f236a43 | ||
|
|
d57277877e |
@@ -1,7 +1,7 @@
|
|||||||
[bumpversion]
|
[bumpversion]
|
||||||
commit = True
|
commit = True
|
||||||
tag = True
|
tag = True
|
||||||
current_version = 0.33
|
current_version = 0.34
|
||||||
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.33
|
pkgver=0.34
|
||||||
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.33"
|
#define VERSION "0.34"
|
||||||
|
|||||||
10
src/http.c
10
src/http.c
@@ -252,8 +252,8 @@ static void _http_callback_snapshot(struct evhttp_request *request, void *v_serv
|
|||||||
ADD_TIME_HEADER("X-UStreamer-Expose-End-Time", EXPOSED(expose_end_time));
|
ADD_TIME_HEADER("X-UStreamer-Expose-End-Time", EXPOSED(expose_end_time));
|
||||||
ADD_TIME_HEADER("X-UStreamer-Send-Time", get_now_monotonic());
|
ADD_TIME_HEADER("X-UStreamer-Send-Time", get_now_monotonic());
|
||||||
|
|
||||||
# undef ADD_TIME_HEADER
|
|
||||||
# undef ADD_UNSUGNED_HEADER
|
# undef ADD_UNSUGNED_HEADER
|
||||||
|
# undef ADD_TIME_HEADER
|
||||||
|
|
||||||
ADD_HEADER("Content-Type", "image/jpeg");
|
ADD_HEADER("Content-Type", "image/jpeg");
|
||||||
|
|
||||||
@@ -452,10 +452,10 @@ static void _http_callback_stream_write(struct bufferevent *buf_event, void *v_c
|
|||||||
bufferevent_setcb(buf_event, NULL, NULL, _http_callback_stream_error, (void *)client);
|
bufferevent_setcb(buf_event, NULL, NULL, _http_callback_stream_error, (void *)client);
|
||||||
bufferevent_enable(buf_event, EV_READ);
|
bufferevent_enable(buf_event, EV_READ);
|
||||||
|
|
||||||
# undef BOUNDARY
|
|
||||||
# undef RN
|
|
||||||
# undef ADD_ADVANCE_HEADERS
|
|
||||||
# undef EXPOSED
|
# undef EXPOSED
|
||||||
|
# undef ADD_ADVANCE_HEADERS
|
||||||
|
# undef RN
|
||||||
|
# undef BOUNDARY
|
||||||
}
|
}
|
||||||
|
|
||||||
static void _http_callback_stream_error(UNUSED struct bufferevent *buf_event, UNUSED short what, void *v_client) {
|
static void _http_callback_stream_error(UNUSED struct bufferevent *buf_event, UNUSED short what, void *v_client) {
|
||||||
@@ -631,8 +631,8 @@ static bool _expose_new_picture(struct http_server_t *server) {
|
|||||||
EXPOSED(expose_end_time) - EXPOSED(expose_begin_time)
|
EXPOSED(expose_end_time) - EXPOSED(expose_begin_time)
|
||||||
);
|
);
|
||||||
|
|
||||||
# undef STREAM
|
|
||||||
# undef EXPOSED
|
# undef EXPOSED
|
||||||
|
# undef STREAM
|
||||||
return true; // Updated
|
return true; // Updated
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -213,9 +213,9 @@ static int _parse_options(int argc, char *argv[], struct device_t *dev, struct e
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
# undef OPT_SET
|
|
||||||
# undef OPT_UNSIGNED
|
|
||||||
# undef OPT_PARSE
|
# undef OPT_PARSE
|
||||||
|
# undef OPT_UNSIGNED
|
||||||
|
# undef OPT_SET
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -78,5 +78,5 @@ const char *omx_state_to_string(const OMX_STATETYPE state) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#undef CASE_TO_STRING
|
|
||||||
#undef CASE_ASSERT
|
#undef CASE_ASSERT
|
||||||
|
#undef CASE_TO_STRING
|
||||||
|
|||||||
Reference in New Issue
Block a user