X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/721f838966ed31bde07d08792154e0750d6dd9ae..7265acc377e49beaed3f3c43f36267c9fced53e7:/lib/dvb/pmt.h

diff --git a/lib/dvb/pmt.h b/lib/dvb/pmt.h
index aabac24d..fc8b15dd 100644
--- a/lib/dvb/pmt.h
+++ b/lib/dvb/pmt.h
@@ -6,6 +6,7 @@
 #include <lib/dvb/dvb.h>
 #include <lib/dvb/idemux.h>
 #include <lib/dvb/esection.h>
+#include <lib/python/python.h>
 #include <dvbsi++/program_map_section.h>
 #include <dvbsi++/program_association_section.h>
 
@@ -15,14 +16,15 @@
 #include <unistd.h>
 #include <fcntl.h>
 
-class eDVBServicePMTHandler;
+class eDVBCAService;
+class eDVBScan;
 
 typedef std::map<eServiceReferenceDVB, eDVBCAService*> CAServiceMap;
 
 class eDVBCAService: public Object
 {
 	eServiceReferenceDVB m_service;
-	uint8_t m_used_demux[10];
+	uint8_t m_used_demux[32];
 	unsigned int m_prev_build_hash;
 
 	int m_sock, m_clilen; 
@@ -37,8 +39,8 @@ class eDVBCAService: public Object
 	eDVBCAService();
 	~eDVBCAService();
 public:
-	static RESULT register_service( const eServiceReferenceDVB &ref, int demux_num, eDVBCAService *&caservice );
-	static RESULT unregister_service( const eServiceReferenceDVB &ref, int demux_num, eTable<ProgramMapSection> *ptr );
+	static RESULT register_service( const eServiceReferenceDVB &ref, int demux_nums[2], eDVBCAService *&caservice );
+	static RESULT unregister_service( const eServiceReferenceDVB &ref, int demux_nums[2], eTable<ProgramMapSection> *ptr );
 	void buildCAPMT(eTable<ProgramMapSection> *ptr);
 };
 
@@ -50,6 +52,7 @@ class eDVBServicePMTHandler: public Object
 
 	int m_last_channel_state;
 	eDVBCAService *m_ca_servicePtr;
+	eDVBScan *m_dvb_scan; // for sdt scan
 
 	eAUTable<eTable<ProgramMapSection> > m_PMT;
 	eAUTable<eTable<ProgramAssociationSection> > m_PAT;
@@ -63,12 +66,15 @@ class eDVBServicePMTHandler: public Object
 	ePtr<eConnection> m_channelStateChanged_connection;
 	void channelEvent(iDVBChannel *, int event);
 	ePtr<eConnection> m_channelEvent_connection;
+	void SDTScanEvent(int);
+	ePtr<eConnection> m_scan_event_connection;
 
 	void PMTready(int error);
 	void PATready(int error);
 	
 	int m_use_decode_demux;
-	
+	uint8_t m_decode_demux_num;
+
 public:
 	eDVBServicePMTHandler();
 	~eDVBServicePMTHandler();
@@ -83,6 +89,7 @@ public:
 		eventNewProgramInfo, // we just received a PMT
 		eventTuned,        // a channel was sucessfully (re-)tuned in, you may start additional filters now
 		
+		eventSOF,          // seek pre start
 		eventEOF,          // a file playback did end
 	};
 
@@ -92,12 +99,14 @@ public:
 	{
 		int pid;
 		int component_tag;
+		enum { vtMPEG2, vtMPEG4_H264 };
+		int type;
 	};
 	
 	struct audioStream
 	{
 		int pid;
-		enum { atMPEG, atAC3, atDTS };
+		enum { atMPEG, atAC3, atDTS, atAAC };
 		int type; // mpeg2, ac3, dts, ...
 		
 		int component_tag;
@@ -108,23 +117,28 @@ public:
 	{
 		std::vector<videoStream> videoStreams;
 		std::vector<audioStream> audioStreams;
-		// ca info
+		std::set<uint16_t> caids;
 		int pcrPid;
 		int pmtPid;
-		bool isCrypted;
+		int textPid;
+		bool isCrypted() { return !caids.empty(); }
 	};
-	
+
 	int getProgramInfo(struct program &program);
 	int getDataDemux(ePtr<iDVBDemux> &demux);
 	int getDecodeDemux(ePtr<iDVBDemux> &demux);
+	PyObject *getCaIds();
 	
 	int getPVRChannel(ePtr<iDVBPVRChannel> &pvr_channel);
-	int getService(eServiceReferenceDVB &service) { service = m_reference; return 0; }
+	int getServiceReference(eServiceReferenceDVB &service) { service = m_reference; return 0; }
+	int getService(ePtr<eDVBService> &service) { service = m_service; return 0; }
 	int getPMT(ePtr<eTable<ProgramMapSection> > &ptr) { return m_PMT.getCurrent(ptr); }
 	int getChannel(eUsePtr<iDVBChannel> &channel);
 
-	int tune(eServiceReferenceDVB &ref, int use_decode_demux);
+	int tune(eServiceReferenceDVB &ref, int use_decode_demux, eCueSheet *sg=0);
 	void free();
+
+	int m_pmt_pid;
 };
 
 #endif