#include <lib/dvb/dvb.h>
#include <lib/dvb/metaparser.h>
#include <lib/dvb_ci/dvbci.h>
+#include <lib/dvb/epgcache.h>
+#include <lib/dvb/scan.h>
+#include <dvbsi++/ca_descriptor.h>
#include <dvbsi++/ca_program_map_section.h>
+#include <dvbsi++/teletext_descriptor.h>
#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(int record)
- :m_ca_servicePtr(0)
+eDVBServicePMTHandler::eDVBServicePMTHandler()
+ :m_ca_servicePtr(0), m_dvb_scan(0), m_decode_demux_num(0xFF)
{
- m_record = record;
+ 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);
- eDebug("new PMT handler record: %d", m_record);
}
eDVBServicePMTHandler::~eDVBServicePMTHandler()
{
- eDebug("delete PMT handler record: %d", m_record);
- if (m_ca_servicePtr)
- {
- eDebug("unregister caservice");
- uint8_t demux_num;
- m_demux->getCADemuxID(demux_num);
- ePtr<eTable<ProgramMapSection> > ptr;
- m_PMT.getCurrent(ptr);
- eDVBCAService::unregister_service(m_reference, demux_num, ptr);
- eDVBCIInterfaces::getInstance()->removePMTHandler(this);
- }
+ free();
}
void eDVBServicePMTHandler::channelStateChanged(iDVBChannel *channel)
&& (state == iDVBChannel::state_ok) && (!m_demux))
{
if (m_channel)
- if (m_channel->getDemux(m_demux, m_record ? 0 : iDVBChannel::capDecode))
- eDebug("Allocating a demux for now tuned-in channel failed.");
+ 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);
{
eDebug("ok ... now we start!!");
- m_PAT.begin(eApp, eDVBPATSpec(), m_demux);
+ if (m_pmt_pid == -1)
+ m_PAT.begin(eApp, eDVBPATSpec(), m_demux);
+ else
+ m_PMT.begin(eApp, eDVBPMTSpec(m_pmt_pid, m_reference.getServiceID().get()), m_demux);
if ( m_service && !m_service->cacheEmpty() )
serviceEvent(eventNewProgramInfo);
}
}
+void eDVBServicePMTHandler::channelEvent(iDVBChannel *channel, int event)
+{
+ switch (event)
+ {
+ case iDVBChannel::evtEOF:
+ serviceEvent(eventEOF);
+ break;
+ case iDVBChannel::evtSOF:
+ serviceEvent(eventSOF);
+ break;
+ default:
+ break;
+ }
+}
+
void eDVBServicePMTHandler::PMTready(int error)
{
if (error)
serviceEvent(eventNoPMT);
else
{
+ m_have_cached_program = false;
serviceEvent(eventNewProgramInfo);
- if (!m_pvr_channel)
+ eEPGCache::getInstance()->PMTready(this);
+ if (!m_pvr_channel) // don't send campmt to camd.socket for playbacked services
{
- if(!m_ca_servicePtr) // don't send campmt to camd.socket for playbacked services
+ if(!m_ca_servicePtr)
{
- uint8_t demux_num;
- m_demux->getCADemuxID(demux_num);
- eDVBCAService::register_service(m_reference, demux_num, m_ca_servicePtr);
- eDVBCIInterfaces::getInstance()->addPMTHandler(this);
+ int demuxes[2] = {0,0};
+ uint8_t tmp;
+ m_demux->getCADemuxID(tmp);
+ demuxes[0]=tmp;
+ if (m_decode_demux_num != 0xFF)
+ demuxes[1]=m_decode_demux_num;
+ else
+ demuxes[1]=demuxes[0];
+ eDVBCAService::register_service(m_reference, demuxes, m_ca_servicePtr);
+ eDVBCIInterfaces::getInstance()->recheckPMTHandlers();
}
eDVBCIInterfaces::getInstance()->gotPMT(this);
}
void eDVBServicePMTHandler::PATready(int)
{
- eDebug("got PAT");
ePtr<eTable<ProgramAssociationSection> > ptr;
if (!m_PAT.getCurrent(ptr))
{
serviceEvent(eventNoPAT);
}
+PyObject *eDVBServicePMTHandler::getCaIds()
+{
+ ePyObject ret;
+
+ program prog;
+
+ if ( !getProgramInfo(prog) )
+ {
+ int cnt=prog.caids.size();
+ if (cnt)
+ {
+ ret=PyList_New(cnt);
+ std::set<uint16_t>::iterator it(prog.caids.begin());
+ while(cnt--)
+ PyList_SET_ITEM(ret, cnt, PyInt_FromLong(*it++));
+ }
+ }
+
+ 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.isCrypted = false;
+ program.pmtPid = -1;
+ program.textPid = -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_PMT.getCurrent(ptr))
+ 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;
- if ( m_service && !m_service->cacheEmpty() )
+ if (m_have_cached_program)
{
- cached_vpid = m_service->getCachePID(eDVBService::cVPID);
- cached_apid_mpeg = m_service->getCachePID(eDVBService::cAC3PID);
- cached_apid_ac3 = m_service->getCachePID(eDVBService::cAPID);
+ 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, 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())
+ const ProgramMapSection &pmt = **i;
+ program.pcrPid = pmt.getPcrPid();
+
+ ElementaryStreamInfoConstIterator es;
+ for (es = pmt.getEsInfo()->begin(); es != pmt.getEsInfo()->end(); ++es)
{
- 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 AC3_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:
+ isaudio = 1;
+ audio.type = audioStream::atAAC;
+ 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:
- ++cadescriptors;
- break;
}
+ break;
}
- break;
- }
- if (isaudio)
- {
- if ( !program.audioStreams.empty() &&
- ( audio.pid == cached_apid_ac3 || audio.pid == cached_apid_mpeg) )
+ if (isaudio)
{
- program.audioStreams.push_back(program.audioStreams[0]);
- program.audioStreams[0] = audio;
+ 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);
}
- else
- program.audioStreams.push_back(audio);
- }
- else if (isvideo)
- {
- if ( !program.videoStreams.empty() && video.pid == cached_vpid )
+ else if (isvideo)
{
- program.videoStreams.push_back(program.videoStreams[0]);
- program.videoStreams[0] = video;
+ 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.videoStreams.push_back(video);
+ continue;
}
- 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())
+ if ((*desc)->getTag() == CA_DESCRIPTOR)
{
- case CA_DESCRIPTOR:
- program.isCrypted=true;
- break;
+ CaDescriptor *descr = (CaDescriptor*)(*desc);
+ program.caids.insert(descr->getCaSystemId());
}
}
- break;
}
+ ret = 0;
+ m_cached_program = program;
+ m_have_cached_program = true;
}
- return 0;
- }
- else if ( m_service && !m_service->cacheEmpty() )
+ } else if ( m_service && !m_service->cacheEmpty() )
{
- int vpid = m_service->getCachePID(eDVBService::cVPID),
- apid_ac3 = m_service->getCachePID(eDVBService::cAC3PID),
- apid_mpeg = m_service->getCachePID(eDVBService::cAPID),
- pcrpid = m_service->getCachePID(eDVBService::cPCRPID),
+ int cached_pcrpid = m_service->getCacheEntry(eDVBService::cPCRPID),
+ vpidtype = m_service->getCacheEntry(eDVBService::cVTYPE),
cnt=0;
- if ( vpid != -1 )
+ if ( vpidtype == -1 )
+ vpidtype = videoStream::vtMPEG2;
+ 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 ( cached_tpid != -1 )
+ {
+ ++cnt;
+ 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)
return -1;
}
-int eDVBServicePMTHandler::getDemux(ePtr<iDVBDemux> &demux)
+int eDVBServicePMTHandler::getDataDemux(ePtr<iDVBDemux> &demux)
{
demux = m_demux;
if (demux)
return -1;
}
+int eDVBServicePMTHandler::getDecodeDemux(ePtr<iDVBDemux> &demux)
+{
+ int ret=0;
+ /* if we're using the decoding demux as data source
+ (for example in pvr playbacks), return that one. */
+ if (m_use_decode_demux)
+ {
+ demux = m_demux;
+ return ret;
+ }
+
+ ASSERT(m_channel); /* calling without a previous ::tune is certainly bad. */
+
+ ret = m_channel->getDemux(demux, iDVBChannel::capDecode);
+ if (!ret)
+ demux->getCADemuxID(m_decode_demux_num);
+
+ return ret;
+}
+
int eDVBServicePMTHandler::getPVRChannel(ePtr<iDVBPVRChannel> &pvr_channel)
{
pvr_channel = m_pvr_channel;
return -1;
}
-int eDVBServicePMTHandler::tune(eServiceReferenceDVB &ref)
+void eDVBServicePMTHandler::SDTScanEvent(int event)
+{
+ switch (event)
+ {
+ case eDVBScan::evtFinish:
+ {
+ ePtr<iDVBChannelList> db;
+ if (m_resourceManager->getChannelList(db) != 0)
+ eDebug("no channel list");
+ else
+ {
+ m_dvb_scan->insertInto(db, true);
+ eDebug("sdt update done!");
+ }
+ break;
+ }
+
+ default:
+ break;
+ }
+}
+
+int eDVBServicePMTHandler::tune(eServiceReferenceDVB &ref, int use_decode_demux, eCueSheet *cue)
{
RESULT res;
m_reference = ref;
+ m_use_decode_demux = use_decode_demux;
+
/* is this a normal (non PVR) channel? */
if (ref.path.empty())
{
ref.getChannelID(chid);
res = m_resourceManager->allocateChannel(chid, m_channel);
eDebug("allocate Channel: res %d", res);
+
+ ePtr<iDVBChannelList> db;
+ if (!m_resourceManager->getChannelList(db))
+ db->getService((eServiceReferenceDVB&)m_reference, m_service);
+
+ if (!res)
+ eDVBCIInterfaces::getInstance()->addPMTHandler(this);
} else
{
eDVBMetaParser parser;
if (parser.parseFile(ref.path))
- eWarning("no .meta file found, trying original service ref.");
- else
+ {
+ eWarning("no .meta file found, trying to find PMT pid");
+ eDVBTSTools tstools;
+ if (tstools.openFile(ref.path.c_str()))
+ eWarning("failed to open file");
+ else
+ {
+ int service_id, pmt_pid;
+ if (!tstools.findPMT(pmt_pid, service_id))
+ {
+ eDebug("PMT pid found on pid %04x, service id %d", pmt_pid, service_id);
+ m_reference.setServiceID(service_id);
+ m_pmt_pid = pmt_pid;
+ }
+ }
+ } else
m_reference = parser.m_ref;
eDebug("alloc PVR");
eDebug("allocatePVRChannel failed!\n");
m_channel = m_pvr_channel;
}
-
+
if (m_channel)
{
m_channel->connectStateChange(
m_channelStateChanged_connection);
m_last_channel_state = -1;
channelStateChanged(m_channel);
+
+ m_channel->connectEvent(
+ slot(*this, &eDVBServicePMTHandler::channelEvent),
+ m_channelEvent_connection);
+
+ if (ref.path.empty())
+ {
+ delete m_dvb_scan;
+ 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;
}
if (m_pvr_channel)
+ {
+ m_pvr_channel->setCueSheet(cue);
m_pvr_channel->playFile(ref.path.c_str());
-
- ePtr<iDVBChannelList> db;
- if (!m_resourceManager->getChannelList(db))
- db->getService((eServiceReferenceDVB&)m_reference, m_service);
+ }
return res;
}
+void eDVBServicePMTHandler::free()
+{
+ m_dvb_scan = 0;
+ delete m_dvb_scan;
+
+ if (m_ca_servicePtr)
+ {
+ int demuxes[2] = {0,0};
+ uint8_t tmp;
+ m_demux->getCADemuxID(tmp);
+ demuxes[0]=tmp;
+ if (m_decode_demux_num != 0xFF)
+ demuxes[1]=m_decode_demux_num;
+ else
+ demuxes[1]=demuxes[0];
+ ePtr<eTable<ProgramMapSection> > ptr;
+ m_PMT.getCurrent(ptr);
+ eDVBCAService::unregister_service(m_reference, demuxes, ptr);
+ m_ca_servicePtr = 0;
+ }
+
+ if (m_channel)
+ eDVBCIInterfaces::getInstance()->removePMTHandler(this);
+
+ if (m_pvr_channel)
+ {
+ m_pvr_channel->stopFile();
+ m_pvr_channel->setCueSheet(0);
+ }
+ m_PMT.stop();
+ m_PAT.stop();
+ m_service = 0;
+ m_channel = 0;
+ m_pvr_channel = 0;
+ m_demux = 0;
+}
+
std::map<eServiceReferenceDVB, eDVBCAService*> eDVBCAService::exist;
eDVBCAService::eDVBCAService()
::close(m_sock);
}
-RESULT eDVBCAService::register_service( const eServiceReferenceDVB &ref, int demux_num, eDVBCAService *&caservice )
+RESULT eDVBCAService::register_service( const eServiceReferenceDVB &ref, int demux_nums[2], eDVBCAService *&caservice )
{
CAServiceMap::iterator it = exist.find(ref);
if ( it != exist.end() )
caservice->m_service = ref;
eDebug("[eDVBCAService] new service %s", ref.toString().c_str() );
}
+
+ int loops = demux_nums[0] != demux_nums[1] ? 2 : 1;
+ for (int i=0; i < loops; ++i)
+ {
// search free demux entry
- int iter=0, max_demux_slots = sizeof(caservice->m_used_demux);
+ int iter=0, max_demux_slots = sizeof(caservice->m_used_demux);
- while ( iter < max_demux_slots && caservice->m_used_demux[iter] != 0xFF )
- ++iter;
+ while ( iter < max_demux_slots && caservice->m_used_demux[iter] != 0xFF )
+ ++iter;
- if ( iter < max_demux_slots )
- {
- caservice->m_used_demux[iter] = demux_num & 0xFF;
- eDebug("[eDVBCAService] add demux %d to slot %d service %s", demux_num, iter, ref.toString().c_str());
- }
- else
- {
- eDebug("[eDVBCAService] no more demux slots free for service %s!!", ref.toString().c_str());
- return -1;
+ if ( iter < max_demux_slots )
+ {
+ caservice->m_used_demux[iter] = demux_nums[i] & 0xFF;
+ eDebug("[eDVBCAService] add demux %d to slot %d service %s", caservice->m_used_demux[iter], iter, ref.toString().c_str());
+ }
+ else
+ {
+ eDebug("[eDVBCAService] no more demux slots free for service %s!!", ref.toString().c_str());
+ return -1;
+ }
}
return 0;
}
-RESULT eDVBCAService::unregister_service( const eServiceReferenceDVB &ref, int demux_num, eTable<ProgramMapSection> *ptr )
+RESULT eDVBCAService::unregister_service( const eServiceReferenceDVB &ref, int demux_num
s[2], eTable<ProgramMapSection> *ptr )
{
CAServiceMap::iterator it = exist.find(ref);
if ( it == exist.end() )
else
{
eDVBCAService *caservice = it->second;
- bool freed = false;
- int iter = 0,
- used_demux_slots = 0,
- max_demux_slots = sizeof(caservice->m_used_demux)/sizeof(int);
- while ( iter < max_demux_slots )
+ int loops = demux_nums[0] != demux_nums[1] ? 2 : 1;
+ for (int i=0; i < loops; ++i)
{
- if ( caservice->m_used_demux[iter] != 0xFF )
+ bool freed = false;
+ int iter = 0,
+ used_demux_slots = 0,
+ max_demux_slots = sizeof(caservice->m_used_demux)/sizeof(int);
+ while ( iter < max_demux_slots )
{
- if ( !freed && caservice->m_used_demux[iter] == demux_num )
+ if ( caservice->m_used_demux[iter] != 0xFF )
{
- eDebug("[eDVBCAService] free slot %d demux %d for service %s", iter, caservice->m_used_demux[iter], caservice->m_service.toString().c_str() );
- caservice->m_used_demux[iter] = 0xFF;
- freed=true;
+ if ( !freed && caservice->m_used_demux[iter] == demux_nums[i] )
+ {
+ eDebug("[eDVBCAService] free slot %d demux %d for service %s", iter, caservice->m_used_demux[iter], caservice->m_service.toString().c_str() );
+ caservice->m_used_demux[iter] = 0xFF;
+ freed=true;
+ }
+ else
+ ++used_demux_slots;
+ }
+ ++iter;
+ }
+ if (!freed)
+ eDebug("[eDVBCAService] couldn't free demux slot for demux %d", demux_nums[i]);
+ if (i || loops == 1)
+ {
+ if (!used_demux_slots) // no more used.. so we remove it
+ {
+ delete it->second;
+ exist.erase(it);
}
else
- ++used_demux_slots;
+ {
+ if (ptr)
+ it->second->buildCAPMT(ptr);
+ else
+ eDebug("[eDVBCAService] can not send updated demux info");
+ }
}
- ++iter;
- }
- if (!freed)
- {
- eDebug("[eDVBCAService] couldn't free demux slot for demux %d", demux_num);
- return -1;
- }
- if (!used_demux_slots) // no more used.. so we remove it
- {
- delete it->second;
- exist.erase(it);
- }
- else
- {
- if (ptr)
- it->second->buildCAPMT(ptr);
- else
- eDebug("[eDVBCAService] can not send updated demux info");
}
}
return 0;
pmt_version = table_spec.version;
uint8_t demux_mask = 0;
- uint8_t first_demux_num = 0xFF;
+ int data_demux = -1;
-#if 1
int iter=0, max_demux_slots = sizeof(m_used_demux);
while ( iter < max_demux_slots )
{
if ( m_used_demux[iter] != 0xFF )
{
- if ( first_demux_num == 0xFF )
- first_demux_num = m_used_demux[iter];
+ if ( m_used_demux[iter] > data_demux )
+ data_demux = m_used_demux[iter];
demux_mask |= (1 << m_used_demux[iter]);
}
++iter;
}
-#else
- demux_mask = 3;
- first_demux_num = 0;
-#endif
- if ( first_demux_num == 0xFF )
+ if ( data_demux == -1 )
{
- eDebug("[eDVBCAService] no demux found for service %s", m_service.toString().c_str() );
+ eDebug("[eDVBCAService] no data demux found for service %s", m_service.toString().c_str() );
return;
}
- eDebug("demux %d mask %02x prevhash %08x", first_demux_num, demux_mask, m_prev_build_hash);
+ eDebug("demux %d mask %02x prevhash %08x", data_demux, demux_mask, m_prev_build_hash);
unsigned int build_hash = (pmtpid << 16);
build_hash |= (demux_mask << 8);
tmp[0] = 0x82; // demux
tmp[1] = 0x02;
tmp[2] = demux_mask; // descramble bitmask
- tmp[3] = first_demux_num; // read section data from demux number
+ tmp[3] = data_demux&0xFF; // read section data from demux number
capmt.injectDescriptor(tmp, false);
tmp[0] = 0x81; // dvbnamespace
++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 void 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