#include <lib/dvb/idvb.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 <lib/base/eerror.h>
#include <lib/base/estring.h>
#include <errno.h>
-#include <set>
-#define SCAN_eDebug(x...) eDebug(x)
-#define SCAN_eDebugNoNewLine(x...) eDebugNoNewLine(x)
+static bool scan_debug;
+#define SCAN_eDebug(x...) do { if (scan_debug) eDebug(x); } while(0)
+#define SCAN_eDebugNoNewLine(x...) do { if (scan_debug) eDebugNoNewLine(x); } while(0)
DEFINE_REF(eDVBScan);
-eDVBScan::eDVBScan(iDVBChannel *channel): m_channel(channel)
+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_ready = m_flags = 0;
- m_ready_all = readySDT;
- m_channel_state = iDVBChannel::state_idle;
-
+ scan_debug=debug;
if (m_channel->getDemux(m_demux))
SCAN_eDebug("scan: failed to allocate demux!");
m_channel->connectStateChange(slot(*this, &eDVBScan::stateChange), m_stateChanged_connection);
m_SDT = 0; m_BAT = 0; m_NIT = 0;
m_ready = 0;
-
+
/* check what we need */
m_ready_all = readySDT;
if (m_flags & scanSearchBAT)
m_ready_all |= readyBAT;
-
+
+ if (m_usePAT)
+ m_ready_all |= readyPAT;
+
if (m_ch_toScan.empty())
{
SCAN_eDebug("no channels left to scan.");
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))
RESULT eDVBScan::startFilter()
{
+ bool startSDT=true;
assert(m_demux);
-
+
/* only start required filters filter */
-
- m_SDT = 0;
- if (m_ready_all & readySDT)
+ if (m_ready_all & readyPAT)
+ startSDT = m_ready & readyPAT;
+
+ m_SDT = 0;
+ if (startSDT && (m_ready_all & readySDT))
{
m_SDT = new eTable<ServiceDescriptionSection>();
- if (m_SDT->start(m_demux, eDVBSDTSpec()))
+ if (m_ready & readyPAT && m_ready & validPAT)
+ {
+ std::vector<ProgramAssociationSection*>::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)))
+ return -1;
+ }
+ else if (m_SDT->start(m_demux, eDVBSDTSpec()))
return -1;
CONNECT(m_SDT->tableReady, eDVBScan::SDTready);
}
- m_NIT = 0;
- if (m_ready_all & readyNIT)
+ if (!(m_ready & readyPAT))
{
- m_NIT = new eTable<NetworkInformationSection>();
- if (m_NIT->start(m_demux, eDVBNITSpec()))
- return -1;
- CONNECT(m_NIT->tableReady, eDVBScan::NITready);
- }
+ m_PAT = 0;
+ if (m_ready_all & readyPAT)
+ {
+ m_PAT = new eTable<ProgramAssociationSection>();
+ if (m_PAT->start(m_demux, eDVBPATSpec()))
+ return -1;
+ CONNECT(m_PAT->tableReady, eDVBScan::PATready);
+ }
- m_BAT = 0;
- if (m_ready_all & readyBAT)
- {
- m_BAT = new eTable<BouquetAssociationSection>();
- if (m_BAT->start(m_demux, eDVBBATSpec()))
- return -1;
- CONNECT(m_BAT->tableReady, eDVBScan::BATready);
+ m_NIT = 0;
+ if (m_ready_all & readyNIT)
+ {
+ m_NIT = new eTable<NetworkInformationSection>();
+ 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<BouquetAssociationSection>();
+ if (m_BAT->start(m_demux, eDVBBATSpec()))
+ return -1;
+ CONNECT(m_BAT->tableReady, eDVBScan::BATready);
+ }
}
-
+
return 0;
}
channelDone();
}
+void eDVBScan::PATready(int err)
+{
+ SCAN_eDebug("got pat");
+ m_ready |= readyPAT;
+ if (!err)
+ m_ready |= validPAT;
+ startFilter(); // for starting the SDT filter
+}
+
void eDVBScan::addKnownGoodChannel(const eDVBChannelID &chid, iDVBFrontendParameters *feparm)
{
/* add it to the list of known channels. */
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<ePtr<iDVBFrontendParameters> >::const_iterator i(m_ch_toScan.begin()); i != m_ch_toScan.end(); ++i)
+ for (std::list<ePtr<iDVBFrontendParameters> >::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<ePtr<iDVBFrontendParameters> >::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<ePtr<iDVBFrontendParameters> >::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;
{
unsigned long hash = 0;
- ePtr<iDVBFrontendParameters> p = m_ch_current;
-
- if (!p) // used in sdt scan
- m_channel->getCurrentFrontendParameters(p);
-
- p->getHash(hash);
+ // m_ch_current is not set, when eDVBScan is just used for a SDT update
+ if (!m_ch_current)
+ m_channel->getCurrentFrontendParameters(m_ch_current);
+ m_ch_current->getHash(hash);
+
eDVBNamespace dvbnamespace = buildNamespace(
(**m_SDT->getSections().begin()).getOriginalNetworkId(),
(**m_SDT->getSections().begin()).getTransportStreamId(),
if (m_ready & validNIT)
{
+ int system;
+ std::list<ePtr<iDVBFrontendParameters> > 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<NetworkInformationSection*>::const_iterator i;
for (i = m_NIT->getSections().begin(); i != m_NIT->getSections().end(); ++i)
{
{
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<eDVBFrontendParameters> feparm = new eDVBFrontendParameters;
eDVBFrontendParametersCable cable;
}
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<eDVBFrontendParameters> feparm = new eDVBFrontendParameters;
eDVBFrontendParametersTerrestrial terr;
}
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;
ePtr<eDVBFrontendParameters> 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;
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;
}
These are the reasons for adding the transponder
here, and not before.
*/
-
- ePtr<iDVBFrontendParameters> p = m_ch_current;
- if (!p)
- m_channel->getCurrentFrontendParameters(p);
-
+
if (!m_chid_current)
eWarning("SCAN: the current channel's ID was not corrected - not adding channel.");
else
- addKnownGoodChannel(m_chid_current, p);
-
- m_ch_scanned.push_back(p);
+ addKnownGoodChannel(m_chid_current, m_ch_current);
+
+ m_ch_scanned.push_back(m_ch_current);
+
+ for (std::list<ePtr<iDVBFrontendParameters> >::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();
}
bool exist=false;
for (std::list<ePtr<iDVBFrontendParameters> >::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;
dvb_service->m_service_name_sort = service->second->m_service_name_sort;
}
dvb_service->m_provider_name = service->second->m_provider_name;
-
+ if (service->second->m_ca.size())
+ dvb_service->m_ca = service->second->m_ca;
if (!dontRemoveOldFlags) // do not remove new found flags when not wished
dvb_service->m_flags &= ~eDVBService::dxNewFound;
}
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;
-
+ /* save correct CHID for this channel */
+ m_chid_current = chid;
+
for (ServiceDescriptionConstIterator s(services.begin()); s != services.end(); ++s)
{
SCAN_eDebugNoNewLine("SID %04x: ", (*s)->getServiceId());
for (CaSystemIdList::const_iterator i(caids.begin()); i != caids.end(); ++i)
{
SCAN_eDebugNoNewLine("%04x ", *i);
- service->m_ca.insert(*i);
+ service->m_ca.push_front(*i);
}
SCAN_eDebug("");
break;
git.cweiske.de / enigma2.git / blobdiff