X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=lib%2Fdvb%2Fpmt.cpp;h=a4c562090cbd2aa7103fb244ffb6db0c1b19f2aa;hp=ee6bb19d2d6da5ffb9bf1081676b06611add7a90;hb=061c9d8919f7adc14d4e2ff01cd3d561d0b650b9;hpb=e6d95074399c5cb2172710fda726c9ba4df2e373 diff --git a/lib/dvb/pmt.cpp b/lib/dvb/pmt.cpp index ee6bb19..a4c5620 100644 --- a/lib/dvb/pmt.cpp +++ b/lib/dvb/pmt.cpp @@ -18,15 +18,17 @@ #include #include #include +#include eDVBServicePMTHandler::eDVBServicePMTHandler() - :m_ca_servicePtr(0), m_dvb_scan(0), m_decode_demux_num(0xFF) + :m_ca_servicePtr(0), m_dvb_scan(0), m_decode_demux_num(0xFF), m_no_pat_entry_delay(eTimer::create()) { 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); + CONNECT(m_no_pat_entry_delay->timeout, eDVBServicePMTHandler::sendEventNoPatEntry); } eDVBServicePMTHandler::~eDVBServicePMTHandler() @@ -43,8 +45,15 @@ void eDVBServicePMTHandler::channelStateChanged(iDVBChannel *channel) && (state == iDVBChannel::state_ok) && (!m_demux)) { if (m_channel) - if (m_channel->getDemux(m_demux, (!m_use_decode_demux) ? 0 : iDVBChannel::capDecode)) + { + if (m_pvr_demux_tmp) + { + m_demux = m_pvr_demux_tmp; + m_pvr_demux_tmp = NULL; + } + else 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); @@ -126,14 +135,21 @@ void eDVBServicePMTHandler::PMTready(int error) } } +void eDVBServicePMTHandler::sendEventNoPatEntry() +{ + serviceEvent(eventNoPATEntry); +} + void eDVBServicePMTHandler::PATready(int) { + eDebug("PATready"); ePtr > ptr; if (!m_PAT.getCurrent(ptr)) { int service_id_single = -1; int pmtpid_single = -1; int pmtpid = -1; + int cnt=0; std::vector::const_iterator i; for (i = ptr->getSections().begin(); pmtpid == -1 && i != ptr->getSections().end(); ++i) { @@ -141,9 +157,10 @@ void eDVBServicePMTHandler::PATready(int) ProgramAssociationConstIterator program; for (program = pat.getPrograms()->begin(); pmtpid == -1 && program != pat.getPrograms()->end(); ++program) { + ++cnt; if (eServiceID((*program)->getProgramNumber()) == m_reference.getServiceID()) pmtpid = (*program)->getProgramMapPid(); - if (pmtpid_single == -1 && pmtpid == -1) + if (++cnt == 1 && pmtpid_single == -1 && pmtpid == -1) { pmtpid_single = (*program)->getProgramMapPid(); service_id_single = (*program)->getProgramNumber(); @@ -152,15 +169,21 @@ void eDVBServicePMTHandler::PATready(int) pmtpid_single = service_id_single = -1; } } - if (pmtpid_single != -1) // only one PAT entry .. so we use this one + if (pmtpid_single != -1) // only one PAT entry .. and not valid pmtpid found { + eDebug("use single pat entry!"); m_reference.setServiceID(eServiceID(service_id_single)); pmtpid = pmtpid_single; } - if (pmtpid == -1) - serviceEvent(eventNoPATEntry); - else + if (pmtpid == -1) { + eDebug("no PAT entry found.. start delay"); + m_no_pat_entry_delay->start(1000, true); + } + else { + eDebug("use pmtpid %04x for service_id %04x", pmtpid, m_reference.getServiceID().get()); + m_no_pat_entry_delay->stop(); m_PMT.begin(eApp, eDVBPMTSpec(pmtpid, m_reference.getServiceID().get()), m_demux); + } } else serviceEvent(eventNoPAT); } @@ -173,13 +196,13 @@ PyObject *eDVBServicePMTHandler::getCaIds(bool pair) if ( !getProgramInfo(prog) ) { - int cnt=prog.caids.size(); - if (cnt) + if (pair) { - ret=PyList_New(cnt); - std::set::iterator it(prog.caids.begin()); - if (pair) + int cnt=prog.caids.size(); + if (cnt) { + ret=PyList_New(cnt); + std::list::iterator it(prog.caids.begin()); while(cnt--) { ePyObject tuple = PyTuple_New(2); @@ -188,11 +211,15 @@ PyObject *eDVBServicePMTHandler::getCaIds(bool pair) PyList_SET_ITEM(ret, cnt, tuple); } } - else - { - while(cnt--) - PyList_SET_ITEM(ret, cnt, PyInt_FromLong((it++)->caid)); - } + } + else + { + std::set set(prog.caids.begin(), prog.caids.end()); + std::set::iterator it(set.begin()); + int cnt=set.size(); + ret=PyList_New(cnt); + while(cnt--) + PyList_SET_ITEM(ret, cnt, PyInt_FromLong((it++)->caid)); } } @@ -255,7 +282,7 @@ int eDVBServicePMTHandler::getProgramInfo(program &program) program::capid_pair pair; pair.caid = descr->getCaSystemId(); pair.capid = descr->getCaPid(); - program.caids.insert(pair); + program.caids.push_back(pair); } else if ((*desc)->getTag() == REGISTRATION_DESCRIPTOR) { @@ -444,10 +471,32 @@ int eDVBServicePMTHandler::getProgramInfo(program &program) isaudio = 1; audio.type = audioStream::atAACHE; // MPEG4-AAC break; - case AC3_DESCRIPTOR: - isaudio = 1; - audio.type = audioStream::atAC3; - break; + case AC3_DESCRIPTOR: + { + Ac3Descriptor *ac = (Ac3Descriptor*)(*desc); + eDebug("ac->getAc3TypeFlag() : 0x%x", ac->getAc3TypeFlag()); + + isaudio = 1; + audio.type = audioStream::atAC3; + + if(ac->getAc3TypeFlag()) + { + + uint8_t ac3type = ac->getAc3Type(); + eDebug("ac->getAc3Type() : 0x%x", ac->getAc3Type()); + if( ( ac3type & 0x80 ) && ( (ac3type<<5) == 0xA0 || (ac3type<<5) == 0xC0) ) // From EN-300 468 v1.7.1 Table D.1 + audio.type = audioStream::atDDP; + } + + break; + } + case ENHANCED_AC3_DESCRIPTOR: + eDebug("ENHANCED_AC3_DESCRIPTOR"); + isaudio = 1; + audio.type = audioStream::atDDP; + break; + + case REGISTRATION_DESCRIPTOR: /* some services don't have a separate AC3 descriptor */ { RegistrationDescriptor *d = (RegistrationDescriptor*)(*desc); @@ -522,7 +571,7 @@ int eDVBServicePMTHandler::getProgramInfo(program &program) program::capid_pair pair; pair.caid = descr->getCaSystemId(); pair.capid = descr->getCaPid(); - program.caids.insert(pair); + program.caids.push_back(pair); break; } default: @@ -646,7 +695,7 @@ int eDVBServicePMTHandler::getProgramInfo(program &program) program::capid_pair pair; pair.caid = *it; pair.capid = -1; // not known yet - program.caids.insert(pair); + program.caids.push_back(pair); } if ( cnt ) ret = 0; @@ -740,8 +789,8 @@ int eDVBServicePMTHandler::tuneExt(eServiceReferenceDVB &ref, int use_decode_dem { RESULT res=0; m_reference = ref; - m_use_decode_demux = use_decode_demux; + m_no_pat_entry_delay->stop(); /* use given service as backup. This is used for timeshift where we want to clone the live stream using the cache, but in fact have a PVR channel */ m_service = service; @@ -823,7 +872,10 @@ int eDVBServicePMTHandler::tuneExt(eServiceReferenceDVB &ref, int use_decode_dem if (m_pvr_channel) { m_pvr_channel->setCueSheet(cue); - if (source) + + if (m_pvr_channel->getDemux(m_pvr_demux_tmp, (!m_use_decode_demux) ? 0 : iDVBChannel::capDecode)) + eDebug("Allocating %s-decoding a demux for PVR channel failed.", m_use_decode_demux ? "" : "non-"); + else if (source) m_pvr_channel->playSource(source, streaminfo_file); else m_pvr_channel->playFile(ref.path.c_str());