X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/a2eb4cb31c5df65b943b68a9aa0a376655631143..4c697b16225031cc892857d78b7d6fb5d8f02280:/lib/dvb/scan.cpp diff --git a/lib/dvb/scan.cpp b/lib/dvb/scan.cpp index f9d7547e..d5328163 100644 --- a/lib/dvb/scan.cpp +++ b/lib/dvb/scan.cpp @@ -120,16 +120,7 @@ RESULT eDVBScan::nextChannel() return -ENOTSUP; } - int fetype; - fe->getFrontendType(fetype); - if ( fetype == iDVBFrontend::feSatellite) - { - eDVBFrontendParametersSatellite p; - m_ch_current->getDVBS(p); - m_chid_current = eDVBChannelID(p.orbital_position << 16, -1, -1); - } - else - m_chid_current = eDVBChannelID(); + m_chid_current = eDVBChannelID(); m_channel_state = iDVBChannel::state_idle; if (fe->tune(*m_ch_current)) @@ -157,7 +148,7 @@ RESULT eDVBScan::startFilter() if (startSDT && (m_ready_all & readySDT)) { m_SDT = new eTable(); - if (m_ready & readyPAT) + if (m_ready & readyPAT && m_ready & validPAT) { std::vector::const_iterator i = m_PAT->getSections().begin(); @@ -250,34 +241,99 @@ void eDVBScan::addKnownGoodChannel(const eDVBChannelID &chid, iDVBFrontendParame void eDVBScan::addChannelToScan(const eDVBChannelID &chid, iDVBFrontendParameters *feparm) { /* check if we don't already have that channel ... */ - + + int type; + feparm->getSystem(type); + + switch(type) + { + case iDVBFrontend::feSatellite: + { + eDVBFrontendParametersSatellite parm; + feparm->getDVBS(parm); + eDebug("try to add %d %d %d %d %d %d", + parm.orbital_position, parm.frequency, parm.symbol_rate, parm.polarisation, parm.fec, parm.modulation); + break; + } + case iDVBFrontend::feCable: + { + eDVBFrontendParametersCable parm; + feparm->getDVBC(parm); + eDebug("try to add %d %d %d %d", + parm.frequency, parm.symbol_rate, parm.modulation, parm.fec_inner); + break; + } + case iDVBFrontend::feTerrestrial: + { + eDVBFrontendParametersTerrestrial parm; + feparm->getDVBT(parm); + eDebug("try to add %d %d %d %d %d %d %d %d", + parm.frequency, parm.modulation, parm.transmission_mode, parm.hierarchy, + parm.guard_interval, parm.code_rate_LP, parm.code_rate_HP, parm.bandwidth); + break; + } + } + + int found_count=0; /* ... in the list of channels to scan */ - for (std::list >::const_iterator i(m_ch_toScan.begin()); i != m_ch_toScan.end(); ++i) + for (std::list >::iterator i(m_ch_toScan.begin()); i != m_ch_toScan.end();) + { if (sameChannel(*i, feparm)) - return; + { + if (!found_count) + { + *i = feparm; // update + eDebug("update"); + } + else + { + eDebug("remove dupe"); + m_ch_toScan.erase(i++); + continue; + } + ++found_count; + } + ++i; + } + + if (found_count > 0) + { + eDebug("already in todo list"); + return; + } /* ... in the list of successfully scanned channels */ for (std::list >::const_iterator i(m_ch_scanned.begin()); i != m_ch_scanned.end(); ++i) if (sameChannel(*i, feparm)) + { + eDebug("successfully scanned"); return; - + } + /* ... in the list of unavailable channels */ for (std::list >::const_iterator i(m_ch_unavailable.begin()); i != m_ch_unavailable.end(); ++i) - if (sameChannel(*i, feparm)) + if (sameChannel(*i, feparm, true)) + { + eDebug("scanned but not available"); return; + } /* ... on the current channel */ if (sameChannel(m_ch_current, feparm)) + { + eDebug("is current"); return; + } + eDebug("really add"); /* otherwise, add it to the todo list. */ m_ch_toScan.push_front(feparm); // better.. then the rotor not turning wild from east to west :) } -int eDVBScan::sameChannel(iDVBFrontendParameters *ch1, iDVBFrontendParameters *ch2) const +int eDVBScan::sameChannel(iDVBFrontendParameters *ch1, iDVBFrontendParameters *ch2, bool exact) const { int diff; - if (ch1->calculateDifference(ch2, diff)) + if (ch1->calculateDifference(ch2, diff, exact)) return 0; if (diff < 4000) // more than 4mhz difference? return 1; @@ -310,7 +366,15 @@ void eDVBScan::channelDone() if (m_ready & validNIT) { + int system; + std::list > m_ch_toScan_backup; + m_ch_current->getSystem(system); SCAN_eDebug("dumping NIT"); + if (m_flags & clearToScanOnFirstNIT) + { + m_ch_toScan_backup = m_ch_toScan; + m_ch_toScan.clear(); + } std::vector::const_iterator i; for (i = m_NIT->getSections().begin(); i != m_NIT->getSections().end(); ++i) { @@ -332,6 +396,8 @@ void eDVBScan::channelDone() { case CABLE_DELIVERY_SYSTEM_DESCRIPTOR: { + if (system != iDVBFrontend::feCable) + break; // when current locked transponder is no cable transponder ignore this descriptor CableDeliverySystemDescriptor &d = (CableDeliverySystemDescriptor&)**desc; ePtr feparm = new eDVBFrontendParameters; eDVBFrontendParametersCable cable; @@ -349,6 +415,8 @@ void eDVBScan::channelDone() } case TERRESTRIAL_DELIVERY_SYSTEM_DESCRIPTOR: { + if (system != iDVBFrontend::feTerrestrial) + break; // when current locked transponder is no terrestrial transponder ignore this descriptor TerrestrialDeliverySystemDescriptor &d = (TerrestrialDeliverySystemDescriptor&)**desc; ePtr feparm = new eDVBFrontendParameters; eDVBFrontendParametersTerrestrial terr; @@ -366,6 +434,9 @@ void eDVBScan::channelDone() } case SATELLITE_DELIVERY_SYSTEM_DESCRIPTOR: { + if (system != iDVBFrontend::feSatellite) + break; // when current locked transponder is no satellite transponder ignore this descriptor + SatelliteDeliverySystemDescriptor &d = (SatelliteDeliverySystemDescriptor&)**desc; if (d.getFrequency() < 10000) break; @@ -373,19 +444,29 @@ void eDVBScan::channelDone() ePtr feparm = new eDVBFrontendParameters; eDVBFrontendParametersSatellite sat; sat.set(d); + + eDVBFrontendParametersSatellite p; + m_ch_current->getDVBS(p); + + if ( abs(p.orbital_position - sat.orbital_position) < 5 ) + sat.orbital_position = p.orbital_position; + + if ( abs(abs(3600 - p.orbital_position) - sat.orbital_position) < 5 ) + { + eDebug("found transponder with incorrect west/east flag ... correct this"); + sat.orbital_position = p.orbital_position; + } + feparm->setDVBS(sat); - unsigned long hash=0; - feparm->getHash(hash); - - eDVBNamespace ns = buildNamespace(onid, tsid, hash); - - if ( m_chid_current.dvbnamespace.get() != -1 && - ((ns.get() ^ m_chid_current.dvbnamespace.get()) & 0xFFFF0000)) + + if ( p.orbital_position != sat.orbital_position) SCAN_eDebug("dropping this transponder, it's on another satellite."); else { + unsigned long hash=0; + feparm->getHash(hash); addChannelToScan( - eDVBChannelID(ns, tsid, onid), + eDVBChannelID(buildNamespace(onid, tsid, hash), tsid, onid), feparm); } break; @@ -395,9 +476,25 @@ void eDVBScan::channelDone() break; } } - } + } + + /* a pitfall is to have the clearToScanOnFirstNIT-flag set, and having channels which have + no or invalid NIT. this code will not erase the toScan list unless at least one valid entry + has been found. + + This is not a perfect solution, as the channel could contain a partial NIT. Life's bad. + */ + if (m_flags & clearToScanOnFirstNIT) + { + if (m_ch_toScan.empty()) + { + eWarning("clearToScanOnFirstNIT was set, but NIT is invalid. Refusing to stop scan."); + m_ch_toScan = m_ch_toScan_backup; + } else + m_flags &= ~clearToScanOnFirstNIT; + } m_ready &= ~validNIT; } @@ -425,13 +522,25 @@ void eDVBScan::channelDone() These are the reasons for adding the transponder here, and not before. */ - + if (!m_chid_current) eWarning("SCAN: the current channel's ID was not corrected - not adding channel."); else addKnownGoodChannel(m_chid_current, m_ch_current); m_ch_scanned.push_back(m_ch_current); + + for (std::list >::iterator i(m_ch_toScan.begin()); i != m_ch_toScan.end();) + { + if (sameChannel(*i, m_ch_current)) + { + eDebug("remove dupe 2"); + m_ch_toScan.erase(i++); + continue; + } + ++i; + } + nextChannel(); } @@ -450,7 +559,7 @@ void eDVBScan::start(const eSmartPtrList &known_transpon bool exist=false; for (std::list >::const_iterator ii(m_ch_toScan.begin()); ii != m_ch_toScan.end(); ++ii) { - if (sameChannel(*i, *ii)) + if (sameChannel(*i, *ii, true)) { exist=true; break;