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

mpegts: some minor corrections to table extraid in PAT/PMT

Browse source
This commit is contained in:
Adam Sutton 2013-11-28 12:21:59 +00:00
parent d25fba8a14
commit 8193c28d0b
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -579,11 +579,12 @@ dvb_pat_callback
/* Begin */
if (tableid != 0) return -1;
r = dvb_table_begin(mt, ptr, len, tableid, 0, 5, &st, &sect, &last, &ver);
tsid = (ptr[0] << 8) | ptr[1];
r = dvb_table_begin(mt, ptr, len, tableid, tsid, 5,
&st, &sect, &last, &ver);
if (r != 1) return r;
/* Multiplex */
tsid = (ptr[0] << 8) | ptr[1];
tvhdebug("pat", "tsid %04X (%d)", tsid, tsid);
mpegts_mux_set_tsid(mm, tsid);
@ -699,11 +700,11 @@ dvb_pmt_callback
mpegts_table_state_t *st = NULL;
/* Start */
r = dvb_table_begin(mt, ptr, len, tableid, 0, 9, &st, &sect, &last, &ver);
sid = ptr[0] << 8 | ptr[1];
r = dvb_table_begin(mt, ptr, len, tableid, sid, 9, &st, &sect, &last, &ver);
if (r != 1) return r;
/* Find service */
sid = ptr[0] << 8 | ptr[1];
LIST_FOREACH(s, &mm->mm_services, s_dvb_mux_link)
if (s->s_dvb_service_id == sid) break;
if (!s) return -1;