From 75a14a64a63132874f26b4715cde33e69dbf4b34 Mon Sep 17 00:00:00 2001 From: ghost Date: Mon, 22 Nov 2010 16:19:51 +0100 Subject: add possibility to query CAID/CAPID combination from python refs bug #621 --- lib/dvb/pmt.cpp | 41 ++++++++++++++++++++++++++++++++--------- lib/dvb/pmt.h | 12 +++++++++--- lib/dvb_ci/dvbci.cpp | 4 ++-- lib/service/iservice.h | 1 + lib/service/servicedvb.cpp | 4 +++- 5 files changed, 47 insertions(+), 15 deletions(-) diff --git a/lib/dvb/pmt.cpp b/lib/dvb/pmt.cpp index ea4b96c5..4a826c12 100644 --- a/lib/dvb/pmt.cpp +++ b/lib/dvb/pmt.cpp @@ -149,7 +149,7 @@ void eDVBServicePMTHandler::PATready(int) serviceEvent(eventNoPAT); } -PyObject *eDVBServicePMTHandler::getCaIds() +PyObject *eDVBServicePMTHandler::getCaIds(bool pair) { ePyObject ret; @@ -161,16 +161,29 @@ PyObject *eDVBServicePMTHandler::getCaIds() if (cnt) { ret=PyList_New(cnt); - std::set::iterator it(prog.caids.begin()); - while(cnt--) - PyList_SET_ITEM(ret, cnt, PyInt_FromLong(*it++)); + std::set::iterator it(prog.caids.begin()); + if (pair) + { + while(cnt--) + { + ePyObject tuple = PyTuple_New(2); + PyTuple_SET_ITEM(tuple, 0, PyInt_FromLong(it->caid)); + PyTuple_SET_ITEM(tuple, 1, PyInt_FromLong((it++)->capid)); + PyList_SET_ITEM(ret, cnt, tuple); + } + } + else + { + while(cnt--) + PyList_SET_ITEM(ret, cnt, PyInt_FromLong((it++)->caid)); + } } } return ret ? (PyObject*)ret : (PyObject*)PyList_New(0); } -int eDVBServicePMTHandler::getProgramInfo(struct program &program) +int eDVBServicePMTHandler::getProgramInfo(program &program) { ePtr > ptr; int cached_apid_ac3 = -1; @@ -460,7 +473,10 @@ int eDVBServicePMTHandler::getProgramInfo(struct program &program) case CA_DESCRIPTOR: { CaDescriptor *descr = (CaDescriptor*)(*desc); - program.caids.insert(descr->getCaSystemId()); + program::capid_pair pair; + pair.caid = descr->getCaSystemId(); + pair.capid = descr->getCaPid(); + program.caids.insert(pair); break; } default: @@ -523,7 +539,10 @@ int eDVBServicePMTHandler::getProgramInfo(struct program &program) if ((*desc)->getTag() == CA_DESCRIPTOR) { CaDescriptor *descr = (CaDescriptor*)(*desc); - program.caids.insert(descr->getCaSystemId()); + program::capid_pair pair; + pair.caid = descr->getCaSystemId(); + pair.capid = descr->getCaPid(); + program.caids.insert(pair); } } } @@ -589,8 +608,12 @@ int eDVBServicePMTHandler::getProgramInfo(struct program &program) program.textPid = cached_tpid; } CAID_LIST &caids = m_service->m_ca; - for (CAID_LIST::iterator it(caids.begin()); it != caids.end(); ++it) - program.caids.insert(*it); + for (CAID_LIST::iterator it(caids.begin()); it != caids.end(); ++it) { + program::capid_pair pair; + pair.caid = *it; + pair.capid = -1; // not known yet + program.caids.insert(pair); + } if ( cnt ) ret = 0; } diff --git a/lib/dvb/pmt.h b/lib/dvb/pmt.h index 483c06b1..4a506a41 100644 --- a/lib/dvb/pmt.h +++ b/lib/dvb/pmt.h @@ -181,11 +181,17 @@ public: struct program { + struct capid_pair + { + uint16_t caid; + int capid; + bool operator< (const struct capid_pair &t) { return t.caid < caid; } + }; std::vector videoStreams; std::vector audioStreams; int defaultAudioStream; std::vector subtitleStreams; - std::set caids; + std::set caids; int pcrPid; int pmtPid; int textPid; @@ -193,10 +199,10 @@ public: PyObject *createPythonObject(); }; - int getProgramInfo(struct program &program); + int getProgramInfo(program &program); int getDataDemux(ePtr &demux); int getDecodeDemux(ePtr &demux); - PyObject *getCaIds(); + PyObject *getCaIds(bool pair=false); // caid / ecmpid pair int getPVRChannel(ePtr &pvr_channel); int getServiceReference(eServiceReferenceDVB &service) { service = m_reference; return 0; } diff --git a/lib/dvb_ci/dvbci.cpp b/lib/dvb_ci/dvbci.cpp index 883fb5a4..342f06a6 100644 --- a/lib/dvb_ci/dvbci.cpp +++ b/lib/dvb_ci/dvbci.cpp @@ -297,8 +297,8 @@ void eDVBCIInterfaces::recheckPMTHandlers() if (!pmthandler->getProgramInfo(p)) { int cnt=0; - for (caidSet::reverse_iterator x(p.caids.rbegin()); x != p.caids.rend(); ++x, ++cnt) - caids.push_front(*x); + for (std::set::reverse_iterator x(p.caids.rbegin()); x != p.caids.rend(); ++x, ++cnt) + caids.push_front(x->caid); if (service && cnt) service->m_ca = caids; } diff --git a/lib/service/iservice.h b/lib/service/iservice.h index 2ba7cb46..7f582495 100644 --- a/lib/service/iservice.h +++ b/lib/service/iservice.h @@ -289,6 +289,7 @@ public: sFileSize, sCAIDs, + sCAIDPIDs, sVideoType, /* MPEG2 MPEG4 */ sTags, /* space seperated list of tags */ diff --git a/lib/service/servicedvb.cpp b/lib/service/servicedvb.cpp index e498dd42..2332e361 100644 --- a/lib/service/servicedvb.cpp +++ b/lib/service/servicedvb.cpp @@ -1585,7 +1585,7 @@ int eDVBServicePlay::getInfo(int w) { eDVBServicePMTHandler::program program; - if (w == sCAIDs) + if (w == sCAIDs || w == sCAIDPIDs) return resIsPyObject; eDVBServicePMTHandler &h = m_timeshift_active ? m_service_handler_timeshift : m_service_handler; @@ -1726,6 +1726,8 @@ PyObject *eDVBServicePlay::getInfoObject(int w) { case sCAIDs: return m_service_handler.getCaIds(); + case sCAIDPIDs: + return m_service_handler.getCaIds(true); case sTransponderData: return eStaticServiceDVBInformation().getInfoObject(m_reference, w); default: -- cgit v1.2.3 From 26e11cd67e0bbfebd41b860a008f240d3d1b3052 Mon Sep 17 00:00:00 2001 From: ghost Date: Mon, 29 Nov 2010 14:10:30 +0100 Subject: use std::list instead of std::set for caid/capid pairs to support duplicate caids refs #621 --- lib/dvb/pmt.cpp | 30 +++++++++++++++++------------- lib/dvb/pmt.h | 2 +- lib/dvb_ci/dvbci.cpp | 3 ++- 3 files changed, 20 insertions(+), 15 deletions(-) diff --git a/lib/dvb/pmt.cpp b/lib/dvb/pmt.cpp index 4a826c12..be4fb170 100644 --- a/lib/dvb/pmt.cpp +++ b/lib/dvb/pmt.cpp @@ -157,13 +157,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); @@ -172,11 +172,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)); } } @@ -476,7 +480,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: @@ -542,7 +546,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); } } } @@ -612,7 +616,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; diff --git a/lib/dvb/pmt.h b/lib/dvb/pmt.h index 4a506a41..40a226ef 100644 --- a/lib/dvb/pmt.h +++ b/lib/dvb/pmt.h @@ -191,7 +191,7 @@ public: std::vector audioStreams; int defaultAudioStream; std::vector subtitleStreams; - std::set caids; + std::list caids; int pcrPid; int pmtPid; int textPid; diff --git a/lib/dvb_ci/dvbci.cpp b/lib/dvb_ci/dvbci.cpp index 342f06a6..8a43e5b1 100644 --- a/lib/dvb_ci/dvbci.cpp +++ b/lib/dvb_ci/dvbci.cpp @@ -297,7 +297,8 @@ void eDVBCIInterfaces::recheckPMTHandlers() if (!pmthandler->getProgramInfo(p)) { int cnt=0; - for (std::set::reverse_iterator x(p.caids.rbegin()); x != p.caids.rend(); ++x, ++cnt) + std::set set(p.caids.begin(), p.caids.end()); + for (std::set::reverse_iterator x(set.rbegin()); x != set.rend(); ++x, ++cnt) caids.push_front(x->caid); if (service && cnt) service->m_ca = caids; -- cgit v1.2.3