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

refactoring

Browse Source
This commit is contained in:
Devaev Maxim
2019-04-14 06:09:21 +03:00
parent 030464c3b8
commit 3253de83dc
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/http/server.c
View File

@@ -527,7 +527,7 @@ static void _http_callback_stream(struct evhttp_request *request, void *v_server
PREPROCESS_REQUEST; PREPROCESS_REQUEST;
conn = evhttp_request_get_connection(request); conn = evhttp_request_get_connection(request);
if (conn != NULL) { if (conn) {
A_CALLOC(client, 1); A_CALLOC(client, 1);
client->server = server; client->server = server;
client->request = request; client->request = request;
@@ -713,12 +713,12 @@ static void _http_callback_stream_error(UNUSED struct bufferevent *buf_event, UN
} }
conn = evhttp_request_get_connection(client->request); conn = evhttp_request_get_connection(client->request);
if (conn != NULL) { if (conn) {
evhttp_connection_get_peer(conn, &client_addr, &client_port); evhttp_connection_get_peer(conn, &client_addr, &client_port);
} }
LOG_INFO("HTTP: Disconnected the stream client: [%s]:%u; clients now: %u", LOG_INFO("HTTP: Disconnected the stream client: [%s]:%u; clients now: %u",
client_addr, client_port, RUN(stream_clients_count)); client_addr, client_port, RUN(stream_clients_count));
if (conn != NULL) { if (conn) {
evhttp_connection_free(conn); evhttp_connection_free(conn);
} }
@@ -746,7 +746,7 @@ static void _http_queue_send_stream(struct http_server_t *server, bool stream_up
for (struct stream_client_t *client = server->run->stream_clients; client != NULL; client = client->next) { for (struct stream_client_t *client = server->run->stream_clients; client != NULL; client = client->next) {
conn = evhttp_request_get_connection(client->request); conn = evhttp_request_get_connection(client->request);
if (conn != NULL) { if (conn) {
// Фикс для бага WebKit. При включенной опции дропа одинаковых фреймов, // Фикс для бага WebKit. При включенной опции дропа одинаковых фреймов,
// WebKit отрисовывает последний фрейм в серии с некоторой задержкой, // WebKit отрисовывает последний фрейм в серии с некоторой задержкой,
// и нужно послать два фрейма, чтобы серия была вовремя завершена. // и нужно послать два фрейма, чтобы серия была вовремя завершена.

2
src/stream.c
View File

@@ -232,7 +232,7 @@ void stream_loop(struct stream_t *stream) {
LOG_DEBUG("Grabbed a new frame to buffer %u", buf_index); LOG_DEBUG("Grabbed a new frame to buffer %u", buf_index);
if (!oldest_worker) { if (oldest_worker == NULL) {
oldest_worker = &pool.workers[free_worker_number]; oldest_worker = &pool.workers[free_worker_number];
last_worker = oldest_worker; last_worker = oldest_worker;
} else { } else {