X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/4b8b88b747f1229b3538320d934d686e0d71e812..9d8868b11c3ba69d42e68eabf4a3a1e8869ec8ec:/lib/dvb/pmt.cpp diff --git a/lib/dvb/pmt.cpp b/lib/dvb/pmt.cpp index c9ff3cb6..ec38b37c 100644 --- a/lib/dvb/pmt.cpp +++ b/lib/dvb/pmt.cpp @@ -3,7 +3,12 @@ #include #include #include +#include +#include #include +#include +#include +#include eDVBServicePMTHandler::eDVBServicePMTHandler(int record) :m_ca_servicePtr(0) @@ -25,7 +30,8 @@ eDVBServicePMTHandler::~eDVBServicePMTHandler() m_demux->getCADemuxID(demux_num); ePtr > ptr; m_PMT.getCurrent(ptr); - eDVBCAService::unregister_demux(m_reference, demux_num, ptr); + eDVBCAService::unregister_service(m_reference, demux_num, ptr); + eDVBCIInterfaces::getInstance()->removePMTHandler(this); } } @@ -47,8 +53,6 @@ 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() ) @@ -69,11 +73,17 @@ 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 + eEPGCache::getInstance()->PMTready(this); + if (!m_pvr_channel) { - uint8_t demux_num; - m_demux->getCADemuxID(demux_num); - eDVBCAService::register_demux(m_reference, demux_num, m_ca_servicePtr); + 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) { @@ -117,9 +127,19 @@ int eDVBServicePMTHandler::getProgramInfo(struct program &program) program.videoStreams.clear(); program.audioStreams.clear(); program.pcrPid = -1; + program.isCrypted = false; if (!m_PMT.getCurrent(ptr)) { + int cached_apid_ac3 = -1; + int cached_apid_mpeg = -1; + int cached_vpid = -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); + } eDVBTableSpec table_spec; ptr->getSpec(table_spec); program.pmtPid = table_spec.pid < 0x1fff ? table_spec.pid : -1; @@ -132,29 +152,104 @@ int eDVBServicePMTHandler::getProgramInfo(struct program &program) ElementaryStreamInfoConstIterator es; for (es = pmt.getEsInfo()->begin(); es != pmt.getEsInfo()->end(); ++es) { - int isaudio = 0, isvideo = 0; + int isaudio = 0, isvideo = 0, cadescriptors = 0; videoStream video; audioStream audio; - + audio.component_tag=-1; + video.component_tag=-1; + video.pid = (*es)->getPid(); audio.pid = (*es)->getPid(); - + switch ((*es)->getType()) { case 0x01: // MPEG 1 video case 0x02: // MPEG 2 video isvideo = 1; - break; + //break; fall through !!! case 0x03: // MPEG 1 audio case 0x04: // MPEG 2 audio: - isaudio = 1; - audio.type = audioStream::atMPEG; + if (!isvideo) + { + isaudio = 1; + audio.type = audioStream::atMPEG; + } + //break; fall through !!! + 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: + if (!isvideo) + { + isaudio = 1; + audio.type = audioStream::atAC3; + } + break; + case ISO_639_LANGUAGE_DESCRIPTOR: + if (!isvideo) + { + 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 = + video.component_tag = + ((StreamIdentifierDescriptor*)*desc)->getComponentTag(); + break; + case CA_DESCRIPTOR: + ++cadescriptors; + break; + } + } break; } if (isaudio) - program.audioStreams.push_back(audio); - if (isvideo) - program.videoStreams.push_back(video); + { + if ( !program.audioStreams.empty() && + ( audio.pid == cached_apid_ac3 || audio.pid == cached_apid_mpeg) ) + { + program.audioStreams.push_back(program.audioStreams[0]); + program.audioStreams[0] = audio; + } + else + program.audioStreams.push_back(audio); + } + else if (isvideo) + { + if ( !program.videoStreams.empty() && video.pid == cached_vpid ) + { + program.videoStreams.push_back(program.videoStreams[0]); + program.videoStreams[0] = video; + } + else + program.videoStreams.push_back(video); + } + else + continue; + if ( cadescriptors > 0 ) + program.isCrypted=true; + } + if ( !program.isCrypted ) + { + for (DescriptorConstIterator desc = pmt.getDescriptors()->begin(); + desc != pmt.getDescriptors()->end(); ++desc) + { + switch ((*desc)->getTag()) + { + case CA_DESCRIPTOR: + program.isCrypted=true; + break; + } + } + break; } } return 0; @@ -162,8 +257,8 @@ int eDVBServicePMTHandler::getProgramInfo(struct program &program) else if ( m_service && !m_service->cacheEmpty() ) { int vpid = m_service->getCachePID(eDVBService::cVPID), - apid_ac3 = m_service->getCachePID(eDVBService::cAPID), - apid_mpeg = m_service->getCachePID(eDVBService::cAC3PID), + apid_ac3 = m_service->getCachePID(eDVBService::cAC3PID), + apid_mpeg = m_service->getCachePID(eDVBService::cAPID), pcrpid = m_service->getCachePID(eDVBService::cPCRPID), cnt=0; if ( vpid != -1 ) @@ -200,6 +295,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; @@ -286,7 +390,7 @@ eDVBCAService::~eDVBCAService() ::close(m_sock); } -RESULT eDVBCAService::register_demux( const eServiceReferenceDVB &ref, int demux_num, eDVBCAService *&caservice ) +RESULT eDVBCAService::register_service( const eServiceReferenceDVB &ref, int demux_num, eDVBCAService *&caservice ) { CAServiceMap::iterator it = exist.find(ref); if ( it != exist.end() ) @@ -295,7 +399,7 @@ RESULT eDVBCAService::register_demux( const eServiceReferenceDVB &ref, int demux { caservice = (exist[ref]=new eDVBCAService()); caservice->m_service = ref; - eDebug("[eDVBCAHandler] new service %s", ref.toString().c_str() ); + eDebug("[eDVBCAService] new service %s", ref.toString().c_str() ); } // search free demux entry int iter=0, max_demux_slots = sizeof(caservice->m_used_demux); @@ -306,22 +410,22 @@ RESULT eDVBCAService::register_demux( const eServiceReferenceDVB &ref, int demux if ( iter < max_demux_slots ) { caservice->m_used_demux[iter] = demux_num & 0xFF; - eDebug("[eDVBCAHandler] add demux %d to slot %d service %s", demux_num, iter, ref.toString().c_str()); + eDebug("[eDVBCAService] add demux %d to slot %d service %s", demux_num, iter, ref.toString().c_str()); } else { - eDebug("[eDVBCAHandler] no more demux slots free for service %s!!", ref.toString().c_str()); + eDebug("[eDVBCAService] no more demux slots free for service %s!!", ref.toString().c_str()); return -1; } return 0; } -RESULT eDVBCAService::unregister_demux( const eServiceReferenceDVB &ref, int demux_num, eTable *ptr ) +RESULT eDVBCAService::unregister_service( const eServiceReferenceDVB &ref, int demux_num, eTable *ptr ) { CAServiceMap::iterator it = exist.find(ref); if ( it == exist.end() ) { - eDebug("[eDVBCAHandler] try to unregister non registered %s", ref.toString().c_str()); + eDebug("[eDVBCAService] try to unregister non registered %s", ref.toString().c_str()); return -1; } else @@ -361,7 +465,7 @@ RESULT eDVBCAService::unregister_demux( const eServiceReferenceDVB &ref, int dem if (ptr) it->second->buildCAPMT(ptr); else - eDebug("[eDVBCAHandler] can not send updated demux info"); + eDebug("[eDVBCAService] can not send updated demux info"); } } return 0; @@ -394,6 +498,7 @@ void eDVBCAService::buildCAPMT(eTable *ptr) 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 ) { @@ -405,6 +510,10 @@ void eDVBCAService::buildCAPMT(eTable *ptr) } ++iter; } +#else + demux_mask = 3; + first_demux_num = 0; +#endif if ( first_demux_num == 0xFF ) { @@ -446,8 +555,8 @@ void eDVBCAService::buildCAPMT(eTable *ptr) tmp[0] = 0x82; // demux tmp[1] = 0x02; - tmp[3] = first_demux_num; // read section data from demux number 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 @@ -486,7 +595,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; } @@ -499,7 +608,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