mirrors/recycled-ni-libstb-hal
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-libstb-hal.git synced 2025-08-26 15:02:43 +02:00
Code Issues Packages Projects Releases Wiki Activity

libgeneric-pc/dmx.cpp: add default timeout to NIT scan, copy from libarmbox dmx

Browse Source 
Origin commit data
------------------
Branch: master
Commit: c054fe1273
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2021-06-29 (Tue, 29 Jun 2021)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
Jacek Jendrzej
2021-06-29 15:10:00 +02:00
committed by vanhofen
parent cdcad98655
commit da56022195
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
libgeneric-pc/dmx.cpp
View File

@@ -201,10 +201,18 @@ int cDemux::Read(unsigned char *buff, int len, int timeout)
ufds.events = POLLIN | POLLPRI | POLLERR; ufds.events = POLLIN | POLLPRI | POLLERR;
ufds.revents = 0; ufds.revents = 0;
if (timeout > 0) /* hack: if the frontend loses and regains lock, the demuxer often will not
* return from read(), so as a "emergency exit" for e.g. NIT scan, set a (long)
* timeout here */
int to = timeout;
if (dmx_type == DMX_PSI_CHANNEL && timeout <= 0){
to = 60 * 1000;
}
if (to > 0)
{ {
retry: retry:
rc = ::poll(&ufds, 1, timeout); rc = ::poll(&ufds, 1, to);
if (!rc) if (!rc)
return 0; // timeout return 0; // timeout
else if (rc < 0) else if (rc < 0)