X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/a2eb4cb31c5df65b943b68a9aa0a376655631143..0e321af7afb77c88d4d880d66ea657d1e4e1e67e:/lib/dvb/scan.cpp diff --git a/lib/dvb/scan.cpp b/lib/dvb/scan.cpp index f9d7547e..fb8e5442 100644 --- a/lib/dvb/scan.cpp +++ b/lib/dvb/scan.cpp @@ -22,7 +22,7 @@ DEFINE_REF(eDVBScan); eDVBScan::eDVBScan(iDVBChannel *channel, bool usePAT, bool debug) :m_channel(channel), m_channel_state(iDVBChannel::state_idle) ,m_ready(0), m_ready_all(usePAT ? (readySDT|readyPAT) : readySDT) - ,m_flags(0), m_usePAT(usePAT) + ,m_pmt_running(false), m_abort_current_pmt(false), m_flags(0), m_usePAT(usePAT) { scan_debug=debug; if (m_channel->getDemux(m_demux)) @@ -84,10 +84,12 @@ RESULT eDVBScan::nextChannel() { ePtr fe; - m_SDT = 0; m_BAT = 0; m_NIT = 0; + m_SDT = 0; m_PAT = 0; m_BAT = 0; m_NIT = 0, m_PMT = 0; m_ready = 0; + m_pat_tsid = eTransportStreamID(); + /* check what we need */ m_ready_all = readySDT; @@ -120,25 +122,13 @@ 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)) - { return nextChannel(); - m_event(evtFail); - return -EINVAL; - } - + m_event(evtUpdate); return 0; } @@ -157,16 +147,45 @@ RESULT eDVBScan::startFilter() if (startSDT && (m_ready_all & readySDT)) { m_SDT = new eTable(); - if (m_ready & readyPAT) + int tsid=-1; + if (m_ready & readyPAT && m_ready & validPAT) { std::vector::const_iterator i = m_PAT->getSections().begin(); assert(i != m_PAT->getSections().end()); - int tsid = (*i)->getTableIdExtension(); // in PAT this is the transport stream id - if (m_SDT->start(m_demux, eDVBSDTSpec(tsid, true))) + tsid = (*i)->getTableIdExtension(); // in PAT this is the transport stream id + m_pat_tsid = eTransportStreamID(tsid); + for (; i != m_PAT->getSections().end(); ++i) + { + const ProgramAssociationSection &pat = **i; + ProgramAssociationConstIterator program = pat.getPrograms()->begin(); + for (; program != pat.getPrograms()->end(); ++program) + m_pmts_to_read.insert(std::pair((*program)->getProgramNumber(), service((*program)->getProgramMapPid()))); + } + m_PMT = new eTable(); + CONNECT(m_PMT->tableReady, eDVBScan::PMTready); + PMTready(-2); + + // KabelBW HACK ... on 618Mhz and 626Mhz the transport stream id in PAT and SDT is different + { + int type; + m_ch_current->getSystem(type); + if (type == iDVBFrontend::feCable) + { + eDVBFrontendParametersCable parm; + m_ch_current->getDVBC(parm); + if ((tsid == 0x00d7 && abs(parm.frequency-618000) < 2000) || + (tsid == 0x00d8 && abs(parm.frequency-626000) < 2000)) + tsid = -1; + } + } + } + if (tsid == -1) + { + if (m_SDT->start(m_demux, eDVBSDTSpec())) return -1; } - else if (m_SDT->start(m_demux, eDVBSDTSpec())) + else if (m_SDT->start(m_demux, eDVBSDTSpec(tsid, true))) return -1; CONNECT(m_SDT->tableReady, eDVBScan::SDTready); } @@ -206,7 +225,7 @@ RESULT eDVBScan::startFilter() void eDVBScan::SDTready(int err) { - SCAN_eDebug("got sdt"); + SCAN_eDebug("got sdt %d", err); m_ready |= readySDT; if (!err) m_ready |= validSDT; @@ -240,6 +259,124 @@ void eDVBScan::PATready(int err) startFilter(); // for starting the SDT filter } +void eDVBScan::PMTready(int err) +{ + SCAN_eDebug("got pmt %d", err); + if (!err) + { + bool scrambled = false; + bool have_audio = false; + bool have_video = false; + unsigned short pcrpid = 0xFFFF; + std::vector::const_iterator i; + for (i = m_PMT->getSections().begin(); i != m_PMT->getSections().end(); ++i) + { + const ProgramMapSection &pmt = **i; + if (pcrpid == 0xFFFF) + pcrpid = pmt.getPcrPid(); + else + SCAN_eDebug("already have a pcrpid %04x %04x", pcrpid, pmt.getPcrPid()); + ElementaryStreamInfoConstIterator es; + for (es = pmt.getEsInfo()->begin(); es != pmt.getEsInfo()->end(); ++es) + { + int isaudio = 0, isvideo = 0, is_scrambled = 0; + switch ((*es)->getType()) + { + case 0x1b: // AVC Video Stream (MPEG4 H264) + case 0x01: // MPEG 1 video + case 0x02: // MPEG 2 video + isvideo = 1; + //break; fall through !!! + case 0x03: // MPEG 1 audio + case 0x04: // MPEG 2 audio: + if (!isvideo) + isaudio = 1; + //break; fall through !!! + case 0x06: // PES Private + case 0x81: // user private + /* PES private can contain AC-3, DTS or lots of other stuff. + check descriptors to get the exact type. */ + for (DescriptorConstIterator desc = (*es)->getDescriptors()->begin(); + desc != (*es)->getDescriptors()->end(); ++desc) + { + uint8_t tag = (*desc)->getTag(); + if (!isaudio && !isvideo) + { + switch (tag) + { + case DTS_DESCRIPTOR: + case AAC_DESCRIPTOR: + case AC3_DESCRIPTOR: + isaudio = 1; + break; + case REGISTRATION_DESCRIPTOR: /* some services don't have a separate AC3 descriptor */ + { + /* libdvbsi++ doesn't yet support this descriptor type, so work around. */ + if ((*desc)->getLength() != 4) + break; + unsigned char descr[6]; + (*desc)->writeToBuffer(descr); + int format_identifier = (descr[2] << 24) | (descr[3] << 16) | (descr[4] << 8) | (descr[5]); + switch (format_identifier) + { + case 0x41432d33: + isaudio = 1; + default: + break; + } + break; + } + } + } + if (tag == CA_DESCRIPTOR) + is_scrambled = 1; + } + break; + } + if (isaudio) + have_audio = true; + else if (isvideo) + have_video = true; + else + continue; + if (is_scrambled) + scrambled = true; + } + for (DescriptorConstIterator desc = pmt.getDescriptors()->begin(); + desc != pmt.getDescriptors()->end(); ++desc) + { + if ((*desc)->getTag() == CA_DESCRIPTOR) + scrambled = true; + } + } + m_pmt_in_progress->second.scrambled = scrambled; + if ( have_video ) + m_pmt_in_progress->second.serviceType = 1; + else if ( have_audio ) + m_pmt_in_progress->second.serviceType = 2; + else + m_pmt_in_progress->second.serviceType = 100; + } + if (err == -1) // aborted in sdt progress or pmt timout.. + m_pmts_to_read.erase(m_pmt_in_progress++); + else if (m_pmt_running) + ++m_pmt_in_progress; + else + { + m_pmt_in_progress = m_pmts_to_read.begin(); + m_pmt_running = true; + } + + if (m_pmt_in_progress != m_pmts_to_read.end()) + m_PMT->start(m_demux, eDVBPMTSpec(m_pmt_in_progress->second.pmtPid, m_pmt_in_progress->first)); + else + { + m_pmt_running = false; + channelDone(); + } +} + + void eDVBScan::addKnownGoodChannel(const eDVBChannelID &chid, iDVBFrontendParameters *feparm) { /* add it to the list of known channels. */ @@ -250,34 +387,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); + SCAN_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); + SCAN_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); + SCAN_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 + SCAN_eDebug("update"); + } + else + { + SCAN_eDebug("remove dupe"); + m_ch_toScan.erase(i++); + continue; + } + ++found_count; + } + ++i; + } + + if (found_count > 0) + { + SCAN_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)) + { + SCAN_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)) + { + SCAN_eDebug("scanned but not available"); return; + } /* ... on the current channel */ if (sameChannel(m_ch_current, feparm)) + { + SCAN_eDebug("is current"); return; + } + SCAN_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; @@ -286,13 +488,19 @@ int eDVBScan::sameChannel(iDVBFrontendParameters *ch1, iDVBFrontendParameters *c void eDVBScan::channelDone() { - if (m_ready & validSDT) + if (m_ready & validSDT && (!(m_flags & scanOnlyFree) || !m_pmt_running)) { unsigned long hash = 0; // m_ch_current is not set, when eDVBScan is just used for a SDT update if (!m_ch_current) + { + unsigned int channelFlags; m_channel->getCurrentFrontendParameters(m_ch_current); + m_ch_current->getFlags(channelFlags); + if (channelFlags & iDVBFrontendParameters::flagOnlyFree) + m_flags |= scanOnlyFree; + } m_ch_current->getHash(hash); @@ -310,7 +518,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 +548,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 +567,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 +586,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 +596,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 ) + { + SCAN_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,14 +628,38 @@ 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; } - - if ((m_ready & m_ready_all) != m_ready_all) + + if (m_pmt_running || (m_ready & m_ready_all) != m_ready_all) + { + if (m_abort_current_pmt) + { + m_abort_current_pmt = false; + PMTready(-1); + } return; + } + SCAN_eDebug("channel done!"); /* if we had services on this channel, we declare @@ -426,12 +683,123 @@ void eDVBScan::channelDone() here, and not before. */ + for (m_pmt_in_progress = m_pmts_to_read.begin(); m_pmt_in_progress != m_pmts_to_read.end();) + { + int type; + eServiceReferenceDVB ref; + ePtr service = new eDVBService; + + if (!m_chid_current) + { + unsigned long hash = 0; + + // m_ch_current is not set, when eDVBScan is just used for a SDT update + if (!m_ch_current) + { + unsigned int channelFlags; + m_channel->getCurrentFrontendParameters(m_ch_current); + m_ch_current->getFlags(channelFlags); + if (channelFlags & iDVBFrontendParameters::flagOnlyFree) + m_flags |= scanOnlyFree; + } + + m_ch_current->getHash(hash); + + m_chid_current = eDVBChannelID( + buildNamespace(eOriginalNetworkID(0), m_pat_tsid, hash), + m_pat_tsid, eOriginalNetworkID(0)); + } + + if (m_pmt_in_progress->second.serviceType == 1) + SCAN_eDebug("SID %04x is VIDEO", m_pmt_in_progress->first); + else if (m_pmt_in_progress->second.serviceType == 2) + SCAN_eDebug("SID %04x is AUDIO", m_pmt_in_progress->first); + else + SCAN_eDebug("SID %04x is DATA", m_pmt_in_progress->first); + + ref.set(m_chid_current); + ref.setServiceID(m_pmt_in_progress->first); + ref.setServiceType(m_pmt_in_progress->second.serviceType); + + if (!m_ch_current->getSystem(type)) + { + char sname[255]; + char pname[255]; + memset(pname, 0, sizeof(pname)); + memset(sname, 0, sizeof(sname)); + switch(type) + { + case iDVBFrontend::feSatellite: + { + eDVBFrontendParametersSatellite parm; + m_ch_current->getDVBS(parm); + snprintf(sname, 255, "%d%c SID 0x%02x", + parm.frequency/1000, + parm.polarisation ? 'V' : 'H', + m_pmt_in_progress->first); + snprintf(pname, 255, "%s %s %d%c %d.%d°%c", + parm.system ? "DVB-S2" : "DVB-S", + parm.modulation == 1 ? "QPSK" : "8PSK", + parm.frequency/1000, + parm.polarisation ? 'V' : 'H', + parm.orbital_position/10, + parm.orbital_position%10, + parm.orbital_position > 0 ? 'E' : 'W'); + break; + } + case iDVBFrontend::feTerrestrial: + { + eDVBFrontendParametersTerrestrial parm; + m_ch_current->getDVBT(parm); + snprintf(sname, 255, "%d SID 0x%02x", + parm.frequency/1000, + m_pmt_in_progress->first); + break; + } + case iDVBFrontend::feCable: + { + eDVBFrontendParametersCable parm; + m_ch_current->getDVBC(parm); + snprintf(sname, 255, "%d SID 0x%02x", + parm.frequency/1000, + m_pmt_in_progress->first); + break; + } + } + SCAN_eDebug("name '%s', provider_name '%s'", sname, pname); + service->m_service_name = convertDVBUTF8(sname); + service->genSortName(); + service->m_provider_name = pname; + } + + std::pair >::iterator, bool> i = m_new_services.insert(std::pair >(ref, service)); + + if (i.second) + { + m_last_service = i.first; + m_event(evtNewService); + } + m_pmts_to_read.erase(m_pmt_in_progress++); + } + 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)) + { + SCAN_eDebug("remove dupe 2"); + m_ch_toScan.erase(i++); + continue; + } + ++i; + } + nextChannel(); } @@ -450,7 +818,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; @@ -474,52 +842,62 @@ void eDVBScan::insertInto(iDVBChannelList *db, bool dontRemoveOldFlags) std::list >::iterator it(m_ch_scanned.begin()); for (;it != m_ch_scanned.end(); ++it) { - int system; - (*it)->getSystem(system); - switch(system) + if (m_flags & scanDontRemoveUnscanned) + db->removeServices(&(*(*it))); + else { - case iDVBFrontend::feSatellite: - { - eDVBFrontendParametersSatellite sat_parm; - (*it)->getDVBS(sat_parm); - scanned_sat_positions.insert(sat_parm.orbital_position); - break; - } - case iDVBFrontend::feTerrestrial: - { - clearTerrestrial=true; - break; - } - case iDVBFrontend::feCable: + int system; + (*it)->getSystem(system); + switch(system) { - clearCable=true; - break; + case iDVBFrontend::feSatellite: + { + eDVBFrontendParametersSatellite sat_parm; + (*it)->getDVBS(sat_parm); + scanned_sat_positions.insert(sat_parm.orbital_position); + break; + } + case iDVBFrontend::feTerrestrial: + { + clearTerrestrial=true; + break; + } + case iDVBFrontend::feCable: + { + clearCable=true; + break; + } } } } for (it=m_ch_unavailable.begin();it != m_ch_unavailable.end(); ++it) { - int system; - (*it)->getSystem(system); - switch(system) + if (m_flags & scanDontRemoveUnscanned) + db->removeServices(&(*(*it))); + else { - case iDVBFrontend::feSatellite: + int system; + (*it)->getSystem(system); + switch(system) { - eDVBFrontendParametersSatellite sat_parm; - (*it)->getDVBS(sat_parm); - scanned_sat_positions.insert(sat_parm.orbital_position); - break; - } - case iDVBFrontend::feTerrestrial: - { - clearTerrestrial=true; - break; - } - case iDVBFrontend::feCable: - { - clearCable=true; - break; + case iDVBFrontend::feSatellite: + { + eDVBFrontendParametersSatellite sat_parm; + (*it)->getDVBS(sat_parm); + scanned_sat_positions.insert(sat_parm.orbital_position); + break; + } + case iDVBFrontend::feTerrestrial: + { + clearTerrestrial=true; + break; + } + case iDVBFrontend::feCable: + { + clearCable=true; + break; + } } } } @@ -548,7 +926,15 @@ void eDVBScan::insertInto(iDVBChannelList *db, bool dontRemoveOldFlags) for (std::map >::const_iterator ch(m_new_channels.begin()); ch != m_new_channels.end(); ++ch) + { + if (m_flags & scanOnlyFree) + { + eDVBFrontendParameters *ptr = (eDVBFrontendParameters*)&(*ch->second); + ptr->setFlags(iDVBFrontendParameters::flagOnlyFree); + } db->addChannelToList(ch->first, ch->second); + } + for (std::map >::const_iterator service(m_new_services.begin()); service != m_new_services.end(); ++service) { @@ -571,7 +957,8 @@ void eDVBScan::insertInto(iDVBChannelList *db, bool dontRemoveOldFlags) else { db->addService(service->first, service->second); - service->second->m_flags |= eDVBService::dxNewFound; + if (!(m_flags & scanRemoveServices)) + service->second->m_flags |= eDVBService::dxNewFound; } } } @@ -587,61 +974,83 @@ RESULT eDVBScan::processSDT(eDVBNamespace dvbnamespace, const ServiceDescription for (ServiceDescriptionConstIterator s(services.begin()); s != services.end(); ++s) { - SCAN_eDebugNoNewLine("SID %04x: ", (*s)->getServiceId()); + unsigned short service_id = (*s)->getServiceId(); + SCAN_eDebugNoNewLine("SID %04x: ", service_id); + bool add = true; - eServiceReferenceDVB ref; - ePtr service = new eDVBService; - - ref.set(chid); - ref.setServiceID((*s)->getServiceId()); - - for (DescriptorConstIterator desc = (*s)->getDescriptors()->begin(); - desc != (*s)->getDescriptors()->end(); ++desc) - if ((*desc)->getTag() == SERVICE_DESCRIPTOR) - ref.setServiceType(((ServiceDescriptor&)**desc).getServiceType()); - - for (DescriptorConstIterator desc = (*s)->getDescriptors()->begin(); - desc != (*s)->getDescriptors()->end(); ++desc) + if (m_flags & scanOnlyFree) { - switch ((*desc)->getTag()) + std::map::iterator it = + m_pmts_to_read.find(service_id); + if (it != m_pmts_to_read.end()) { - case SERVICE_DESCRIPTOR: - { - ServiceDescriptor &d = (ServiceDescriptor&)**desc; - 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; + if (it->second.scrambled) + { + SCAN_eDebug("is scrambled!"); + add = false; + } } - case CA_IDENTIFIER_DESCRIPTOR: + else + SCAN_eDebug("not found in PAT.. so we assume it is scrambled!!"); + } + + if (add) + { + eServiceReferenceDVB ref; + ePtr service = new eDVBService; + + ref.set(chid); + ref.setServiceID(service_id); + + for (DescriptorConstIterator desc = (*s)->getDescriptors()->begin(); + desc != (*s)->getDescriptors()->end(); ++desc) { - CaIdentifierDescriptor &d = (CaIdentifierDescriptor&)**desc; - const CaSystemIdList &caids = *d.getCaSystemIds(); - SCAN_eDebugNoNewLine("CA "); - for (CaSystemIdList::const_iterator i(caids.begin()); i != caids.end(); ++i) + switch ((*desc)->getTag()) + { + case SERVICE_DESCRIPTOR: + { + ServiceDescriptor &d = (ServiceDescriptor&)**desc; + ref.setServiceType(d.getServiceType()); + 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: { - SCAN_eDebugNoNewLine("%04x ", *i); - service->m_ca.push_front(*i); + CaIdentifierDescriptor &d = (CaIdentifierDescriptor&)**desc; + const CaSystemIdList &caids = *d.getCaSystemIds(); + SCAN_eDebugNoNewLine("CA "); + for (CaSystemIdList::const_iterator i(caids.begin()); i != caids.end(); ++i) + { + SCAN_eDebugNoNewLine("%04x ", *i); + service->m_ca.push_front(*i); + } + SCAN_eDebug(""); + break; + } + default: + SCAN_eDebug("descr<%x>", (*desc)->getTag()); + break; } - SCAN_eDebug(""); - break; } - default: - SCAN_eDebug("descr<%x>", (*desc)->getTag()); - break; + + std::pair >::iterator, bool> i = m_new_services.insert(std::pair >(ref, service)); + + if (i.second) + { + m_last_service = i.first; + m_event(evtNewService); } } - - std::pair >::iterator, bool> i = m_new_services.insert(std::pair >(ref, service)); - - if (i.second) - { - m_last_service = i.first; - m_event(evtNewService); - } + if (m_pmt_running && m_pmt_in_progress->first == service_id) + m_abort_current_pmt = true; + else + m_pmts_to_read.erase(service_id); } + return 0; } @@ -665,3 +1074,22 @@ void eDVBScan::getLastServiceName(std::string &last_service_name) else last_service_name = m_last_service->second->m_service_name; } + +RESULT eDVBScan::getFrontend(ePtr &fe) +{ + if (m_channel) + return m_channel->getFrontend(fe); + fe = 0; + return -1; +} + +RESULT eDVBScan::getCurrentTransponder(ePtr &tp) +{ + if (m_ch_current) + { + tp = m_ch_current; + return 0; + } + tp = 0; + return -1; +}