forked/ustreamer
1
0
Fork 0
mirror of https://github.com/pikvm/ustreamer.git synced 2026-02-19 08:16:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactoring

Browse Source
This commit is contained in:
Devaev Maxim
2018-09-21 06:16:30 +03:00
parent f85aeb81bc
commit a22cba0015
2 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/http.c
View File

@@ -270,7 +270,7 @@ static void _http_callback_stream_write(struct bufferevent *buf_event, void *v_c
RN
"--" BOUNDARY RN
));
assert(!bufferevent_write_buffer(buf_event, buf)); // FIXME
assert(!bufferevent_write_buffer(buf_event, buf));
client->need_initial = false;
}
@@ -289,7 +289,7 @@ static void _http_callback_stream_write(struct bufferevent *buf_event, void *v_c
));
assert(evbuffer_add_printf(buf, RN "--" BOUNDARY RN));
assert(!bufferevent_write_buffer(buf_event, buf)); // FIXME
assert(!bufferevent_write_buffer(buf_event, buf));
evbuffer_free(buf);
bufferevent_setcb(buf_event, NULL, NULL, _http_callback_stream_error, (void *)client);
@@ -370,8 +370,7 @@ void _expose_new_picture(struct http_server_t *server) {
}
memcpy(
server->run->exposed->picture.data,
server->run->stream->picture.data,
server->run->exposed->picture.data, server->run->stream->picture.data,
server->run->stream->picture.size * sizeof(*server->run->exposed->picture.data)
);
@@ -389,8 +388,7 @@ void _expose_blank_picture(struct http_server_t *server) {
}
memcpy(
server->run->exposed->picture.data,
BLANK_JPG_DATA,
server->run->exposed->picture.data, BLANK_JPG_DATA,
BLANK_JPG_SIZE * sizeof(*server->run->exposed->picture.data)
);

3
src/stream.c
View File

@@ -129,8 +129,7 @@ void stream_loop(struct stream_t *stream) {
stream->picture.size = stream->dev->run->pictures[oldest_worker->ctx.index].size;
stream->picture.allocated = stream->dev->run->pictures[oldest_worker->ctx.index].allocated;
memcpy(
stream->picture.data,
stream->dev->run->pictures[oldest_worker->ctx.index].data,
stream->picture.data, stream->dev->run->pictures[oldest_worker->ctx.index].data,
stream->picture.size * sizeof(*stream->picture.data)
);