mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-27 07:22:57 +02:00
Code Issues Packages Projects Releases Wiki Activity

testing cable problems

Browse Source 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@202 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Branch: ni/coolstream
Commit: ca51e2ea50
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2010-01-21 (Thu, 21 Jan 2010)



------------------
This commit was generated by Migit
This commit is contained in:
[CST] Focus
2010-01-21 14:54:13 +00:00
parent bbd45958d6
commit 5a3b25897f
2 changed files with 41 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/zapit/src/getservices.cpp
View File

@@ -255,13 +255,18 @@ void ParseSatTransponders(fe_type_t frontendType, xmlNodePtr search, t_satellite
memset(&feparams, 0x00, sizeof(FrontendParameters)); memset(&feparams, 0x00, sizeof(FrontendParameters));
feparams.frequency = xmlGetNumericAttribute(tps, "frequency", 0); feparams.frequency = xmlGetNumericAttribute(tps, "frequency", 0);
freq_id_t freq;
if (frontendType == FE_QAM) { if (frontendType == FE_QAM) {
if (feparams.frequency > 1000*1000) if (feparams.frequency > 1000*1000)
feparams.frequency=feparams.frequency/1000; //transponderlist was read from tuxbox feparams.frequency=feparams.frequency/1000; //transponderlist was read from tuxbox
feparams.frequency = (int) 1000 * (int) round ((double) feparams.frequency / (double) 1000); //feparams.frequency = (int) 1000 * (int) round ((double) feparams.frequency / (double) 1000);
freq = feparams.frequency/100;
} }
else else {
feparams.frequency = (int) 1000 * (int) round ((double) feparams.frequency / (double) 1000); feparams.frequency = (int) 1000 * (int) round ((double) feparams.frequency / (double) 1000);
freq = feparams.frequency/1000;
}
feparams.inversion = INVERSION_AUTO; feparams.inversion = INVERSION_AUTO;
@@ -281,9 +286,10 @@ void ParseSatTransponders(fe_type_t frontendType, xmlNodePtr search, t_satellite
xml_fec += 9; xml_fec += 9;
feparams.u.qpsk.fec_inner = (fe_code_rate_t) xml_fec; feparams.u.qpsk.fec_inner = (fe_code_rate_t) xml_fec;
} }
transponder_id_t tid = transponder_id_t tid =
CREATE_TRANSPONDER_ID_FROM_SATELLITEPOSITION_ORIGINALNETWORK_TRANSPORTSTREAM_ID( CREATE_TRANSPONDER_ID_FROM_SATELLITEPOSITION_ORIGINALNETWORK_TRANSPORTSTREAM_ID(
feparams.frequency/1000, satellitePosition, fake_nid, fake_tid); freq /*feparams.frequency/1000*/, satellitePosition, fake_nid, fake_tid);
polarization &= 1; polarization &= 1;
select_transponders.insert ( select_transponders.insert (

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

@@ -71,7 +71,7 @@ uint32_t processed_transponders;
uint32_t failed_transponders; uint32_t failed_transponders;
uint32_t actual_freq; uint32_t actual_freq;
uint32_t actual_polarisation; uint32_t actual_polarisation;
int scan_mode = 0; int scan_mode = 0; /* 0 = NIT, 1 = fast */
int scan_sat_mode = 0; int scan_sat_mode = 0;
CBouquetManager* scanBouquetManager; CBouquetManager* scanBouquetManager;
@@ -110,10 +110,10 @@ int add_to_scan(transponder_id_t TsidOnid, FrontendParameters *feparams, uint8_t
DBG("add_to_scan: freq %d pol %d tpid %llx\n", feparams->frequency, polarity, TsidOnid); DBG("add_to_scan: freq %d pol %d tpid %llx\n", feparams->frequency, polarity, TsidOnid);
//if(fromnit) printf("add_to_scan: freq %d pol %d tpid %llx\n", feparams->frequency, polarity, TsidOnid); //if(fromnit) printf("add_to_scan: freq %d pol %d tpid %llx\n", feparams->frequency, polarity, TsidOnid);
freq_id_t freq; freq_id_t freq;
if(frontend->getInfo()->type == FE_QPSK) if(cable)
freq = feparams->frequency / 1000; freq = feparams->frequency/100;
else else
freq = feparams->frequency / 100; freq = feparams->frequency/1000;
uint8_t poltmp1 = polarity & 1; uint8_t poltmp1 = polarity & 1;
uint8_t poltmp2; uint8_t poltmp2;
@@ -182,10 +182,11 @@ int build_bf_transponder(FrontendParameters *feparams, t_satellite_position sate
{ {
DBG("[scan] freq= %d, rate= %d, position %d\n", feparams->frequency, feparams->u.qam.symbol_rate, satellitePosition); DBG("[scan] freq= %d, rate= %d, position %d\n", feparams->frequency, feparams->u.qam.symbol_rate, satellitePosition);
freq_id_t freq; freq_id_t freq;
if(frontend->getInfo()->type == FE_QPSK) if(cable)
freq = feparams->frequency / 1000; freq = feparams->frequency/100;
else else
freq = feparams->frequency / 100; freq = feparams->frequency/1000;
if(scan_mode) { if(scan_mode) {
fake_tid++; fake_nid++; fake_tid++; fake_nid++;
return add_to_scan( return add_to_scan(
@@ -221,9 +222,9 @@ _repeat:
printf("[scan] scanning: %llx\n", tI->first); printf("[scan] scanning: %llx\n", tI->first);
if(cable) if(cable)
actual_freq = tI->second.feparams.frequency / 1000;
else
actual_freq = tI->second.feparams.frequency; actual_freq = tI->second.feparams.frequency;
else
actual_freq = tI->second.feparams.frequency/1000;
processed_transponders++; processed_transponders++;
eventServer->sendEvent(CZapitClient::EVT_SCAN_REPORT_NUM_SCANNED_TRANSPONDERS, CEventServer::INITID_ZAPIT, &processed_transponders, sizeof(processed_transponders)); eventServer->sendEvent(CZapitClient::EVT_SCAN_REPORT_NUM_SCANNED_TRANSPONDERS, CEventServer::INITID_ZAPIT, &processed_transponders, sizeof(processed_transponders));
@@ -242,7 +243,9 @@ _repeat:
} }
if(abort_scan) if(abort_scan)
return 0; return 0;
if(0 /*scan_mode*/) {//FIXME
#if 0
if(scan_mode) {
TsidOnid = get_sdt_TsidOnid(satellitePosition, tI->second.feparams.frequency/1000); TsidOnid = get_sdt_TsidOnid(satellitePosition, tI->second.feparams.frequency/1000);
DBG("[scan] actual tp-id %llx\n", TsidOnid); DBG("[scan] actual tp-id %llx\n", TsidOnid);
if(!TsidOnid) if(!TsidOnid)
@@ -251,6 +254,7 @@ _repeat:
tI->second.transport_stream_id = (TsidOnid >> 16)&0xFFFF; tI->second.transport_stream_id = (TsidOnid >> 16)&0xFFFF;
tI->second.original_network_id = TsidOnid &0xFFFF; tI->second.original_network_id = TsidOnid &0xFFFF;
} }
#endif
if(abort_scan) if(abort_scan)
return 0; return 0;
@@ -263,10 +267,10 @@ _repeat:
} }
#endif #endif
freq_id_t freq; freq_id_t freq;
if(frontend->getInfo()->type == FE_QPSK) if(cable)
freq = tI->second.feparams.frequency/1000;
else
freq = tI->second.feparams.frequency/100; freq = tI->second.feparams.frequency/100;
else
freq = tI->second.feparams.frequency/1000;
//INFO("parsing SDT (tsid:onid %04x:%04x)", tI->second.transport_stream_id, tI->second.original_network_id); //INFO("parsing SDT (tsid:onid %04x:%04x)", tI->second.transport_stream_id, tI->second.original_network_id);
status = parse_sdt(&tI->second.transport_stream_id, &tI->second.original_network_id, satellitePosition, freq /*tI->second.feparams.frequency/1000*/); status = parse_sdt(&tI->second.transport_stream_id, &tI->second.original_network_id, satellitePosition, freq /*tI->second.feparams.frequency/1000*/);
if(status < 0) { if(status < 0) {
@@ -304,7 +308,7 @@ _repeat:
#else #else
if(!scan_mode) { if(!scan_mode) {
printf("[scan] trying to parse NIT\n"); printf("[scan] trying to parse NIT\n");
status = parse_nit(satellitePosition, tI->second.feparams.frequency/1000); status = parse_nit(satellitePosition, freq /*tI->second.feparams.frequency/1000*/);
if(status < 0) if(status < 0)
printf("[scan] NIT failed !\n"); printf("[scan] NIT failed !\n");
} }
@@ -370,10 +374,13 @@ int scan_transponder(xmlNodePtr transponder, uint8_t diseqc_pos, t_satellite_pos
xml_fec += 9; xml_fec += 9;
feparams.u.qpsk.fec_inner = (fe_code_rate_t) xml_fec; feparams.u.qpsk.fec_inner = (fe_code_rate_t) xml_fec;
} }
#if 0
if (cable && satfeed) { if (cable && satfeed) {
/* build special transponder for cable with satfeed */ /* build special transponder for cable with satfeed */
status = build_bf_transponder(&feparams, satellitePosition); status = build_bf_transponder(&feparams, satellitePosition);
} else { } else
#endif
{
/* read network information table */ /* read network information table */
fake_tid++; fake_nid++; fake_tid++; fake_nid++;
status = add_to_scan( status = add_to_scan(
@@ -614,15 +621,22 @@ void * scan_transponder(void * arg)
printf("[scan_transponder] freq %d rate %d fec %d pol %d NIT %s\n", TP->feparams.frequency, TP->feparams.u.qpsk.symbol_rate, TP->feparams.u.qpsk.fec_inner, TP->polarization, scan_mode ? "no" : "yes"); printf("[scan_transponder] freq %d rate %d fec %d pol %d NIT %s\n", TP->feparams.frequency, TP->feparams.u.qpsk.symbol_rate, TP->feparams.u.qpsk.fec_inner, TP->polarization, scan_mode ? "no" : "yes");
} else } else
printf("[scan_transponder] freq %d rate %d fec %d mod %d\n", TP->feparams.frequency, TP->feparams.u.qam.symbol_rate, TP->feparams.u.qam.fec_inner, TP->feparams.u.qam.modulation); printf("[scan_transponder] freq %d rate %d fec %d mod %d\n", TP->feparams.frequency, TP->feparams.u.qam.symbol_rate, TP->feparams.u.qam.fec_inner, TP->feparams.u.qam.modulation);
#if 0
if (cable) { if (cable) {
/* build special transponder for cable with satfeed */ /* build special transponder for cable with satfeed */
build_bf_transponder(&(TP->feparams), satellitePosition); build_bf_transponder(&(TP->feparams), satellitePosition);
} else { } else
#endif
{
freq_id_t freq;
if(cable)
freq = TP->feparams.frequency/100;
else
freq = TP->feparams.frequency/1000;
/* read network information table */ /* read network information table */
fake_tid++; fake_nid++; fake_tid++; fake_nid++;
status = add_to_scan( status = add_to_scan(
CREATE_TRANSPONDER_ID_FROM_SATELLITEPOSITION_ORIGINALNETWORK_TRANSPORTSTREAM_ID(TP->feparams.frequency/1000, satellitePosition, fake_nid, fake_tid), CREATE_TRANSPONDER_ID_FROM_SATELLITEPOSITION_ORIGINALNETWORK_TRANSPORTSTREAM_ID(freq /*TP->feparams.frequency/1000*/, satellitePosition, fake_nid, fake_tid),
&TP->feparams, TP->polarization); &TP->feparams, TP->polarization);
} }
get_sdts(satellitePosition); get_sdts(satellitePosition);