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

refacotring

Browse Source
This commit is contained in:
Devaev Maxim 2018-09-30 06:45:27 +03:00
parent e9ec65cfde
commit 494993fe39
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/http.c
View File

@ -241,7 +241,7 @@ static void _http_callback_stream(struct evhttp_request *request, void *v_server
client->prev = last;
last->next = client;
}
++server->run->stream_clients_count;
server->run->stream_clients_count += 1;
evhttp_connection_get_peer(conn, &client_addr, &client_port);
LOG_INFO(
@ -313,7 +313,7 @@ static void _http_callback_stream_error(UNUSED struct bufferevent *buf_event, UN
char *client_addr = "???";
unsigned short client_port = 0;
--client->server->run->stream_clients_count;
client->server->run->stream_clients_count -= 1;
conn = evhttp_request_get_connection(client->request);
if (conn != NULL) {
@ -406,7 +406,7 @@ static bool _expose_new_picture(struct http_server_t *server) {
&& !memcmp(MEM_STREAM_TO_EXPOSED)
) {
LOG_PERF("HTTP: dropped same frame number %u", server->run->exposed->dropped);
++server->run->exposed->dropped;
server->run->exposed->dropped += 1;
return false; // Not updated
}
}
@ -450,7 +450,7 @@ static bool _expose_blank_picture(struct http_server_t *server) {
if (server->run->exposed->dropped < server->run->drop_same_frames_blank) {
LOG_PERF("HTTP: dropped same frame (BLANK) number %u", server->run->exposed->dropped);
++server->run->exposed->dropped;
server->run->exposed->dropped += 1;
return false; // Not updated
}

6
src/jpeg/encoder.c
View File

@ -137,7 +137,7 @@ static void _jpeg_write_scanlines_yuyv(struct jpeg_compress_struct *jpeg,
while (jpeg->next_scanline < height) {
unsigned char *ptr = line_buffer;
for (unsigned x = 0; x < width; x++) {
for (unsigned x = 0; x < width; ++x) {
int y = (!z ? data[0] << 8 : data[2] << 8);
int u = data[1] - 128;
int v = data[3] - 128;
@ -171,7 +171,7 @@ static void _jpeg_write_scanlines_uyvy(struct jpeg_compress_struct *jpeg,
while(jpeg->next_scanline < height) {
unsigned char *ptr = line_buffer;
for(unsigned x = 0; x < width; x++) {
for(unsigned x = 0; x < width; ++x) {
int y = (!z ? data[1] << 8 : data[3] << 8);
int u = data[0] - 128;
int v = data[2] - 128;
@ -204,7 +204,7 @@ static void _jpeg_write_scanlines_rgb565(struct jpeg_compress_struct *jpeg,
while(jpeg->next_scanline < height) {
unsigned char *ptr = line_buffer;
for(unsigned x = 0; x < width; x++) {
for(unsigned x = 0; x < width; ++x) {
unsigned int two_byte = (data[1] << 8) + data[0];
*(ptr++) = data[1] & 248;

6
src/stream.c
View File

@ -169,8 +169,8 @@ void stream_loop(struct stream_t *stream) {
if (stream->dev->every_frame) {
if (frames_count < stream->dev->every_frame - 1) {
LOG_DEBUG("Dropping frame %d for option --every-frame=%d", frames_count + 1, stream->dev->every_frame);
++frames_count;
frames_count += 1;
LOG_DEBUG("Dropping frame %d for option --every-frame=%d", frames_count, stream->dev->every_frame);
goto pass_frame;
}
frames_count = 0;
@ -202,7 +202,7 @@ void stream_loop(struct stream_t *stream) {
fps = 0;
fps_second = (long long)now;
}
++fps;
fps += 1;
long double fluency_delay = _stream_get_fluency_delay(stream->dev, &pool);