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

ATSC: In VCT, if tsid is 0, assume it's current mux

Browse source
This commit is contained in:
Andreas Öman 2013-02-06 03:22:06 -05:00
parent 5398629394
commit 0fd2aaf66f
1 changed files with 13 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/dvb/dvb_tables.c
View file

@ -967,6 +967,7 @@ static int
atsc_vct_callback(th_dvb_mux_instance_t *tdmi, uint8_t *ptr, int len,
uint8_t tableid, void *opaque)
{
th_dvb_mux_instance_t *tdmi0 = tdmi;
th_dvb_adapter_t *tda = tdmi->tdmi_adapter;
service_t *t;
int numch;
@ -1000,15 +1001,18 @@ atsc_vct_callback(th_dvb_mux_instance_t *tdmi, uint8_t *ptr, int len,
tsid = (ptr[22] << 8) | ptr[23];
onid = (ptr[24] << 8) | ptr[25];
/* Search all muxes on adapter */
LIST_FOREACH(tdmi, &tda->tda_muxes, tdmi_adapter_link)
if(tdmi->tdmi_transport_stream_id == tsid &&
tdmi->tdmi_network_id == onid);
break;
if(tdmi == NULL)
continue;
if(tsid == 0) {
tdmi = tdmi0;
} else {
/* Search all muxes on adapter */
LIST_FOREACH(tdmi, &tda->tda_muxes, tdmi_adapter_link) {
if(tdmi->tdmi_transport_stream_id == tsid && tdmi->tdmi_network_id == onid)
break;
}
if(tdmi == NULL)
continue;
}
service_id = (ptr[24] << 8) | ptr[25];
if((t = dvb_service_find(tdmi, service_id, 0, NULL)) == NULL)