X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/e80fbff7f23ad6eefda6331a150b9fe57f6c9302..f1dada7c1609b051d29a65a51cc227449350ee16:/lib/dvb/pmt.cpp diff --git a/lib/dvb/pmt.cpp b/lib/dvb/pmt.cpp index ec38b37c..b8663f4b 100644 --- a/lib/dvb/pmt.cpp +++ b/lib/dvb/pmt.cpp @@ -5,34 +5,26 @@ #include #include #include +#include #include +#include #include #include #include -eDVBServicePMTHandler::eDVBServicePMTHandler(int record) - :m_ca_servicePtr(0) +eDVBServicePMTHandler::eDVBServicePMTHandler() + :m_ca_servicePtr(0), m_decode_demux_num(0xFF) { - m_record = record; + 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); - eDebug("new PMT handler record: %d", m_record); } eDVBServicePMTHandler::~eDVBServicePMTHandler() { - eDebug("delete PMT handler record: %d", m_record); - if (m_ca_servicePtr) - { - eDebug("unregister caservice"); - uint8_t demux_num; - m_demux->getCADemuxID(demux_num); - ePtr > ptr; - m_PMT.getCurrent(ptr); - eDVBCAService::unregister_service(m_reference, demux_num, ptr); - eDVBCIInterfaces::getInstance()->removePMTHandler(this); - } + free(); } void eDVBServicePMTHandler::channelStateChanged(iDVBChannel *channel) @@ -44,8 +36,8 @@ void eDVBServicePMTHandler::channelStateChanged(iDVBChannel *channel) && (state == iDVBChannel::state_ok) && (!m_demux)) { if (m_channel) - if (m_channel->getDemux(m_demux, m_record ? 0 : iDVBChannel::capDecode)) - eDebug("Allocating a demux for now tuned-in channel failed."); + if (m_channel->getDemux(m_demux, (!m_use_decode_demux) ? 0 : iDVBChannel::capDecode)) + eDebug("Allocating %s-decoding a demux for now tuned-in channel failed.", m_use_decode_demux ? "" : "non-"); serviceEvent(eventTuned); @@ -53,7 +45,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); @@ -66,6 +61,21 @@ void eDVBServicePMTHandler::channelStateChanged(iDVBChannel *channel) } } +void eDVBServicePMTHandler::channelEvent(iDVBChannel *channel, int event) +{ + switch (event) + { + case iDVBChannel::evtEOF: + serviceEvent(eventEOF); + break; + case iDVBChannel::evtSOF: + serviceEvent(eventSOF); + break; + default: + break; + } +} + void eDVBServicePMTHandler::PMTready(int error) { if (error) @@ -78,9 +88,15 @@ void eDVBServicePMTHandler::PMTready(int error) { if(!m_ca_servicePtr) // don't send campmt to camd.socket for playbacked services { - uint8_t demux_num; - m_demux->getCADemuxID(demux_num); - eDVBCAService::register_service(m_reference, demux_num, m_ca_servicePtr); + int demuxes[2] = {0,0}; + uint8_t tmp; + m_demux->getCADemuxID(tmp); + demuxes[0]=tmp; + if (m_decode_demux_num != 0xFF) + demuxes[1]=m_decode_demux_num; + else + demuxes[1]=demuxes[0]; + eDVBCAService::register_service(m_reference, demuxes, m_ca_servicePtr); eDVBCIInterfaces::getInstance()->addPMTHandler(this); } eDVBCIInterfaces::getInstance()->gotPMT(this); @@ -98,7 +114,6 @@ void eDVBServicePMTHandler::PMTready(int error) void eDVBServicePMTHandler::PATready(int) { - eDebug("got PAT"); ePtr > ptr; if (!m_PAT.getCurrent(ptr)) { @@ -120,6 +135,76 @@ void eDVBServicePMTHandler::PATready(int) 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) + { + const ProgramMapSection &pmt = **i; + ElementaryStreamInfoConstIterator es = pmt.getEsInfo()->begin(); + for (; es != pmt.getEsInfo()->end(); ++es) + { + for (DescriptorConstIterator desc = (*es)->getDescriptors()->begin(); + desc != (*es)->getDescriptors()->end(); ++desc) + { + switch ((*desc)->getTag()) + { + case CA_DESCRIPTOR: + { + const CaDescriptor *cadescr = *desc; + uint16_t caid = cadescr->getCaSystemId(); + int idx=0; + while (caids[idx] && caids[idx] != caid) + ++idx; + caids[idx]=caid; + break; + } + } + } + } + for (DescriptorConstIterator desc = pmt.getDescriptors()->begin(); + desc != pmt.getDescriptors()->end(); ++desc) + { + switch ((*desc)->getTag()) + { + case CA_DESCRIPTOR: + { + const CaDescriptor *cadescr = *desc; + uint16_t caid = cadescr->getCaSystemId(); + int idx=0; + while (caids[idx] && caids[idx] != caid) + ++idx; + caids[idx]=caid; + break; + } + } + } + } + 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) { ePtr > ptr; @@ -128,17 +213,21 @@ int eDVBServicePMTHandler::getProgramInfo(struct program &program) program.audioStreams.clear(); program.pcrPid = -1; program.isCrypted = false; + 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; int cached_vpid = -1; + int cached_tpid = -1; if ( m_service && !m_service->cacheEmpty() ) { cached_vpid = m_service->getCachePID(eDVBService::cVPID); cached_apid_mpeg = m_service->getCachePID(eDVBService::cAC3PID); cached_apid_ac3 = m_service->getCachePID(eDVBService::cAPID); + cached_tpid = m_service->getCachePID(eDVBService::cTPID); } eDVBTableSpec table_spec; ptr->getSpec(table_spec); @@ -183,6 +272,10 @@ int eDVBServicePMTHandler::getProgramInfo(struct program &program) { switch ((*desc)->getTag()) { + case TELETEXT_DESCRIPTOR: + if ( program.textPid == -1 || (*es)->getPid() == cached_tpid ) + program.textPid = (*es)->getPid(); + break; case AC3_DESCRIPTOR: if (!isvideo) { @@ -253,13 +346,13 @@ int eDVBServicePMTHandler::getProgramInfo(struct program &program) } } return 0; - } - else if ( m_service && !m_service->cacheEmpty() ) + } else if ( m_service && !m_service->cacheEmpty() ) { int vpid = m_service->getCachePID(eDVBService::cVPID), apid_ac3 = m_service->getCachePID(eDVBService::cAC3PID), apid_mpeg = m_service->getCachePID(eDVBService::cAPID), pcrpid = m_service->getCachePID(eDVBService::cPCRPID), + tpid = m_service->getCachePID(eDVBService::cTPID), cnt=0; if ( vpid != -1 ) { @@ -289,6 +382,11 @@ int eDVBServicePMTHandler::getProgramInfo(struct program &program) ++cnt; program.pcrPid = pcrpid; } + if ( tpid != -1 ) + { + ++cnt; + program.textPid = tpid; + } if ( cnt ) return 0; } @@ -304,7 +402,7 @@ int eDVBServicePMTHandler::getChannel(eUsePtr &channel) return -1; } -int eDVBServicePMTHandler::getDemux(ePtr &demux) +int eDVBServicePMTHandler::getDataDemux(ePtr &demux) { demux = m_demux; if (demux) @@ -313,6 +411,26 @@ int eDVBServicePMTHandler::getDemux(ePtr &demux) return -1; } +int eDVBServicePMTHandler::getDecodeDemux(ePtr &demux) +{ + int ret=0; + /* if we're using the decoding demux as data source + (for example in pvr playbacks), return that one. */ + if (m_use_decode_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) + demux->getCADemuxID(m_decode_demux_num); + + return ret; +} + int eDVBServicePMTHandler::getPVRChannel(ePtr &pvr_channel) { pvr_channel = m_pvr_channel; @@ -322,11 +440,13 @@ int eDVBServicePMTHandler::getPVRChannel(ePtr &pvr_channel) return -1; } -int eDVBServicePMTHandler::tune(eServiceReferenceDVB &ref) +int eDVBServicePMTHandler::tune(eServiceReferenceDVB &ref, int use_decode_demux, eCueSheet *cue) { RESULT res; m_reference = ref; + m_use_decode_demux = use_decode_demux; + /* is this a normal (non PVR) channel? */ if (ref.path.empty()) { @@ -339,8 +459,22 @@ int eDVBServicePMTHandler::tune(eServiceReferenceDVB &ref) 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("alloc PVR"); @@ -350,7 +484,11 @@ int eDVBServicePMTHandler::tune(eServiceReferenceDVB &ref) 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( @@ -358,6 +496,10 @@ int eDVBServicePMTHandler::tune(eServiceReferenceDVB &ref) m_channelStateChanged_connection); m_last_channel_state = -1; channelStateChanged(m_channel); + + m_channel->connectEvent( + slot(*this, &eDVBServicePMTHandler::channelEvent), + m_channelEvent_connection); } else { serviceEvent(eventTuneFailed); @@ -365,15 +507,46 @@ int eDVBServicePMTHandler::tune(eServiceReferenceDVB &ref) } if (m_pvr_channel) + { + m_pvr_channel->setCueSheet(cue); 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() +{ + if (m_ca_servicePtr) + { + int demuxes[2] = {0,0}; + uint8_t tmp; + m_demux->getCADemuxID(tmp); + demuxes[0]=tmp; + if (m_decode_demux_num != 0xFF) + demuxes[1]=m_decode_demux_num; + else + demuxes[1]=demuxes[0]; + ePtr > ptr; + m_PMT.getCurrent(ptr); + eDVBCAService::unregister_service(m_reference, demuxes, ptr); + eDVBCIInterfaces::getInstance()->removePMTHandler(this); + m_ca_servicePtr = 0; + } + + if (m_pvr_channel) + { + m_pvr_channel->stopFile(); + m_pvr_channel->setCueSheet(0); + } + m_PMT.stop(); + m_PAT.stop(); + m_service = 0; + m_channel = 0; + m_pvr_channel = 0; + m_demux = 0; +} + std::map eDVBCAService::exist; eDVBCAService::eDVBCAService() @@ -390,7 +563,7 @@ eDVBCAService::~eDVBCAService() ::close(m_sock); } -RESULT eDVBCAService::register_service( const eServiceReferenceDVB &ref, int demux_num, eDVBCAService *&caservice ) +RESULT eDVBCAService::register_service( const eServiceReferenceDVB &ref, int demux_nums[2], eDVBCAService *&caservice ) { CAServiceMap::iterator it = exist.find(ref); if ( it != exist.end() ) @@ -401,26 +574,31 @@ RESULT eDVBCAService::register_service( const eServiceReferenceDVB &ref, int dem caservice->m_service = ref; eDebug("[eDVBCAService] new service %s", ref.toString().c_str() ); } + + int loops = demux_nums[0] != demux_nums[1] ? 2 : 1; + for (int i=0; i < loops; ++i) + { // search free demux entry - int iter=0, max_demux_slots = sizeof(caservice->m_used_demux); + int iter=0, max_demux_slots = sizeof(caservice->m_used_demux); - while ( iter < max_demux_slots && caservice->m_used_demux[iter] != 0xFF ) - ++iter; + while ( iter < max_demux_slots && caservice->m_used_demux[iter] != 0xFF ) + ++iter; - if ( iter < max_demux_slots ) - { - caservice->m_used_demux[iter] = demux_num & 0xFF; - eDebug("[eDVBCAService] add demux %d to slot %d service %s", demux_num, iter, ref.toString().c_str()); - } - else - { - eDebug("[eDVBCAService] no more demux slots free for service %s!!", ref.toString().c_str()); - return -1; + if ( iter < max_demux_slots ) + { + caservice->m_used_demux[iter] = demux_nums[i] & 0xFF; + eDebug("[eDVBCAService] add demux %d to slot %d service %s", caservice->m_used_demux[iter], iter, ref.toString().c_str()); + } + else + { + eDebug("[eDVBCAService] no more demux slots free for service %s!!", ref.toString().c_str()); + return -1; + } } return 0; } -RESULT eDVBCAService::unregister_service( const eServiceReferenceDVB &ref, int demux_num, eTable *ptr ) +RESULT eDVBCAService::unregister_service( const eServiceReferenceDVB &ref, int demux_nums[2], eTable *ptr ) { CAServiceMap::iterator it = exist.find(ref); if ( it == exist.end() ) @@ -431,41 +609,45 @@ RESULT eDVBCAService::unregister_service( const eServiceReferenceDVB &ref, int d else { eDVBCAService *caservice = it->second; - bool freed = false; - int iter = 0, - used_demux_slots = 0, - max_demux_slots = sizeof(caservice->m_used_demux)/sizeof(int); - while ( iter < max_demux_slots ) + int loops = demux_nums[0] != demux_nums[1] ? 2 : 1; + for (int i=0; i < loops; ++i) { - if ( caservice->m_used_demux[iter] != 0xFF ) + bool freed = false; + int iter = 0, + used_demux_slots = 0, + max_demux_slots = sizeof(caservice->m_used_demux)/sizeof(int); + while ( iter < max_demux_slots ) { - if ( !freed && caservice->m_used_demux[iter] == demux_num ) + if ( caservice->m_used_demux[iter] != 0xFF ) { - eDebug("[eDVBCAService] free slot %d demux %d for service %s", iter, caservice->m_used_demux[iter], caservice->m_service.toString().c_str() ); - caservice->m_used_demux[iter] = 0xFF; - freed=true; + if ( !freed && caservice->m_used_demux[iter] == demux_nums[i] ) + { + eDebug("[eDVBCAService] free slot %d demux %d for service %s", iter, caservice->m_used_demux[iter], caservice->m_service.toString().c_str() ); + caservice->m_used_demux[iter] = 0xFF; + freed=true; + } + else + ++used_demux_slots; + } + ++iter; + } + if (!freed) + eDebug("[eDVBCAService] couldn't free demux slot for demux %d", demux_nums[i]); + if (i || loops == 1) + { + if (!used_demux_slots) // no more used.. so we remove it + { + delete it->second; + exist.erase(it); } else - ++used_demux_slots; + { + if (ptr) + it->second->buildCAPMT(ptr); + else + eDebug("[eDVBCAService] can not send updated demux info"); + } } - ++iter; - } - if (!freed) - { - eDebug("[eDVBCAService] couldn't free demux slot for demux %d", demux_num); - return -1; - } - if (!used_demux_slots) // no more used.. so we remove it - { - delete it->second; - exist.erase(it); - } - else - { - if (ptr) - it->second->buildCAPMT(ptr); - else - eDebug("[eDVBCAService] can not send updated demux info"); } } return 0; @@ -496,32 +678,27 @@ void eDVBCAService::buildCAPMT(eTable *ptr) pmt_version = table_spec.version; uint8_t demux_mask = 0; - uint8_t first_demux_num = 0xFF; + int data_demux = -1; -#if 1 int iter=0, max_demux_slots = sizeof(m_used_demux); while ( iter < max_demux_slots ) { if ( m_used_demux[iter] != 0xFF ) { - if ( first_demux_num == 0xFF ) - first_demux_num = m_used_demux[iter]; + if ( m_used_demux[iter] > data_demux ) + data_demux = m_used_demux[iter]; demux_mask |= (1 << m_used_demux[iter]); } ++iter; } -#else - demux_mask = 3; - first_demux_num = 0; -#endif - if ( first_demux_num == 0xFF ) + if ( data_demux == -1 ) { - eDebug("[eDVBCAService] no demux found for service %s", m_service.toString().c_str() ); + eDebug("[eDVBCAService] no data demux found for service %s", m_service.toString().c_str() ); return; } - eDebug("demux %d mask %02x prevhash %08x", first_demux_num, demux_mask, m_prev_build_hash); + eDebug("demux %d mask %02x prevhash %08x", data_demux, demux_mask, m_prev_build_hash); unsigned int build_hash = (pmtpid << 16); build_hash |= (demux_mask << 8); @@ -556,7 +733,7 @@ void eDVBCAService::buildCAPMT(eTable *ptr) tmp[0] = 0x82; // demux tmp[1] = 0x02; tmp[2] = demux_mask; // descramble bitmask - tmp[3] = first_demux_num; // read section data from demux number + tmp[3] = data_demux&0xFF; // read section data from demux number capmt.injectDescriptor(tmp, false); tmp[0] = 0x81; // dvbnamespace