#include <lib/dvb/idvb.h>
-#include <lib/dvb_si/sdt.h>
-#include <lib/dvb_si/nit.h>
-#include <lib/dvb_si/bat.h>
-#include <lib/dvb_si/descriptor_tag.h>
-#include <lib/dvb_si/service_descriptor.h>
-#include <lib/dvb_si/satellite_delivery_system_descriptor.h>
-#include <lib/dvb_si/ca_identifier_descriptor.h>
+#include <dvbsi++/service_description_section.h>
+#include <dvbsi++/network_information_section.h>
+#include <dvbsi++/bouquet_association_section.h>
+#include <dvbsi++/descriptor_tag.h>
+#include <dvbsi++/service_descriptor.h>
+#include <dvbsi++/satellite_delivery_system_descriptor.h>
+#include <dvbsi++/ca_identifier_descriptor.h>
#include <lib/dvb/specs.h>
#include <lib/dvb/esection.h>
#include <lib/dvb/scan.h>
#include <lib/dvb/frontend.h>
#include <lib/base/eerror.h>
+#include <lib/base/estring.h>
#include <errno.h>
+#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);
}
{
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()
}
m_ch_current = m_ch_toScan.front();
+ m_chid_current = eDVBChannelID();
+
m_ch_toScan.pop_front();
if (m_channel->getFrontend(fe))
+ {
+ m_event(evtFail);
return -ENOTSUP;
+ }
m_channel_state = iDVBChannel::state_idle;
if (fe->tune(*m_ch_current))
+ {
+ return nextChannel();
+ m_event(evtFail);
return -EINVAL;
+ }
m_event(evtUpdate);
return 0;
{
assert(m_demux);
- m_SDT = new eTable<ServiceDescriptionTable>();
+ m_SDT = new eTable<ServiceDescriptionSection>();
if (m_SDT->start(m_demux, eDVBSDTSpec()))
return -1;
CONNECT(m_SDT->tableReady, eDVBScan::SDTready);
m_NIT = 0;
- m_NIT = new eTable<NetworkInformationTable>();
+ m_NIT = new eTable<NetworkInformationSection>();
if (m_NIT->start(m_demux, eDVBNITSpec()))
return -1;
CONNECT(m_NIT->tableReady, eDVBScan::NITready);
- m_BAT = new eTable<BouquetAssociationTable>();
+ m_BAT = new eTable<BouquetAssociationSection>();
if (m_BAT->start(m_demux, eDVBBATSpec()))
return -1;
CONNECT(m_BAT->tableReady, eDVBScan::BATready);
void eDVBScan::SDTready(int err)
{
- eDebug("got sdt");
+ SCAN_eDebug("got sdt");
m_ready |= readySDT;
if (!err)
m_ready |= validSDT;
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;
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<eDVBChannelID,ePtr<iDVBFrontendParameters> >(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 */
(**m_SDT->getSections().begin()).getTransportStreamId(),
hash);
- eDebug("SDT: ");
- ServiceDescriptionTableConstIterator i;
+ SCAN_eDebug("SDT: ");
+ std::vector<ServiceDescriptionSection*>::const_iterator i;
for (i = m_SDT->getSections().begin(); i != m_SDT->getSections().end(); ++i)
processSDT(dvbnamespace, **i);
m_ready &= ~validSDT;
if (m_ready & validNIT)
{
- eDebug("dumping NIT");
- NetworkInformationTableConstIterator i;
+ SCAN_eDebug("dumping NIT");
+ std::vector<NetworkInformationSection*>::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();
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,
eDVBNamespace ns = buildNamespace(onid, tsid, hash);
- addChannel(
+ addChannelToScan(
eDVBChannelID(ns, tsid, onid),
feparm);
break;
}
default:
- eDebug("descr<%x>", (*desc)->getTag());
+ SCAN_eDebug("descr<%x>", (*desc)->getTag());
break;
}
}
if ((m_ready & readyAll) != readyAll)
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();
}
nextChannel();
}
-void eDVBScan::insertInto(eDVBDB *db)
+void eDVBScan::insertInto(iDVBChannelList *db)
{
for (std::map<eDVBChannelID, ePtr<iDVBFrontendParameters> >::const_iterator
ch(m_new_channels.begin()); ch != m_new_channels.end(); ++ch)
}
}
-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<eDVBService> service = new eDVBService;
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->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;
}
}
RESULT eDVBScan::connectEvent(const Slot1<void,int> &event, ePtr<eConnection> &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();
+}
git.cweiske.de / enigma2.git / blobdiff