X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/c5245596a287e0519d0684eb10ea111da75b9360..056f4ed60ae323f41601b8acdc42794902eac0d1:/lib/dvb/pmt.cpp diff --git a/lib/dvb/pmt.cpp b/lib/dvb/pmt.cpp index 4ce35394..74042ed0 100644 --- a/lib/dvb/pmt.cpp +++ b/lib/dvb/pmt.cpp @@ -5,6 +5,8 @@ #include #include #include +#include +#include #include #include #include @@ -12,9 +14,10 @@ #include eDVBServicePMTHandler::eDVBServicePMTHandler() - :m_ca_servicePtr(0), m_decode_demux_num(0xFF) + :m_ca_servicePtr(0), m_dvb_scan(0), m_decode_demux_num(0xFF) { m_use_decode_demux = 0; + m_pmt_pid = -1; eDVBResourceManager::getInstance(m_resourceManager); CONNECT(m_PMT.tableReady, eDVBServicePMTHandler::PMTready); CONNECT(m_PAT.tableReady, eDVBServicePMTHandler::PATready); @@ -35,7 +38,7 @@ void eDVBServicePMTHandler::channelStateChanged(iDVBChannel *channel) { if (m_channel) if (m_channel->getDemux(m_demux, (!m_use_decode_demux) ? 0 : iDVBChannel::capDecode)) - eDebug("Allocating a demux for now tuned-in channel failed."); + eDebug("Allocating %s-decoding a demux for now tuned-in channel failed.", m_use_decode_demux ? "" : "non-"); serviceEvent(eventTuned); @@ -43,7 +46,10 @@ void eDVBServicePMTHandler::channelStateChanged(iDVBChannel *channel) { eDebug("ok ... now we start!!"); - m_PAT.begin(eApp, eDVBPATSpec(), m_demux); + if (m_pmt_pid == -1) + m_PAT.begin(eApp, eDVBPATSpec(), m_demux); + else + m_PMT.begin(eApp, eDVBPMTSpec(m_pmt_pid, m_reference.getServiceID().get()), m_demux); if ( m_service && !m_service->cacheEmpty() ) serviceEvent(eventNewProgramInfo); @@ -123,89 +129,81 @@ void eDVBServicePMTHandler::PATready(int) pmtpid = (*program)->getProgramMapPid(); } if (pmtpid == -1) + serviceEvent(eventNoPATEntry); + else + m_PMT.begin(eApp, eDVBPMTSpec(pmtpid, m_reference.getServiceID().get()), m_demux); + } else + serviceEvent(eventNoPAT); +} + +PyObject *eDVBServicePMTHandler::getCaIds() +{ + PyObject *ret=0; + + ePtr > ptr; + + if ( ((m_service && m_service->usePMT()) || !m_service) && !m_PMT.getCurrent(ptr)) + { + uint16_t caids[255]; + memset(caids, 0, sizeof(caids)); + std::vector::const_iterator i = ptr->getSections().begin(); + for (; i != ptr->getSections().end(); ++i) { - if ( m_reference.path.find(".ts") != std::string::npos ) // recorded ts + const ProgramMapSection &pmt = **i; + ElementaryStreamInfoConstIterator es = pmt.getEsInfo()->begin(); + for (; es != pmt.getEsInfo()->end(); ++es) { - // we try to find manual the correct sid - int fd = open( m_reference.path.c_str(), O_RDONLY|O_LARGEFILE ); - if ( fd < 0 ) - eDebug("open %s failed"); - else + for (DescriptorConstIterator desc = (*es)->getDescriptors()->begin(); + desc != (*es)->getDescriptors()->end(); ++desc) { - eDebug("parse ts file for find the correct pmtpid"); - unsigned char *buf = new unsigned char[256*1024]; // 256 kbyte - int rd=0; - while ( pmtpid == -1 && (rd < 1024*1024*5) ) + switch ((*desc)->getTag()) { -#define MAX_PIDS 64 - int pids[MAX_PIDS]; - int pididx=-1; - int r = ::read( fd, buf, 256*1024 ); - if ( r <= 0 ) - break; - rd+=r; - int cnt=0; - while(cnt < r) - { - while ( (buf[cnt] != 0x47) && ((cnt+188) < r) && (buf[cnt+188] != 0x47) ) - { -// eDebug("search sync byte %02x %02x, %d %d", buf[cnt], buf[cnt+188], cnt+188, r); - cnt++; - } - if ( buf[cnt] == 0x47 ) - { - int pid = ((buf[cnt+1]&0x3F) << 8) | buf[cnt+2]; - int idx=0; - while(idx <= pididx) // check if we already have this pid - { - if ( pids[idx] == pid ) - break; - ++idx; - } - if (idx > pididx && (pididx+1) < MAX_PIDS) - { - eDebug("found pid %04x", pid); - pids[++pididx]=pid; - } - cnt+=188; - } - else - break; - } - while(pididx > -1 && pmtpid == -1) + case CA_DESCRIPTOR: { - for (i = ptr->getSections().begin(); i != ptr->getSections().end() && pmtpid == -1; ++i) - { - const ProgramAssociationSection &pat = **i; - ProgramAssociationConstIterator program; - for (program = pat.getPrograms()->begin(); program != pat.getPrograms()->end(); ++program) - { - int pid = (*program)->getProgramMapPid(); - if ( pid == pids[pididx]) - { - int sid = (*program)->getProgramNumber(); - pmtpid = pid; - m_reference.setServiceID(eServiceID(sid)); - eDebug("found pmt for service id %04x with pid %04x", sid, pid); - break; - } - } - } - --pididx; + const CaDescriptor *cadescr = (const CaDescriptor*)*desc; + uint16_t caid = cadescr->getCaSystemId(); + int idx=0; + while (caids[idx] && caids[idx] != caid) + ++idx; + caids[idx]=caid; + break; } } - delete [] buf; - close(fd); + } + } + for (DescriptorConstIterator desc = pmt.getDescriptors()->begin(); + desc != pmt.getDescriptors()->end(); ++desc) + { + switch ((*desc)->getTag()) + { + case CA_DESCRIPTOR: + { + const CaDescriptor *cadescr = (const CaDescriptor*)*desc; + uint16_t caid = cadescr->getCaSystemId(); + int idx=0; + while (caids[idx] && caids[idx] != caid) + ++idx; + caids[idx]=caid; + break; + } } } } - - if (pmtpid == -1) - serviceEvent(eventNoPATEntry); - else - m_PMT.begin(eApp, eDVBPMTSpec(pmtpid, m_reference.getServiceID().get()), m_demux); - } else - serviceEvent(eventNoPAT); + int cnt=0; + while (caids[cnt]) + ++cnt; + if (cnt) + { + ret=PyList_New(cnt); + while(cnt--) + PyList_SET_ITEM(ret, cnt, PyInt_FromLong(caids[cnt])); + } + } + + if (!ret) + ret=PyList_New(0); + + return ret; } int eDVBServicePMTHandler::getProgramInfo(struct program &program) @@ -219,7 +217,7 @@ int eDVBServicePMTHandler::getProgramInfo(struct program &program) program.pmtPid = -1; program.textPid = -1; - if (!m_PMT.getCurrent(ptr)) + if ( ((m_service && m_service->usePMT()) || !m_service) && !m_PMT.getCurrent(ptr)) { int cached_apid_ac3 = -1; int cached_apid_mpeg = -1; @@ -424,6 +422,8 @@ int eDVBServicePMTHandler::getDecodeDemux(ePtr &demux) demux = m_demux; return ret; } + + ASSERT(m_channel); /* calling without a previous ::tune is certainly bad. */ ret = m_channel->getDemux(demux, iDVBChannel::capDecode); if (!ret) @@ -441,6 +441,39 @@ int eDVBServicePMTHandler::getPVRChannel(ePtr &pvr_channel) return -1; } +void eDVBServicePMTHandler::SDTScanEvent(int event) +{ + eDebug("scan event %d!", event); + + switch (event) + { + case eDVBScan::evtFinish: + { + ePtr db; + int err; + if ((err = m_resourceManager->getChannelList(db)) != 0) + eDebug("no channel list"); + else + { + m_dvb_scan->insertInto(db); + eDebug("scan done!"); + } + break; + } + + case eDVBScan::evtNewService: + eDebug("scan new service"); + break; + + case eDVBScan::evtFail: + eDebug("scan failed."); + break; + + default: + break; + } +} + int eDVBServicePMTHandler::tune(eServiceReferenceDVB &ref, int use_decode_demux, eCueSheet *cue) { RESULT res; @@ -460,12 +493,24 @@ int eDVBServicePMTHandler::tune(eServiceReferenceDVB &ref, int use_decode_demux, eDVBMetaParser parser; if (parser.parseFile(ref.path)) - eWarning("no .meta file found, trying original service ref."); - else + { + eWarning("no .meta file found, trying to find PMT pid"); + eDVBTSTools tstools; + if (tstools.openFile(ref.path.c_str())) + eWarning("failed to open file"); + else + { + int service_id, pmt_pid; + if (!tstools.findPMT(pmt_pid, service_id)) + { + eDebug("PMT pid found on pid %04x, service id %d", pmt_pid, service_id); + m_reference.setServiceID(service_id); + m_pmt_pid = pmt_pid; + } + } + } else m_reference = parser.m_ref; - -// eDebug("try %s", m_reference.toString().c_str()); - + eDebug("alloc PVR"); /* allocate PVR */ res = m_resourceManager->allocatePVRChannel(m_pvr_channel); @@ -473,7 +518,11 @@ int eDVBServicePMTHandler::tune(eServiceReferenceDVB &ref, int use_decode_demux, eDebug("allocatePVRChannel failed!\n"); m_channel = m_pvr_channel; } - + + ePtr db; + if (!m_resourceManager->getChannelList(db)) + db->getService((eServiceReferenceDVB&)m_reference, m_service); + if (m_channel) { m_channel->connectStateChange( @@ -485,6 +534,13 @@ int eDVBServicePMTHandler::tune(eServiceReferenceDVB &ref, int use_decode_demux, m_channel->connectEvent( slot(*this, &eDVBServicePMTHandler::channelEvent), m_channelEvent_connection); + + if (ref.path.empty()) + { + delete m_dvb_scan; + m_dvb_scan = new eDVBScan(m_channel); + m_dvb_scan->connectEvent(slot(*this, &eDVBServicePMTHandler::SDTScanEvent), m_scan_event_connection); + } } else { serviceEvent(eventTuneFailed); @@ -497,15 +553,15 @@ int eDVBServicePMTHandler::tune(eServiceReferenceDVB &ref, int use_decode_demux, m_pvr_channel->playFile(ref.path.c_str()); } - ePtr db; - if (!m_resourceManager->getChannelList(db)) - db->getService((eServiceReferenceDVB&)m_reference, m_service); - return res; } void eDVBServicePMTHandler::free() { + eDVBScan *tmp = m_dvb_scan; + m_dvb_scan = 0; + delete m_dvb_scan; + if (m_ca_servicePtr) { int demuxes[2] = {0,0};