X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/d63d2c3c6cbbd574dda4f8b00ebe6c661735edd5..f3b1a20b183c612caf5122ebc4540a8fe4fff486:/lib/dvb/scan.cpp diff --git a/lib/dvb/scan.cpp b/lib/dvb/scan.cpp index 68121c44..8865f304 100644 --- a/lib/dvb/scan.cpp +++ b/lib/dvb/scan.cpp @@ -1,22 +1,28 @@ #include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #include #include #include #include #include +#include #include +#define SCAN_eDebug(x...) eDebug(x) +#define SCAN_eDebugNoNewLine(x...) eDebugNoNewLine(x) + +DEFINE_REF(eDVBScan); + eDVBScan::eDVBScan(iDVBChannel *channel): m_channel(channel) { if (m_channel->getDemux(m_demux)) - eDebug("scan: failed to allocate demux!"); + SCAN_eDebug("scan: failed to allocate demux!"); m_channel->connectStateChange(slot(*this, &eDVBScan::stateChange), m_stateChanged_connection); } @@ -24,29 +30,28 @@ eDVBScan::~eDVBScan() { } -int eDVBScan::isValidONIDTSID(eOriginalNetworkID onid, eTransportStreamID tsid) +int eDVBScan::isValidONIDTSID(int orbital_position, eOriginalNetworkID onid, eTransportStreamID tsid) { switch (onid.get()) { case 0: - case 0xFFFF: case 0x1111: return 0; case 1: - return tsid>1; + return orbital_position == 192; case 0x00B1: return tsid != 0x00B0; case 0x0002: - return tsid != 0x07E8; + return abs(orbital_position-282) < 6; default: - return 1; + return onid.get() < 0xFF00; } } eDVBNamespace eDVBScan::buildNamespace(eOriginalNetworkID onid, eTransportStreamID tsid, unsigned long hash) { // on valid ONIDs, ignore frequency ("sub network") part - if (isValidONIDTSID(onid, tsid)) + if (isValidONIDTSID((hash >> 16) & 0xFFFF, onid, tsid)) hash &= ~0xFFFF; return eDVBNamespace(hash); } @@ -63,11 +68,12 @@ void eDVBScan::stateChange(iDVBChannel *ch) { startFilter(); m_channel_state = state; - } else if (state == iDVBChannel::state_unavailable) + } else if (state == iDVBChannel::state_failed) { m_ch_unavailable.push_back(m_ch_current); nextChannel(); } + /* unavailable will timeout, anyway. */ } RESULT eDVBScan::nextChannel() @@ -76,7 +82,17 @@ RESULT eDVBScan::nextChannel() m_SDT = 0; m_BAT = 0; m_NIT = 0; - m_ready = readyBAT; + m_ready = 0; + + /* check what we need */ + m_ready_all = readySDT; + + if (m_flags & scanNetworkSearch) + m_ready_all |= readyNIT; + + if (m_flags & scanSearchBAT) + m_ready_all |= readyBAT; + if (m_ch_toScan.empty()) { eDebug("no channels left to scan."); @@ -88,14 +104,33 @@ RESULT eDVBScan::nextChannel() } m_ch_current = m_ch_toScan.front(); + m_ch_toScan.pop_front(); if (m_channel->getFrontend(fe)) + { + m_event(evtFail); 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_channel_state = iDVBChannel::state_idle; if (fe->tune(*m_ch_current)) + { + return nextChannel(); + m_event(evtFail); return -EINVAL; + } m_event(evtUpdate); return 0; @@ -105,28 +140,42 @@ RESULT eDVBScan::startFilter() { assert(m_demux); - m_SDT = new eTable(); - if (m_SDT->start(m_demux, eDVBSDTSpec())) - return -1; - CONNECT(m_SDT->tableReady, eDVBScan::SDTready); + /* only start required filters filter */ + + m_SDT = 0; + + if (m_ready_all & readySDT) + { + m_SDT = new eTable(); + if (m_SDT->start(m_demux, eDVBSDTSpec())) + return -1; + CONNECT(m_SDT->tableReady, eDVBScan::SDTready); + } m_NIT = 0; - m_NIT = new eTable(); - if (m_NIT->start(m_demux, eDVBNITSpec())) - return -1; - CONNECT(m_NIT->tableReady, eDVBScan::NITready); - - m_BAT = new eTable(); - if (m_BAT->start(m_demux, eDVBBATSpec())) - return -1; - CONNECT(m_BAT->tableReady, eDVBScan::BATready); + if (m_ready_all & readyNIT) + { + m_NIT = new eTable(); + if (m_NIT->start(m_demux, eDVBNITSpec())) + return -1; + CONNECT(m_NIT->tableReady, eDVBScan::NITready); + } + + m_BAT = 0; + if (m_ready_all & readyBAT) + { + m_BAT = new eTable(); + if (m_BAT->start(m_demux, eDVBBATSpec())) + return -1; + CONNECT(m_BAT->tableReady, eDVBScan::BATready); + } return 0; } void eDVBScan::SDTready(int err) { - eDebug("got sdt"); + SCAN_eDebug("got sdt"); m_ready |= readySDT; if (!err) m_ready |= validSDT; @@ -135,7 +184,7 @@ void eDVBScan::SDTready(int err) void eDVBScan::NITready(int err) { - eDebug("got nit, err %d", err); + SCAN_eDebug("got nit, err %d", err); m_ready |= readyNIT; if (!err) m_ready |= validNIT; @@ -144,19 +193,22 @@ void eDVBScan::NITready(int err) void eDVBScan::BATready(int err) { - eDebug("got bat"); + SCAN_eDebug("got bat"); m_ready |= readyBAT; if (!err) m_ready |= validBAT; channelDone(); } -void eDVBScan::addChannel(const eDVBChannelID &chid, iDVBFrontendParameters *feparm) +void eDVBScan::addKnownGoodChannel(const eDVBChannelID &chid, iDVBFrontendParameters *feparm) { /* add it to the list of known channels. */ if (chid) m_new_channels.insert(std::pair >(chid, feparm)); - +} + +void eDVBScan::addChannelToScan(const eDVBChannelID &chid, iDVBFrontendParameters *feparm) +{ /* check if we don't already have that channel ... */ /* ... in the list of channels to scan */ @@ -204,8 +256,8 @@ void eDVBScan::channelDone() (**m_SDT->getSections().begin()).getTransportStreamId(), hash); - eDebug("SDT: "); - ServiceDescriptionTableConstIterator i; + SCAN_eDebug("SDT: "); + std::vector::const_iterator i; for (i = m_SDT->getSections().begin(); i != m_SDT->getSections().end(); ++i) processSDT(dvbnamespace, **i); m_ready &= ~validSDT; @@ -213,16 +265,16 @@ void eDVBScan::channelDone() if (m_ready & validNIT) { - eDebug("dumping NIT"); - NetworkInformationTableConstIterator i; + SCAN_eDebug("dumping NIT"); + std::vector::const_iterator i; for (i = m_NIT->getSections().begin(); i != m_NIT->getSections().end(); ++i) { - const TransportStreamInfoVector &tsinfovec = *(*i)->getTsInfo(); + const TransportStreamInfoList &tsinfovec = *(*i)->getTsInfo(); for (TransportStreamInfoConstIterator tsinfo(tsinfovec.begin()); tsinfo != tsinfovec.end(); ++tsinfo) { - eDebug("TSID: %04x ONID: %04x", (*tsinfo)->getTransportStreamId(), + SCAN_eDebug("TSID: %04x ONID: %04x", (*tsinfo)->getTransportStreamId(), (*tsinfo)->getOriginalNetworkId()); eOriginalNetworkID onid = (*tsinfo)->getOriginalNetworkId(); @@ -237,7 +289,7 @@ void eDVBScan::channelDone() case SATELLITE_DELIVERY_SYSTEM_DESCRIPTOR: { SatelliteDeliverySystemDescriptor &d = (SatelliteDeliverySystemDescriptor&)**desc; - eDebug("%d kHz, %d%d%d.%d%c %s MOD:%d %d symb/s, fec %d", + SCAN_eDebug("%d kHz, %d%d%d.%d%c %s MOD:%d %d symb/s, fec %d", d.getFrequency(), (d.getOrbitalPosition()>>12)&0xF, (d.getOrbitalPosition()>>8)&0xF, @@ -258,14 +310,20 @@ void eDVBScan::channelDone() feparm->getHash(hash); eDVBNamespace ns = buildNamespace(onid, tsid, hash); - - addChannel( - eDVBChannelID(ns, tsid, onid), - feparm); + + if ( m_chid_current.dvbnamespace.get() != -1 && + ((ns.get() ^ m_chid_current.dvbnamespace.get()) & 0xFFFF0000)) + eDebug("dropping this transponder, it's on another satellite."); + else + { + addChannelToScan( + eDVBChannelID(ns, tsid, onid), + feparm); + } break; } default: - eDebug("descr<%x>", (*desc)->getTag()); + SCAN_eDebug("descr<%x>", (*desc)->getTag()); break; } } @@ -275,15 +333,43 @@ void eDVBScan::channelDone() m_ready &= ~validNIT; } - if ((m_ready & readyAll) != readyAll) + if ((m_ready & m_ready_all) != m_ready_all) return; - eDebug("channel done!"); + SCAN_eDebug("channel done!"); + + /* if we had services on this channel, we declare + this channels as "known good". add it. + + (TODO: not yet implemented) + a NIT entry could have possible overridden + our frontend data with more exact data. + + (TODO: not yet implemented) + the tuning process could have lead to more + exact data than the user entered. + + The channel id was probably corrected + by the data written in the SDT. this is + important, as "initial transponder lists" + usually don't have valid CHIDs (and that's + good). + + 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); nextChannel(); } -void eDVBScan::start(const std::list > &known_transponders) +void eDVBScan::start(const eSmartPtrList &known_transponders, int flags) { + m_flags = flags; m_ch_toScan.clear(); m_ch_scanned.clear(); m_ch_unavailable.clear(); @@ -293,7 +379,7 @@ void eDVBScan::start(const std::list > &known_trans nextChannel(); } -void eDVBScan::insertInto(eDVBDB *db) +void eDVBScan::insertInto(iDVBChannelList *db) { for (std::map >::const_iterator ch(m_new_channels.begin()); ch != m_new_channels.end(); ++ch) @@ -309,15 +395,19 @@ void eDVBScan::insertInto(eDVBDB *db) } } -RESULT eDVBScan::processSDT(eDVBNamespace dvbnamespace, const ServiceDescriptionTable &sdt) +RESULT eDVBScan::processSDT(eDVBNamespace dvbnamespace, const ServiceDescriptionSection &sdt) { - const ServiceDescriptionVector &services = *sdt.getDescriptions(); - eDebug("ONID: %04x", sdt.getOriginalNetworkId()); + const ServiceDescriptionList &services = *sdt.getDescriptions(); + SCAN_eDebug("ONID: %04x", sdt.getOriginalNetworkId()); eDVBChannelID chid(dvbnamespace, sdt.getTransportStreamId(), sdt.getOriginalNetworkId()); + /* save correct CHID for this channel if this is an ACTUAL_SDT */ + if (sdt.getTableId() == TID_SDT_ACTUAL) + m_chid_current = chid; + for (ServiceDescriptionConstIterator s(services.begin()); s != services.end(); ++s) { - eDebugNoNewLine("SID %04x: ", (*s)->getServiceId()); + SCAN_eDebugNoNewLine("SID %04x: ", (*s)->getServiceId()); eServiceReferenceDVB ref; ePtr service = new eDVBService; @@ -338,26 +428,28 @@ RESULT eDVBScan::processSDT(eDVBNamespace dvbnamespace, const ServiceDescription case SERVICE_DESCRIPTOR: { ServiceDescriptor &d = (ServiceDescriptor&)**desc; - eDebug("name '%s', provider_name '%s'", d.getServiceName().c_str(), d.getServiceProviderName().c_str()); - service->m_service_name = d.getServiceName(); - service->m_provider_name = d.getServiceProviderName(); + service->m_service_name = convertDVBUTF8(d.getServiceName()); + service->genSortName(); + + service->m_provider_name = convertDVBUTF8(d.getServiceProviderName()); + SCAN_eDebug("name '%s', provider_name '%s'", service->m_service_name.c_str(), service->m_provider_name.c_str()); break; } case CA_IDENTIFIER_DESCRIPTOR: { CaIdentifierDescriptor &d = (CaIdentifierDescriptor&)**desc; - const CaSystemIdVector &caids = *d.getCaSystemIds(); - eDebugNoNewLine("CA "); - for (CaSystemIdVector::const_iterator i(caids.begin()); i != caids.end(); ++i) + const CaSystemIdList &caids = *d.getCaSystemIds(); + SCAN_eDebugNoNewLine("CA "); + for (CaSystemIdList::const_iterator i(caids.begin()); i != caids.end(); ++i) { - eDebugNoNewLine("%04x ", *i); + SCAN_eDebugNoNewLine("%04x ", *i); service->m_ca.insert(*i); } - eDebug(""); + SCAN_eDebug(""); break; } default: - eDebug("descr<%x>", (*desc)->getTag()); + SCAN_eDebug("descr<%x>", (*desc)->getTag()); break; } } @@ -369,6 +461,13 @@ RESULT eDVBScan::processSDT(eDVBNamespace dvbnamespace, const ServiceDescription RESULT eDVBScan::connectEvent(const Slot1 &event, ePtr &connection) { - connection = new eConnection(m_event.connect(event)); + connection = new eConnection(this, m_event.connect(event)); return 0; } + +void eDVBScan::getStats(int &transponders_done, int &transponders_total, int &services) +{ + transponders_done = m_ch_scanned.size() + m_ch_unavailable.size(); + transponders_total = m_ch_toScan.size() + transponders_done; + services = m_new_services.size(); +}