X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/76776f400ac0c56441d5e139ca6c377e6f2d7190..4aa7b11f525aaa22b3ad6b0d247ea67f39b498de:/lib/dvb/pmt.cpp diff --git a/lib/dvb/pmt.cpp b/lib/dvb/pmt.cpp index f948e95c..fdee5b40 100644 --- a/lib/dvb/pmt.cpp +++ b/lib/dvb/pmt.cpp @@ -3,19 +3,35 @@ #include #include #include +#include #include +#include +#include +#include -eDVBServicePMTHandler::eDVBServicePMTHandler() - :m_pmt_pid(0xFFFF), m_ca_servicePtr(0) +eDVBServicePMTHandler::eDVBServicePMTHandler(int record) + :m_ca_servicePtr(0) { + m_record = record; 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() { - delete m_ca_servicePtr; + 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); + } } void eDVBServicePMTHandler::channelStateChanged(iDVBChannel *channel) @@ -27,8 +43,8 @@ void eDVBServicePMTHandler::channelStateChanged(iDVBChannel *channel) && (state == iDVBChannel::state_ok) && (!m_demux)) { if (m_channel) - if (m_channel->getDemux(m_demux)) - eDebug("shit it failed.. again."); + if (m_channel->getDemux(m_demux, m_record ? 0 : iDVBChannel::capDecode)) + eDebug("Allocating a demux for now tuned-in channel failed."); serviceEvent(eventTuned); @@ -36,13 +52,16 @@ void eDVBServicePMTHandler::channelStateChanged(iDVBChannel *channel) { eDebug("ok ... now we start!!"); - /* emit */ m_resourceManager->m_channelRunning(channel); - m_PAT.begin(eApp, eDVBPATSpec(), m_demux); if ( m_service && !m_service->cacheEmpty() ) serviceEvent(eventNewProgramInfo); } + } else if ((m_last_channel_state != iDVBChannel::state_failed) && + (state == iDVBChannel::state_failed)) + { + eDebug("tune failed."); + serviceEvent(eventTuneFailed); } } @@ -53,10 +72,25 @@ void eDVBServicePMTHandler::PMTready(int error) else { serviceEvent(eventNewProgramInfo); - if (!m_pvr_channel && !m_ca_servicePtr) // don't send campmt to camd.socket for playbacked services - m_ca_servicePtr = new eDVBCAService(*this); + if (!m_pvr_channel) + { + 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); + eDVBCIInterfaces::getInstance()->addPMTHandler(this); + } + eDVBCIInterfaces::getInstance()->gotPMT(this); + } if (m_ca_servicePtr) - m_ca_servicePtr->buildCAPMT(); + { + ePtr > ptr; + if (!m_PMT.getCurrent(ptr)) + m_ca_servicePtr->buildCAPMT(ptr); + else + eDebug("eDVBServicePMTHandler cannot call buildCAPMT"); + } } } @@ -79,17 +113,13 @@ void eDVBServicePMTHandler::PATready(int) if (pmtpid == -1) serviceEvent(eventNoPATEntry); else - { m_PMT.begin(eApp, eDVBPMTSpec(pmtpid, m_reference.getServiceID().get()), m_demux); - m_pmt_pid = pmtpid; - } } else serviceEvent(eventNoPAT); } int eDVBServicePMTHandler::getProgramInfo(struct program &program) { - eDebug("got PMT"); ePtr > ptr; program.videoStreams.clear(); @@ -98,6 +128,9 @@ int eDVBServicePMTHandler::getProgramInfo(struct program &program) if (!m_PMT.getCurrent(ptr)) { + eDVBTableSpec table_spec; + ptr->getSpec(table_spec); + program.pmtPid = table_spec.pid < 0x1fff ? table_spec.pid : -1; std::vector::const_iterator i; for (i = ptr->getSections().begin(); i != ptr->getSections().end(); ++i) { @@ -110,6 +143,7 @@ int eDVBServicePMTHandler::getProgramInfo(struct program &program) int isaudio = 0, isvideo = 0; videoStream video; audioStream audio; + audio.component_tag=-1; video.pid = (*es)->getPid(); audio.pid = (*es)->getPid(); @@ -125,9 +159,47 @@ int eDVBServicePMTHandler::getProgramInfo(struct program &program) isaudio = 1; audio.type = audioStream::atMPEG; break; + case 0x06: // PES Private + /* PES private can contain AC-3, DTS or lots of other stuff. + check descriptors to get the exact type. */ + for (DescriptorConstIterator desc = (*es)->getDescriptors()->begin(); + desc != (*es)->getDescriptors()->end(); ++desc) + { + switch ((*desc)->getTag()) + { + case AC3_DESCRIPTOR: + isaudio = 1; + audio.type = audioStream::atAC3; + break; + } + } + break; } if (isaudio) + { + for (DescriptorConstIterator desc = (*es)->getDescriptors()->begin(); + desc != (*es)->getDescriptors()->end(); ++desc) + { + switch ((*desc)->getTag()) + { + case ISO_639_LANGUAGE_DESCRIPTOR: + { + const Iso639LanguageList *languages = ((Iso639LanguageDescriptor*)*desc)->getIso639Languages(); + + /* use last language code */ + for (Iso639LanguageConstIterator i(languages->begin()); i != languages->end(); ++i) + audio.language_code = (*i)->getIso639LanguageCode(); + + break; + } + case STREAM_IDENTIFIER_DESCRIPTOR: + audio.component_tag = ((StreamIdentifierDescriptor*)*desc)->getComponentTag(); + break; + } + } + program.audioStreams.push_back(audio); + } if (isvideo) program.videoStreams.push_back(video); } @@ -175,6 +247,15 @@ int eDVBServicePMTHandler::getProgramInfo(struct program &program) return -1; } +int eDVBServicePMTHandler::getChannel(eUsePtr &channel) +{ + channel = m_channel; + if (channel) + return 0; + else + return -1; +} + int eDVBServicePMTHandler::getDemux(ePtr &demux) { demux = m_demux; @@ -198,14 +279,13 @@ int eDVBServicePMTHandler::tune(eServiceReferenceDVB &ref) RESULT res; m_reference = ref; -// ref.path = "/viva.ts"; // hrhr. - /* is this a normal (non PVR) channel? */ if (ref.path.empty()) { eDVBChannelID chid; ref.getChannelID(chid); res = m_resourceManager->allocateChannel(chid, m_channel); + eDebug("allocate Channel: res %d", res); } else { eDVBMetaParser parser; @@ -230,6 +310,10 @@ int eDVBServicePMTHandler::tune(eServiceReferenceDVB &ref) m_channelStateChanged_connection); m_last_channel_state = -1; channelStateChanged(m_channel); + } else + { + serviceEvent(eventTuneFailed); + return res; } if (m_pvr_channel) @@ -242,6 +326,103 @@ int eDVBServicePMTHandler::tune(eServiceReferenceDVB &ref) return res; } +std::map eDVBCAService::exist; + +eDVBCAService::eDVBCAService() + :m_prev_build_hash(0), m_sendstate(0), m_retryTimer(eApp) +{ + memset(m_used_demux, 0xFF, sizeof(m_used_demux)); + CONNECT(m_retryTimer.timeout, eDVBCAService::sendCAPMT); + Connect(); +} + +eDVBCAService::~eDVBCAService() +{ + eDebug("[eDVBCAService] free service %s", m_service.toString().c_str()); + ::close(m_sock); +} + +RESULT eDVBCAService::register_service( const eServiceReferenceDVB &ref, int demux_num, eDVBCAService *&caservice ) +{ + CAServiceMap::iterator it = exist.find(ref); + if ( it != exist.end() ) + caservice = it->second; + else + { + caservice = (exist[ref]=new eDVBCAService()); + caservice->m_service = ref; + eDebug("[eDVBCAService] new service %s", ref.toString().c_str() ); + } +// search free demux entry + int iter=0, max_demux_slots = sizeof(caservice->m_used_demux); + + 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; + } + return 0; +} + +RESULT eDVBCAService::unregister_service( const eServiceReferenceDVB &ref, int demux_num, eTable *ptr ) +{ + CAServiceMap::iterator it = exist.find(ref); + if ( it == exist.end() ) + { + eDebug("[eDVBCAService] try to unregister non registered %s", ref.toString().c_str()); + return -1; + } + 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 ) + { + if ( caservice->m_used_demux[iter] != 0xFF ) + { + if ( !freed && caservice->m_used_demux[iter] == demux_num ) + { + 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_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; +} + void eDVBCAService::Connect() { memset(&m_servaddr, 0, sizeof(struct sockaddr_un)); @@ -255,21 +436,63 @@ void eDVBCAService::Connect() setsockopt(m_sock, SOL_SOCKET, SO_REUSEADDR, &val, 4); } -void eDVBCAService::buildCAPMT() +void eDVBCAService::buildCAPMT(eTable *ptr) { - ePtr > ptr; + if (!ptr) + return; + + eDVBTableSpec table_spec; + ptr->getSpec(table_spec); + + int pmtpid = table_spec.pid, + pmt_version = table_spec.version; + + uint8_t demux_mask = 0; + uint8_t first_demux_num = 0xFF; + +#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]; + demux_mask |= (1 << m_used_demux[iter]); + } + ++iter; + } +#else + demux_mask = 3; + first_demux_num = 0; +#endif - if (m_parent.m_PMT.getCurrent(ptr)) + if ( first_demux_num == 0xFF ) + { + eDebug("[eDVBCAService] no 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); + + unsigned int build_hash = (pmtpid << 16); + build_hash |= (demux_mask << 8); + build_hash |= (pmt_version&0xFF); + + if ( build_hash == m_prev_build_hash ) + { + eDebug("[eDVBCAService] don't build/send the same CA PMT twice"); + return; + } std::vector::const_iterator i=ptr->getSections().begin(); if ( i != ptr->getSections().end() ) { - CaProgramMapSection capmt(*i++, m_capmt == NULL ? 0x03 /*only*/: 0x05 /*update*/, 0x01 ); + CaProgramMapSection capmt(*i++, m_prev_build_hash ? 0x05 /*update*/ : 0x03 /*only*/, 0x01 ); while( i != ptr->getSections().end() ) { - eDebug("append"); +// eDebug("append"); capmt.append(*i++); } @@ -278,34 +501,33 @@ void eDVBCAService::buildCAPMT() tmp[0]=0x84; // pmt pid tmp[1]=0x02; - tmp[2]=m_parent.m_pmt_pid>>8; - tmp[3]=m_parent.m_pmt_pid&0xFF; + tmp[2]=pmtpid>>8; + tmp[3]=pmtpid&0xFF; capmt.injectDescriptor(tmp, false); tmp[0] = 0x82; // demux tmp[1] = 0x02; - m_parent.m_demux->getCADemuxID(tmp[2]); // descramble on demux - m_parent.m_demux->getCADemuxID(tmp[3]); // get section data from demux1 + tmp[2] = demux_mask; // descramble bitmask + tmp[3] = first_demux_num; // read section data from demux number capmt.injectDescriptor(tmp, false); tmp[0] = 0x81; // dvbnamespace tmp[1] = 0x08; - tmp[2] = m_parent.m_reference.getDVBNamespace().get()>>24; - tmp[3]=(m_parent.m_reference.getDVBNamespace().get()>>16)&0xFF; - tmp[4]=(m_parent.m_reference.getDVBNamespace().get()>>8)&0xFF; - tmp[5]=m_parent.m_reference.getDVBNamespace().get()&0xFF; - tmp[6]=m_parent.m_reference.getTransportStreamID().get()>>8; - tmp[7]=m_parent.m_reference.getTransportStreamID().get()&0xFF; - tmp[8]=m_parent.m_reference.getOriginalNetworkID().get()>>8; - tmp[9]=m_parent.m_reference.getOriginalNetworkID().get()&0xFF; + tmp[2] = m_service.getDVBNamespace().get()>>24; + tmp[3]=(m_service.getDVBNamespace().get()>>16)&0xFF; + tmp[4]=(m_service.getDVBNamespace().get()>>8)&0xFF; + tmp[5]=m_service.getDVBNamespace().get()&0xFF; + tmp[6]=m_service.getTransportStreamID().get()>>8; + tmp[7]=m_service.getTransportStreamID().get()&0xFF; + tmp[8]=m_service.getOriginalNetworkID().get()>>8; + tmp[9]=m_service.getOriginalNetworkID().get()&0xFF; capmt.injectDescriptor(tmp, false); - if ( !m_capmt ) - m_capmt = new uint8_t[2048]; - capmt.writeToBuffer(m_capmt); } + m_prev_build_hash = build_hash; + if ( m_sendstate != 0xFFFFFFFF ) m_sendstate=0; sendCAPMT(); @@ -325,7 +547,7 @@ void eDVBCAService::sendCAPMT() int i=0; int lenbytes = m_capmt[3] & ~0x80; while(i < lenbytes) - wp |= (m_capmt[4+i] << (8 * i++)); + wp = (wp << 8) | m_capmt[4 + i++]; wp+=4; wp+=lenbytes; } @@ -338,7 +560,7 @@ void eDVBCAService::sendCAPMT() if ( write(m_sock, m_capmt, wp) == wp ) { m_sendstate=0xFFFFFFFF; - eDebug("[eDVBCAHandler] send %d bytes",wp); + eDebug("[eDVBCAService] send %d bytes",wp); #if 1 for(int i=0;i