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

improved memsink logic

Browse Source
This commit is contained in:
Devaev Maxim
2021-01-18 11:05:04 +03:00
parent 61c3b44c8a
commit 3d28dcbaff
4 changed files with 21 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/libs/memsink.c
View File

@@ -91,25 +91,31 @@ void memsink_destroy(memsink_s *sink) {
free(sink);
}
int memsink_server_check_clients(memsink_s *sink) {
bool memsink_server_check(memsink_s *sink, const frame_s *frame) {
// Возвращает true, если если клиенты ИЛИ изменились метаданные
assert(sink->server);
if (flock(sink->fd, LOCK_EX | LOCK_NB) < 0) {
if (errno == EWOULDBLOCK) {
sink->has_clients = true;
return 0;
return true;
}
LOG_PERROR("%s-sink: Can't lock memory", sink->name);
return -1;
return false;
}
sink->has_clients = (sink->mem->last_client_ts + sink->client_ttl > get_now_monotonic());
# define NEQ(_field) (sink->mem->_field != frame->_field)
bool retval = (sink->has_clients || NEQ(width) || NEQ(height) || NEQ(format) || NEQ(stride) || NEQ(online));
# undef NEQ
if (flock(sink->fd, LOCK_UN) < 0) {
LOG_PERROR("%s-sink: Can't unlock memory", sink->name);
return -1;
return false;
}
return 0;
return retval;
}
int memsink_server_put(memsink_s *sink, const frame_s *frame) {