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

SAT>IP: handle better MPEG-TS PID close

Browse source
This commit is contained in:
Jaroslav Kysela 2014-05-17 22:06:26 +02:00
parent 98a06de4c9
commit 86c74cb246
1 changed files with 19 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/input/mpegts/satip/satip_frontend.c
View file

@ -550,9 +550,18 @@ satip_frontend_close_pid
( mpegts_input_t *mi, mpegts_mux_t *mm, int pid, int type, void *owner )
{
satip_frontend_t *lfe = (satip_frontend_t*)mi;
int change = 0;
int mid, div;
/* remove PID */
if (pid == MPEGTS_FULLMUX_PID && lfe->sf_device->sd_fullmux_ok) {
if (lfe->sf_pids_any) {
lfe->sf_pids_any = 0;
change = 1;
}
goto finish;
}
pthread_mutex_lock(&lfe->sf_dvr_lock);
if (lfe->sf_pids) {
mid = div = lfe->sf_pids_count / 2;
@ -564,6 +573,7 @@ satip_frontend_close_pid
memmove(&lfe->sf_pids[mid], &lfe->sf_pids[mid+1],
(lfe->sf_pids_count - mid - 1) * sizeof(uint16_t));
lfe->sf_pids_count--;
change = 1;
break;
} else if (lfe->sf_pids[mid] < pid) {
if (mid + 1 > lfe->sf_pids_count)
@ -582,7 +592,16 @@ satip_frontend_close_pid
}
pthread_mutex_unlock(&lfe->sf_dvr_lock);
finish:
mpegts_input_close_pid(mi, mm, pid, type, owner);
if (change) {
pthread_mutex_lock(&lfe->sf_dvr_lock);
if (!lfe->sf_pids_any_tuned ||
lfe->sf_pids_any != lfe->sf_pids_any_tuned)
tvh_write(lfe->sf_dvr_pipe.wr, "c", 1);
pthread_mutex_unlock(&lfe->sf_dvr_lock);
}
}
static idnode_set_t *