git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
make some texts translatable and translate it to german languag
[enigma2.git]
/
lib
/
dvb
/
pmt.h
diff --git
a/lib/dvb/pmt.h
b/lib/dvb/pmt.h
index 5f3d4777d4b3f23ee304174e98f8971f7fa33bfd..fc8b15dd99237e6d433a09fc13bf4a646ce2e4bc 100644
(file)
--- 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/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>
#include <dvbsi++/program_map_section.h>
#include <dvbsi++/program_association_section.h>
@@
-15,14
+16,15
@@
#include <unistd.h>
#include <fcntl.h>
#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;
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;
unsigned int m_prev_build_hash;
int m_sock, m_clilen;
@@
-37,8
+39,8
@@
class eDVBCAService: public Object
eDVBCAService();
~eDVBCAService();
public:
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_num
s[2]
, eDVBCAService *&caservice );
+ static RESULT unregister_service( const eServiceReferenceDVB &ref, int demux_num
s[2]
, eTable<ProgramMapSection> *ptr );
void buildCAPMT(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;
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;
eAUTable<eTable<ProgramMapSection> > m_PMT;
eAUTable<eTable<ProgramAssociationSection> > m_PAT;
@@
-61,13
+64,19
@@
class eDVBServicePMTHandler: public Object
void channelStateChanged(iDVBChannel *);
ePtr<eConnection> m_channelStateChanged_connection;
void channelStateChanged(iDVBChannel *);
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);
void PMTready(int error);
void PATready(int error);
- int m_record;
+ int m_use_decode_demux;
+ uint8_t m_decode_demux_num;
+
public:
public:
- eDVBServicePMTHandler(
int record
);
+ eDVBServicePMTHandler();
~eDVBServicePMTHandler();
enum
~eDVBServicePMTHandler();
enum
@@
-78,20
+87,26
@@
public:
eventNoPATEntry, // no pat entry for the corresponding SID could be found
eventNoPMT, // no pmt could be received (timeout)
eventNewProgramInfo, // we just received a PMT
eventNoPATEntry, // no pat entry for the corresponding SID could be found
eventNoPMT, // no pmt could be received (timeout)
eventNewProgramInfo, // we just received a PMT
- eventTuned // a channel was sucessfully (re-)tuned in, you may start additional filters now
+ eventTuned, // a channel was sucessfully (re-)tuned in, you may start additional filters now
+
+ eventSOF, // seek pre start
+ eventEOF, // a file playback did end
};
Signal1<void,int> serviceEvent;
};
Signal1<void,int> serviceEvent;
-
+
struct videoStream
{
int pid;
struct videoStream
{
int pid;
+ int component_tag;
+ enum { vtMPEG2, vtMPEG4_H264 };
+ int type;
};
struct audioStream
{
int pid;
};
struct audioStream
{
int pid;
- enum { atMPEG, atAC3, atDTS };
+ enum { atMPEG, atAC3, atDTS
, atAAC
};
int type; // mpeg2, ac3, dts, ...
int component_tag;
int type; // mpeg2, ac3, dts, ...
int component_tag;
@@
-102,19
+117,28
@@
public:
{
std::vector<videoStream> videoStreams;
std::vector<audioStream> audioStreams;
{
std::vector<videoStream> videoStreams;
std::vector<audioStream> audioStreams;
- // ca info
+ std::set<uint16_t> caids;
int pcrPid;
int pmtPid;
int pcrPid;
int pmtPid;
+ int textPid;
+ bool isCrypted() { return !caids.empty(); }
};
};
-
+
int getProgramInfo(struct program &program);
int getProgramInfo(struct program &program);
- int getDemux(ePtr<iDVBDemux> &demux);
+ int getDataDemux(ePtr<iDVBDemux> &demux);
+ int getDecodeDemux(ePtr<iDVBDemux> &demux);
+ PyObject *getCaIds();
+
int getPVRChannel(ePtr<iDVBPVRChannel> &pvr_channel);
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 getPMT(ePtr<eTable<ProgramMapSection> > &ptr) { return m_PMT.getCurrent(ptr); }
int getChannel(eUsePtr<iDVBChannel> &channel);
- int tune(eServiceReferenceDVB &ref);
+ int tune(eServiceReferenceDVB &ref, int use_decode_demux, eCueSheet *sg=0);
+ void free();
+
+ int m_pmt_pid;
};
#endif
};
#endif