mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-09-07 13:48:35 +02:00
Code Issues Packages Projects Releases Wiki Activity

scan: join NIT thread before continue, if sdt parse failed

Browse Source
This commit is contained in:
[CST] Focus
2012-01-19 16:48:51 +04:00
parent 510f68d48a
commit 772d8d365f
1 changed files with 20 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/zapit/src/scan.cpp
View File

@@ -281,7 +281,26 @@ _repeat:
} }
#endif #endif
CSdt sdt(satellitePosition, freq); CSdt sdt(satellitePosition, freq);
sdt.Parse(&tI->second.transport_stream_id, &tI->second.original_network_id); bool sdt_parsed = sdt.Parse(tI->second.transport_stream_id, tI->second.original_network_id);
#ifdef NIT_THREAD
if(scan_nit && nthread) {
if(pthread_join(nthread, NULL))
perror("pthread_join !!!!!!!!!");
}
#else
if(scan_nit) {
printf("[scan] trying to parse NIT\n");
int status = parse_nit(satellitePosition, freq /*tI->second.feparams.frequency/1000*/);
if(status < 0)
printf("[scan] NIT failed !\n");
}
#endif
if(!sdt_parsed) {
printf("[scan] SDT failed !\n");
continue;
}
TsidOnid = CREATE_TRANSPONDER_ID_FROM_SATELLITEPOSITION_ORIGINALNETWORK_TRANSPORTSTREAM_ID( TsidOnid = CREATE_TRANSPONDER_ID_FROM_SATELLITEPOSITION_ORIGINALNETWORK_TRANSPORTSTREAM_ID(
freq /*tI->second.feparams.frequency/1000*/, satellitePosition, tI->second.original_network_id, freq /*tI->second.feparams.frequency/1000*/, satellitePosition, tI->second.original_network_id,
tI->second.transport_stream_id); tI->second.transport_stream_id);
@@ -304,19 +323,6 @@ _repeat:
else else
stI->second.feparams.u.qpsk.fec_inner = tI->second.feparams.u.qpsk.fec_inner; stI->second.feparams.u.qpsk.fec_inner = tI->second.feparams.u.qpsk.fec_inner;
#ifdef NIT_THREAD
if(scan_nit && nthread) {
if(pthread_join(nthread, NULL))
perror("pthread_join !!!!!!!!!");
}
#else
if(scan_nit) {
printf("[scan] trying to parse NIT\n");
int status = parse_nit(satellitePosition, freq /*tI->second.feparams.frequency/1000*/);
if(status < 0)
printf("[scan] NIT failed !\n");
}
#endif
printf("[scan] tpid ready: %llx\n", TsidOnid); printf("[scan] tpid ready: %llx\n", TsidOnid);
} }
if(scan_nit) { if(scan_nit) {