#include <dvbsi++/descriptor_tag.h>
#include <dvbsi++/iso639_language_descriptor.h>
#include <dvbsi++/stream_identifier_descriptor.h>
+#include <dvbsi++/subtitling_descriptor.h>
+#include <dvbsi++/teletext_descriptor.h>
eDVBServicePMTHandler::eDVBServicePMTHandler()
:m_ca_servicePtr(0), m_dvb_scan(0), m_decode_demux_num(0xFF)
serviceEvent(eventNoPMT);
else
{
+ m_have_cached_program = false;
serviceEvent(eventNewProgramInfo);
eEPGCache::getInstance()->PMTready(this);
if (!m_pvr_channel) // don't send campmt to camd.socket for playbacked services
eDVBCAService::register_service(m_reference, demuxes, m_ca_servicePtr);
eDVBCIInterfaces::getInstance()->recheckPMTHandlers();
}
- else
- eDVBCIInterfaces::getInstance()->gotPMT(this);
+ eDVBCIInterfaces::getInstance()->gotPMT(this);
}
if (m_ca_servicePtr)
{
PyObject *eDVBServicePMTHandler::getCaIds()
{
- PyObject *ret=0;
+ ePyObject ret;
program prog;
}
}
- return ret ? ret : PyList_New(0);
+ return ret ? (PyObject*)ret : (PyObject*)PyList_New(0);
}
int eDVBServicePMTHandler::getProgramInfo(struct program &program)
{
ePtr<eTable<ProgramMapSection> > ptr;
+ int cached_apid_ac3 = -1;
+ int cached_apid_mpeg = -1;
+ int cached_vpid = -1;
+ int cached_tpid = -1;
+ int ret = -1;
program.videoStreams.clear();
program.audioStreams.clear();
program.pcrPid = -1;
program.pmtPid = -1;
program.textPid = -1;
- program.audioChannel = m_service ? m_service->getCacheEntry(eDVBService::cACHANNEL) : -1;
+
+ if ( m_service && !m_service->cacheEmpty() )
+ {
+ cached_vpid = m_service->getCacheEntry(eDVBService::cVPID);
+ cached_apid_mpeg = m_service->getCacheEntry(eDVBService::cAC3PID);
+ cached_apid_ac3 = m_service->getCacheEntry(eDVBService::cAPID);
+ cached_tpid = m_service->getCacheEntry(eDVBService::cTPID);
+ }
if ( ((m_service && m_service->usePMT()) || !m_service) && !m_PMT.getCurrent(ptr))
{
- int cached_apid_ac3 = -1;
- int cached_apid_mpeg = -1;
- int cached_vpid = -1;
- int cached_tpid = -1;
- if ( m_service && !m_service->cacheEmpty() )
+ if (m_have_cached_program)
{
- cached_vpid = m_service->getCacheEntry(eDVBService::cVPID);
- cached_apid_mpeg = m_service->getCacheEntry(eDVBService::cAC3PID);
- cached_apid_ac3 = m_service->getCacheEntry(eDVBService::cAPID);
- cached_tpid = m_service->getCacheEntry(eDVBService::cTPID);
+ program = m_cached_program;
+ ret = 0;
}
- eDVBTableSpec table_spec;
- ptr->getSpec(table_spec);
- program.pmtPid = table_spec.pid < 0x1fff ? table_spec.pid : -1;
- std::vector<ProgramMapSection*>::const_iterator i;
- for (i = ptr->getSections().begin(); i != ptr->getSections().end(); ++i)
+ else
{
- const ProgramMapSection &pmt = **i;
- program.pcrPid = pmt.getPcrPid();
-
- ElementaryStreamInfoConstIterator es;
- for (es = pmt.getEsInfo()->begin(); es != pmt.getEsInfo()->end(); ++es)
+ eDVBTableSpec table_spec;
+ ptr->getSpec(table_spec);
+ program.pmtPid = table_spec.pid < 0x1fff ? table_spec.pid : -1;
+ std::vector<ProgramMapSection*>::const_iterator i;
+ for (i = ptr->getSections().begin(); i != ptr->getSections().end(); ++i)
{
- int isaudio = 0, isvideo = 0;
- videoStream video;
- audioStream audio;
- audio.component_tag=-1;
- video.component_tag=-1;
-
- video.pid = (*es)->getPid();
- audio.pid = (*es)->getPid();
- video.type = videoStream::vtMPEG2;
-
- switch ((*es)->getType())
+ const ProgramMapSection &pmt = **i;
+ program.pcrPid = pmt.getPcrPid();
+
+ ElementaryStreamInfoConstIterator es;
+ for (es = pmt.getEsInfo()->begin(); es != pmt.getEsInfo()->end(); ++es)
{
- case 0x1b: // AVC Video Stream (MPEG4 H264)
- video.type = videoStream::vtMPEG4_H264;
- case 0x01: // MPEG 1 video
- case 0x02: // MPEG 2 video
- isvideo = 1;
- //break; fall through !!!
- case 0x03: // MPEG 1 audio
- case 0x04: // MPEG 2 audio:
- 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)
+ int isaudio = 0, isvideo = 0;
+ videoStream video;
+ audioStream audio;
+ audio.component_tag=video.component_tag=-1;
+ video.type = videoStream::vtMPEG2;
+
+ switch ((*es)->getType())
{
- switch ((*desc)->getTag())
+ case 0x1b: // AVC Video Stream (MPEG4 H264)
+ video.type = videoStream::vtMPEG4_H264;
+ case 0x01: // MPEG 1 video
+ case 0x02: // MPEG 2 video
+ isvideo = 1;
+ //break; fall through !!!
+ case 0x03: // MPEG 1 audio
+ case 0x04: // MPEG 2 audio:
+ 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)
{
- case TELETEXT_DESCRIPTOR:
- if ( program.textPid == -1 || (*es)->getPid() == cached_tpid )
- program.textPid = (*es)->getPid();
- break;
- case DTS_DESCRIPTOR:
- if (!isvideo)
+ switch ((*desc)->getTag())
+ {
+ case SUBTITLING_DESCRIPTOR:
{
+ SubtitlingDescriptor *d = (SubtitlingDescriptor*)(*desc);
+ const SubtitlingList *list = d->getSubtitlings();
+ subtitleStream s;
+ s.pid = (*es)->getPid();
+ for (SubtitlingConstIterator it(list->begin()); it != list->end(); ++it)
+ {
+ s.subtitling_type = (*it)->getSubtitlingType();
+ s.composition_page_id = (*it)->getCompositionPageId();
+ s.ancillary_page_id = (*it)->getAncillaryPageId();
+ s.language_code = (*it)->getIso639LanguageCode();
+// eDebug("add dvb subtitle %s PID %04x, type %d, composition page %d, ancillary_page %d",
+// s.language_code.c_str(), s.pid, s.subtitling_type, s.composition_page_id, s.ancillary_page_id);
+ program.subtitleStreams.push_back(s);
+ }
+ break;
+ }
+ case TELETEXT_DESCRIPTOR:
+ if ( program.textPid == -1 || (*es)->getPid() == cached_tpid )
+ {
+ subtitleStream s;
+ s.subtitling_type = 0x01; // EBU TELETEXT SUBTITLES
+ s.pid = program.textPid = (*es)->getPid();
+ TeletextDescriptor *d = (TeletextDescriptor*)(*desc);
+ const VbiTeletextList *list = d->getVbiTeletexts();
+ for (VbiTeletextConstIterator it(list->begin()); it != list->end(); ++it)
+ {
+ switch((*it)->getTeletextType())
+ {
+ case 0x02: // Teletext subtitle page
+ case 0x05: // Teletext subtitle page for hearing impaired pepople
+ s.language_code = (*it)->getIso639LanguageCode();
+ s.teletext_page_number = (*it)->getTeletextPageNumber();
+ s.teletext_magazine_number = (*it)->getTeletextMagazineNumber();
+// eDebug("add teletext subtitle %s PID %04x, page number %d, magazine number %d",
+// s.language_code.c_str(), s.pid, s.teletext_page_number, s.teletext_magazine_number);
+ program.subtitleStreams.push_back(s);
+ break;
+ }
+ }
+ }
+ break;
+ case DTS_DESCRIPTOR:
isaudio = 1;
audio.type = audioStream::atDTS;
- }
- break;
- case AAC_DESCRIPTOR:
- if (!isvideo)
- {
+ break;
+ case AAC_DESCRIPTOR:
isaudio = 1;
audio.type = audioStream::atAAC;
- }
- break;
- case AC3_DESCRIPTOR:
- if (!isvideo)
- {
+ break;
+ case AC3_DESCRIPTOR:
isaudio = 1;
audio.type = audioStream::atAC3;
- }
- break;
- case ISO_639_LANGUAGE_DESCRIPTOR:
- if (!isvideo)
+ 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:
{
- const Iso639LanguageList *languages = ((Iso639LanguageDescriptor*)*desc)->getIso639Languages();
- /* use last language code */
- for (Iso639LanguageConstIterator i(languages->begin()); i != languages->end(); ++i)
- audio.language_code = (*i)->getIso639LanguageCode();
+ CaDescriptor *descr = (CaDescriptor*)(*desc);
+ program.caids.insert(descr->getCaSystemId());
+ break;
+ }
}
- break;
- case STREAM_IDENTIFIER_DESCRIPTOR:
- audio.component_tag =
- video.component_tag =
- ((StreamIdentifierDescriptor*)*desc)->getComponentTag();
- break;
- case CA_DESCRIPTOR:
- {
- CaDescriptor *descr = (CaDescriptor*)(*desc);
- program.caids.insert(descr->getCaSystemId());
- break;
}
+ break;
+ }
+ if (isaudio)
+ {
+ audio.pid = (*es)->getPid();
+ 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);
}
- break;
- }
- if (isaudio)
- {
- if ( !program.audioStreams.empty() &&
- ( audio.pid == cached_apid_ac3 || audio.pid == cached_apid_mpeg) )
+ else if (isvideo)
{
- program.audioStreams.push_back(program.audioStreams[0]);
- program.audioStreams[0] = audio;
+ video.pid = (*es)->getPid();
+ 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
- program.audioStreams.push_back(audio);
+ continue;
}
- else if (isvideo)
+ for (DescriptorConstIterator desc = pmt.getDescriptors()->begin();
+ desc != pmt.getDescriptors()->end(); ++desc)
{
- if ( !program.videoStreams.empty() && video.pid == cached_vpid )
+ if ((*desc)->getTag() == CA_DESCRIPTOR)
{
- program.videoStreams.push_back(program.videoStreams[0]);
- program.videoStreams[0] = video;
+ CaDescriptor *descr = (CaDescriptor*)(*desc);
+ program.caids.insert(descr->getCaSystemId());
}
- else
- program.videoStreams.push_back(video);
- }
- else
- continue;
- }
- for (DescriptorConstIterator desc = pmt.getDescriptors()->begin();
- desc != pmt.getDescriptors()->end(); ++desc)
- {
- if ((*desc)->getTag() == CA_DESCRIPTOR)
- {
- CaDescriptor *descr = (CaDescriptor*)(*desc);
- program.caids.insert(descr->getCaSystemId());
}
}
+ ret = 0;
+ m_cached_program = program;
+ m_have_cached_program = true;
}
- return 0;
} else if ( m_service && !m_service->cacheEmpty() )
{
- int vpid = m_service->getCacheEntry(eDVBService::cVPID),
- apid_ac3 = m_service->getCacheEntry(eDVBService::cAC3PID),
- apid_mpeg = m_service->getCacheEntry(eDVBService::cAPID),
- pcrpid = m_service->getCacheEntry(eDVBService::cPCRPID),
- tpid = m_service->getCacheEntry(eDVBService::cTPID),
+ int cached_pcrpid = m_service->getCacheEntry(eDVBService::cPCRPID),
vpidtype = m_service->getCacheEntry(eDVBService::cVTYPE),
cnt=0;
if ( vpidtype == -1 )
vpidtype = videoStream::vtMPEG2;
- if ( vpid != -1 )
+ if ( cached_vpid != -1 )
{
videoStream s;
- s.pid = vpid;
+ s.pid = cached_vpid;
s.type = vpidtype;
program.videoStreams.push_back(s);
++cnt;
}
- if ( apid_ac3 != -1 )
+ if ( cached_apid_ac3 != -1 )
{
audioStream s;
s.type = audioStream::atAC3;
- s.pid = apid_ac3;
+ s.pid = cached_apid_ac3;
program.audioStreams.push_back(s);
++cnt;
}
- if ( apid_mpeg != -1 )
+ if ( cached_apid_mpeg != -1 )
{
audioStream s;
s.type = audioStream::atMPEG;
- s.pid = apid_mpeg;
+ s.pid = cached_apid_mpeg;
program.audioStreams.push_back(s);
++cnt;
}
- if ( pcrpid != -1 )
+ if ( cached_pcrpid != -1 )
{
++cnt;
- program.pcrPid = pcrpid;
+ program.pcrPid = cached_pcrpid;
}
- if ( tpid != -1 )
+ if ( cached_tpid != -1 )
{
++cnt;
- program.textPid = tpid;
+ 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);
if ( cnt )
- return 0;
+ ret = 0;
}
- return -1;
+ return ret;
}
int eDVBServicePMTHandler::getChannel(eUsePtr<iDVBChannel> &channel)
ref.getChannelID(chid);
res = m_resourceManager->allocateChannel(chid, m_channel);
eDebug("allocate Channel: res %d", res);
- eDVBCIInterfaces::getInstance()->addPMTHandler(this);
+
+ ePtr<iDVBChannelList> db;
+ if (!m_resourceManager->getChannelList(db))
+ db->getService((eServiceReferenceDVB&)m_reference, m_service);
+
+ if (!res)
+ eDVBCIInterfaces::getInstance()->addPMTHandler(this);
} else
{
eDVBMetaParser parser;
m_channel = m_pvr_channel;
}
- ePtr<iDVBChannelList> db;
- if (!m_resourceManager->getChannelList(db))
- db->getService((eServiceReferenceDVB&)m_reference, m_service);
-
if (m_channel)
{
m_channel->connectStateChange(
if (ref.path.empty())
{
delete m_dvb_scan;
- m_dvb_scan = new eDVBScan(m_channel, false);
+ m_dvb_scan = new eDVBScan(m_channel, false, false);
m_dvb_scan->connectEvent(slot(*this, &eDVBServicePMTHandler::SDTScanEvent), m_scan_event_connection);
}
} else
{
- serviceEvent(eventTuneFailed);
+ serviceEvent(eventNoResources);
return res;
}
void eDVBServicePMTHandler::free()
{
- eDVBScan *tmp = m_dvb_scan; // do a copy on stack (recursive call of free()) !!!
m_dvb_scan = 0;
delete m_dvb_scan;
ePtr<eTable<ProgramMapSection> > ptr;
m_PMT.getCurrent(ptr);
eDVBCAService::unregister_service(m_reference, demuxes, ptr);
- eDVBCIInterfaces::getInstance()->removePMTHandler(this);
m_ca_servicePtr = 0;
}
+ if (m_channel)
+ eDVBCIInterfaces::getInstance()->removePMTHandler(this);
+
if (m_pvr_channel)
{
m_pvr_channel->stopFile();
++m_sendstate;
}
}
+
+static PyObject *createTuple(int pid, const char *type)
+{
+ PyObject *r = PyTuple_New(2);
+ PyTuple_SetItem(r, 0, PyInt_FromLong(pid));
+ PyTuple_SetItem(r, 1, PyString_FromString(type));
+ return r;
+}
+
+static inline PyList_AppendSteal(PyObject *list, PyObject *item)
+{
+ PyList_Append(list, item);
+ Py_DECREF(item);
+}
+
+PyObject *eDVBServicePMTHandler::program::createPythonObject()
+{
+ PyObject *r = PyDict_New();
+
+ PyObject *l = PyList_New(0);
+
+ PyList_AppendSteal(l, createTuple(0, "pat"));
+
+ if (pmtPid != -1)
+ PyList_AppendSteal(l, createTuple(pmtPid, "pmt"));
+
+ for (std::vector<eDVBServicePMTHandler::videoStream>::const_iterator
+ i(videoStreams.begin());
+ i != videoStreams.end(); ++i)
+ PyList_AppendSteal(l, createTuple(i->pid, "video"));
+
+ for (std::vector<eDVBServicePMTHandler::audioStream>::const_iterator
+ i(audioStreams.begin());
+ i != audioStreams.end(); ++i)
+ PyList_AppendSteal(l, createTuple(i->pid, "audio"));
+
+ for (std::vector<eDVBServicePMTHandler::subtitleStream>::const_iterator
+ i(subtitleStreams.begin());
+ i != subtitleStreams.end(); ++i)
+ PyList_AppendSteal(l, createTuple(i->pid, "subtitle"));
+
+ PyList_AppendSteal(l, createTuple(pcrPid, "pcr"));
+
+ if (textPid != -1)
+ PyList_AppendSteal(l, createTuple(textPid, "text"));
+
+ PyDict_SetItemString(r, "pids", l);
+ return r;
+}
git.cweiske.de / enigma2.git / blobdiff