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

mpegts: don't pass unecessary stream specific PIDs for other streams

Browse source 
This mostly affected the PMTs which were all passed to any service, rather
than just the specific one for the relevant service.
This commit is contained in:
Adam Sutton 2013-11-28 11:11:15 +00:00
parent cee904bf52
commit 3d5b0f22d8
2 changed files with 14 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/input/mpegts/dvb_psi.c
View file

@ -609,7 +609,7 @@ dvb_pat_callback
int save = 0;
if ((s = mpegts_service_find(mm, sid, pid, 1, &save))) {
mpegts_table_add(mm, DVB_PMT_BASE, DVB_PMT_MASK, dvb_pmt_callback,
NULL, "pmt", MT_CRC | MT_QUICKREQ | MT_RECORD, pid);
NULL, "pmt", MT_CRC | MT_QUICKREQ, pid);
if (save)
service_request_save((service_t*)s, 1);

17
src/input/mpegts/mpegts_input.c
View file

@ -365,20 +365,29 @@ mpegts_input_recv_packets
/* Find PID */
if ((mp = mpegts_mux_find_pid(mm, pid, 0))) {
int stream = 0;
int table = 0;
int table = 0;
/* Stream takes pref. */
RB_FOREACH(mps, &mp->mp_subs, mps_link) {
if (mps->mps_type & MPS_STREAM)
stream = 1;
if (mps->mps_type & MPS_TABLE)
table = 1;
table = 1;
}
/* Special case streams */
if (pid == 0) table = stream = 1;
LIST_FOREACH(s, &mi->mi_transports, s_active_link) {
if (pid == s->s_pmt_pid) stream = 1;
else if (pid == s->s_pcr_pid) stream = 1;
}
/* Stream data */
if (stream) {
LIST_FOREACH(s, &mi->mi_transports, s_active_link)
ts_recv_packet1((mpegts_service_t*)s, tsb+i, ppcr, table);
LIST_FOREACH(s, &mi->mi_transports, s_active_link) {
int f = table || (pid == s->s_pmt_pid) || (pid == s->s_pcr_pid);
ts_recv_packet1((mpegts_service_t*)s, tsb+i, ppcr, f);
}
}
/* Table data */