X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/87625f1aa211991c803ecbb5980972238136ac57..54e57557c7867d3d492ce9bd658ec2d672cd0168:/lib/dvb/pmt.cpp diff --git a/lib/dvb/pmt.cpp b/lib/dvb/pmt.cpp index c886c39a..fdee5b40 100644 --- a/lib/dvb/pmt.cpp +++ b/lib/dvb/pmt.cpp @@ -3,7 +3,11 @@ #include #include #include +#include #include +#include +#include +#include eDVBServicePMTHandler::eDVBServicePMTHandler(int record) :m_ca_servicePtr(0) @@ -26,6 +30,7 @@ eDVBServicePMTHandler::~eDVBServicePMTHandler() ePtr > ptr; m_PMT.getCurrent(ptr); eDVBCAService::unregister_service(m_reference, demux_num, ptr); + eDVBCIInterfaces::getInstance()->removePMTHandler(this); } } @@ -47,8 +52,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 +72,16 @@ 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 + if (!m_pvr_channel) { - uint8_t demux_num; - m_demux->getCADemuxID(demux_num); - eDVBCAService::register_service(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) { @@ -135,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(); @@ -150,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); } @@ -200,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; @@ -295,7 +351,7 @@ RESULT eDVBCAService::register_service( const eServiceReferenceDVB &ref, int dem { 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,11 +362,11 @@ RESULT eDVBCAService::register_service( const eServiceReferenceDVB &ref, int dem 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; @@ -321,7 +377,7 @@ RESULT eDVBCAService::unregister_service( const eServiceReferenceDVB &ref, int d 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 +417,7 @@ RESULT eDVBCAService::unregister_service( const eServiceReferenceDVB &ref, int d 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; @@ -491,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; } @@ -504,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