X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/0e321af7afb77c88d4d880d66ea657d1e4e1e67e..c5bb99fa2019da12a8fbaa1766189af520b9e79a:/lib/dvb/scan.cpp diff --git a/lib/dvb/scan.cpp b/lib/dvb/scan.cpp index fb8e5442..0948c503 100644 --- a/lib/dvb/scan.cpp +++ b/lib/dvb/scan.cpp @@ -13,18 +13,17 @@ #include #include -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 SCAN_eDebug(x...) do { if (m_scan_debug) eDebug(x); } while(0) +#define SCAN_eDebugNoNewLine(x...) do { if (m_scan_debug) eDebugNoNewLine(x); } while(0) 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_pmt_running(false), m_abort_current_pmt(false), m_flags(0), m_usePAT(usePAT) + ,m_pmt_running(false), m_abort_current_pmt(false), m_flags(0) + ,m_usePAT(usePAT), m_scan_debug(debug) { - 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); @@ -41,10 +40,14 @@ int eDVBScan::isValidONIDTSID(int orbital_position, eOriginalNetworkID onid, eTr case 0: case 0x1111: return 0; + case 0x13E: // workaround for 11258H and 11470V on hotbird with same ONID/TSID (0x13E/0x578) + return orbital_position != 130 || tsid != 0x578; case 1: return orbital_position == 192; case 0x00B1: return tsid != 0x00B0; + case 0x00eb: + return tsid != 0x4321; case 0x0002: return abs(orbital_position-282) < 6; default: @@ -136,23 +139,33 @@ RESULT eDVBScan::nextChannel() RESULT eDVBScan::startFilter() { bool startSDT=true; - assert(m_demux); + ASSERT(m_demux); /* only start required filters filter */ if (m_ready_all & readyPAT) startSDT = m_ready & readyPAT; + // 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_SDT = 0; if (startSDT && (m_ready_all & readySDT)) { - m_SDT = new eTable(); + m_SDT = new eTable(m_scan_debug); 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()); + ASSERT(i != m_PAT->getSections().end()); tsid = (*i)->getTableIdExtension(); // in PAT this is the transport stream id m_pat_tsid = eTransportStreamID(tsid); for (; i != m_PAT->getSections().end(); ++i) @@ -162,11 +175,11 @@ RESULT eDVBScan::startFilter() for (; program != pat.getPrograms()->end(); ++program) m_pmts_to_read.insert(std::pair((*program)->getProgramNumber(), service((*program)->getProgramMapPid()))); } - m_PMT = new eTable(); + m_PMT = new eTable(m_scan_debug); 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); @@ -195,8 +208,8 @@ RESULT eDVBScan::startFilter() m_PAT = 0; if (m_ready_all & readyPAT) { - m_PAT = new eTable(); - if (m_PAT->start(m_demux, eDVBPATSpec())) + m_PAT = new eTable(m_scan_debug); + if (m_PAT->start(m_demux, eDVBPATSpec(4000))) return -1; CONNECT(m_PAT->tableReady, eDVBScan::PATready); } @@ -204,7 +217,7 @@ RESULT eDVBScan::startFilter() m_NIT = 0; if (m_ready_all & readyNIT) { - m_NIT = new eTable(); + m_NIT = new eTable(m_scan_debug); if (m_NIT->start(m_demux, eDVBNITSpec())) return -1; CONNECT(m_NIT->tableReady, eDVBScan::NITready); @@ -213,13 +226,12 @@ RESULT eDVBScan::startFilter() m_BAT = 0; if (m_ready_all & readyBAT) { - m_BAT = new eTable(); + m_BAT = new eTable(m_scan_debug); if (m_BAT->start(m_demux, eDVBBATSpec())) return -1; CONNECT(m_BAT->tableReady, eDVBScan::BATready); } } - return 0; } @@ -357,7 +369,7 @@ void eDVBScan::PMTready(int err) else m_pmt_in_progress->second.serviceType = 100; } - if (err == -1) // aborted in sdt progress or pmt timout.. + if (err == -1) // timeout or removed by sdt m_pmts_to_read.erase(m_pmt_in_progress++); else if (m_pmt_running) ++m_pmt_in_progress; @@ -368,9 +380,10 @@ void eDVBScan::PMTready(int err) } 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)); + m_PMT->start(m_demux, eDVBPMTSpec(m_pmt_in_progress->second.pmtPid, m_pmt_in_progress->first, 4000)); else { + m_PMT = 0; m_pmt_running = false; channelDone(); } @@ -492,16 +505,6 @@ void eDVBScan::channelDone() { 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); eDVBNamespace dvbnamespace = buildNamespace( @@ -693,16 +696,6 @@ void eDVBScan::channelDone() { 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( @@ -749,11 +742,20 @@ void eDVBScan::channelDone() } case iDVBFrontend::feTerrestrial: { + ePtr fe; eDVBFrontendParametersTerrestrial parm; m_ch_current->getDVBT(parm); snprintf(sname, 255, "%d SID 0x%02x", parm.frequency/1000, m_pmt_in_progress->first); + if (!m_channel->getFrontend(fe)) + { + ePyObject tp_dict = PyDict_New(); + fe->getTransponderData(tp_dict, false); + m_corrected_frequencys[m_chid_current] = + PyInt_AsLong(PyDict_GetItemString(tp_dict, "frequency")); + Py_DECREF(tp_dict); + } break; } case iDVBFrontend::feCable: @@ -769,16 +771,21 @@ void eDVBScan::channelDone() SCAN_eDebug("name '%s', provider_name '%s'", sname, pname); service->m_service_name = convertDVBUTF8(sname); service->genSortName(); - service->m_provider_name = pname; + service->m_provider_name = convertDVBUTF8(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); + if (!(m_flags & scanOnlyFree) || !m_pmt_in_progress->second.scrambled) { + SCAN_eDebug("add not scrambled!"); + std::pair >::iterator, bool> i = + m_new_services.insert(std::pair >(ref, service)); + if (i.second) + { + m_last_service = i.first; + m_event(evtNewService); + } } + else + SCAN_eDebug("dont add... is scrambled!"); m_pmts_to_read.erase(m_pmt_in_progress++); } @@ -927,6 +934,24 @@ void eDVBScan::insertInto(iDVBChannelList *db, bool dontRemoveOldFlags) for (std::map >::const_iterator ch(m_new_channels.begin()); ch != m_new_channels.end(); ++ch) { + int system; + ch->second->getSystem(system); + if (system == iDVBFrontend::feTerrestrial) + { + std::map::iterator it = m_corrected_frequencys.find(ch->first); + if (it != m_corrected_frequencys.end()) + { + eDVBFrontendParameters *p = (eDVBFrontendParameters*)&(*ch->second); + eDVBFrontendParametersTerrestrial parm; + p->getDVBT(parm); + eDebug("corrected freq for tsid %04x, onid %04x, ns %08x is %d, old was %d", + ch->first.transport_stream_id.get(), ch->first.original_network_id.get(), + ch->first.dvbnamespace.get(), it->second, parm.frequency); + parm.frequency = it->second; + p->setDVBT(parm); + m_corrected_frequencys.erase(it); + } + } if (m_flags & scanOnlyFree) { eDVBFrontendParameters *ptr = (eDVBFrontendParameters*)&(*ch->second); @@ -989,9 +1014,13 @@ RESULT eDVBScan::processSDT(eDVBNamespace dvbnamespace, const ServiceDescription SCAN_eDebug("is scrambled!"); add = false; } + else + SCAN_eDebug("is free"); } - else + else { SCAN_eDebug("not found in PAT.. so we assume it is scrambled!!"); + add = false; + } } if (add) @@ -1037,7 +1066,8 @@ RESULT eDVBScan::processSDT(eDVBNamespace dvbnamespace, const ServiceDescription } } - std::pair >::iterator, bool> i = m_new_services.insert(std::pair >(ref, service)); + std::pair >::iterator, bool> i = + m_new_services.insert(std::pair >(ref, service)); if (i.second) {