{
ePtr<iDVBFrontend> fe;
- m_SDT = 0; m_BAT = 0; m_NIT = 0;
+ m_SDT = 0; m_PAT = 0; m_BAT = 0; m_NIT = 0;
m_ready = 0;
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;
}
if (startSDT && (m_ready_all & readySDT))
{
m_SDT = new eTable<ServiceDescriptionSection>();
+ int tsid=-1;
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;
+ tsid = (*i)->getTableIdExtension(); // in PAT this is the transport stream id
+
+ // 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;
+ }
+ }
}
- else if (m_SDT->start(m_demux, eDVBSDTSpec()))
+ if (tsid == -1 && m_SDT->start(m_demux, eDVBSDTSpec()))
+ return -1;
+ else if (m_SDT->start(m_demux, eDVBSDTSpec(tsid, true)))
return -1;
CONNECT(m_SDT->tableReady, eDVBScan::SDTready);
}
{
/* 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> >::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))
{
- *i = feparm; // update
- 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, 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 :)
}
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.
*/
-
+
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<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;
else
{
db->addService(service->first, service->second);
- service->second->m_flags |= eDVBService::dxNewFound;
+ if (!(m_flags & scanRemoveServices))
+ service->second->m_flags |= eDVBService::dxNewFound;
}
}
}
else
last_service_name = m_last_service->second->m_service_name;
}
+
+RESULT eDVBScan::getFrontend(ePtr<iDVBFrontend> &fe)
+{
+ if (m_channel)
+ return m_channel->getFrontend(fe);
+ fe = 0;
+ return -1;
+}
+
+RESULT eDVBScan::getCurrentTransponder(ePtr<iDVBFrontendParameters> &tp)
+{
+ if (m_ch_current)
+ {
+ tp = m_ch_current;
+ return 0;
+ }
+ tp = 0;
+ return -1;
+}
git.cweiske.de / enigma2.git / blobdiff