X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/b8f5ce238d6307c1030956c470e550b711493f3c..f2e5d9edd75744f7a62135ad4e032fda84fdb2a0:/lib/dvb/pmt.cpp

diff --git a/lib/dvb/pmt.cpp b/lib/dvb/pmt.cpp
index 5ea47467..1d9ca83d 100644
--- a/lib/dvb/pmt.cpp
+++ b/lib/dvb/pmt.cpp
@@ -5,14 +5,18 @@
 #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()
-	:m_ca_servicePtr(0), m_decode_demux_num(0xFF)
+	:m_ca_servicePtr(0), m_dvb_scan(0), m_decode_demux_num(0xFF)
 {
 	m_use_decode_demux = 0;
 	m_pmt_pid = -1;
@@ -81,11 +85,12 @@ void eDVBServicePMTHandler::PMTready(int error)
 		serviceEvent(eventNoPMT);
 	else
 	{
+		m_have_cached_program = false;
 		serviceEvent(eventNewProgramInfo);
 		eEPGCache::getInstance()->PMTready(this);
-		if (!m_pvr_channel)
+		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)
 			{
 				int demuxes[2] = {0,0};
 				uint8_t tmp;
@@ -96,7 +101,7 @@ void eDVBServicePMTHandler::PMTready(int error)
 				else
 					demuxes[1]=demuxes[0];
 				eDVBCAService::register_service(m_reference, demuxes, m_ca_servicePtr);
-				eDVBCIInterfaces::getInstance()->addPMTHandler(this);
+				eDVBCIInterfaces::getInstance()->recheckPMTHandlers();
 			}
 			eDVBCIInterfaces::getInstance()->gotPMT(this);
 		}
@@ -134,192 +139,268 @@ void eDVBServicePMTHandler::PATready(int)
 		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_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->getCachePID(eDVBService::cVPID);
-			cached_apid_mpeg = m_service->getCachePID(eDVBService::cAC3PID);
-			cached_apid_ac3 = m_service->getCachePID(eDVBService::cAPID);
-			cached_tpid = m_service->getCachePID(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, 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)
 						{
-						case TELETEXT_DESCRIPTOR:
-							if ( program.textPid == -1 || (*es)->getPid() == cached_tpid )
-								program.textPid = (*es)->getPid();
-							break;
-						case AC3_DESCRIPTOR:
-							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)
+						{
+							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() )
 	{
-		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),
-			tpid = m_service->getCachePID(eDVBService::cTPID),
+		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 ( 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)
@@ -369,6 +450,28 @@ int eDVBServicePMTHandler::getPVRChannel(ePtr<iDVBPVRChannel> &pvr_channel)
 		return -1;
 }
 
+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;
@@ -383,6 +486,13 @@ int eDVBServicePMTHandler::tune(eServiceReferenceDVB &ref, int use_decode_demux,
 		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;
@@ -414,10 +524,6 @@ int eDVBServicePMTHandler::tune(eServiceReferenceDVB &ref, int use_decode_demux,
 		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(
@@ -429,9 +535,16 @@ int eDVBServicePMTHandler::tune(eServiceReferenceDVB &ref, int use_decode_demux,
 		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;
 	}
 
@@ -446,6 +559,9 @@ int eDVBServicePMTHandler::tune(eServiceReferenceDVB &ref, int use_decode_demux,
 
 void eDVBServicePMTHandler::free()
 {
+	m_dvb_scan = 0;
+	delete m_dvb_scan;
+
 	if (m_ca_servicePtr)
 	{
 		int demuxes[2] = {0,0};
@@ -459,10 +575,12 @@ void eDVBServicePMTHandler::free()
 		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();
@@ -738,3 +856,52 @@ void eDVBCAService::sendCAPMT()
 		++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 PyObject 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;
+}