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

Issue #253: Added m2m encoder timeout

Browse Source
This commit is contained in:
Maxim Devaev
2024-03-14 16:06:32 +02:00
parent f48695a04e
commit 1d8c93d3ad
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/ustreamer/m2m.c
View File

@@ -487,9 +487,17 @@ static int _m2m_encoder_compress_raw(us_m2m_encoder_s *enc, const us_frame_s *sr
// Для не-DMA отправка буфера по факту являтся освобождением этого буфера // Для не-DMA отправка буфера по факту являтся освобождением этого буфера
bool input_released = !run->p_dma; bool input_released = !run->p_dma;
while (true) { // https://github.com/pikvm/ustreamer/issues/253
struct pollfd enc_poll = {run->fd, POLLIN, 0}; // За секунду точно должно закодироваться.
const ldf deadline_ts = us_get_now_monotonic() + 1;
while (true) {
if (us_get_now_monotonic() > deadline_ts) {
_E_LOG_ERROR("Waiting for the encoder is too long");
goto error;
}
struct pollfd enc_poll = {run->fd, POLLIN, 0};
_E_LOG_DEBUG("Polling encoder ..."); _E_LOG_DEBUG("Polling encoder ...");
if (poll(&enc_poll, 1, 1000) < 0 && errno != EINTR) { if (poll(&enc_poll, 1, 1000) < 0 && errno != EINTR) {
_E_LOG_PERROR("Can't poll encoder"); _E_LOG_PERROR("Can't poll encoder");