stv0g/tvheadend
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

linuxdvb: fix the retune call

Browse source
This commit is contained in:
Jaroslav Kysela 2015-01-19 18:18:15 +01:00
parent 9801ef1a1a
commit b3db352ecf
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/input/mpegts/linuxdvb/linuxdvb_frontend.c
View file

@ -571,10 +571,11 @@ linuxdvb_frontend_monitor ( void *aux )
/* Retune check - we lost signal or no data were received */
if (retune || lfe->lfe_nodata) {
lfe->lfe_nodata = 0;
if (lfe->lfe_freq > 0) {
if (lfe->lfe_locked && lfe->lfe_freq > 0) {
tvhlog(LOG_WARNING, "linuxdvb", "%s - %s", buf, retune ? "retune" : "retune nodata");
linuxdvb_frontend_tune0(lfe, mmi, lfe->lfe_freq);
gtimer_arm_ms(&lfe->lfe_monitor_timer, linuxdvb_frontend_monitor, lfe, 50);
lfe->lfe_locked = 1;
}
}
@ -873,7 +874,7 @@ linuxdvb_frontend_input_thread ( void *aux )
size_t skip = (MIN(lfe->lfe_skip_bytes, 1024*1024) / 188) * 188;
size_t counter = 0;
sbuf_t sb;
int nodata = 8;
int nodata = 4;
/* Get MMI */
pthread_mutex_lock(&lfe->lfe_dvr_lock);
@ -904,7 +905,7 @@ linuxdvb_frontend_input_thread ( void *aux )
/* Read */
while (tvheadend_running) {
nfds = tvhpoll_wait(efd, ev, 1, 15);
nfds = tvhpoll_wait(efd, ev, 1, 150);
if (nfds == 0) { /* timeout */
if (nodata == 0) {
tvhlog(LOG_WARNING, "linuxdvb", "%s - poll TIMEOUT", buf);