X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=lib%2Fdvb%2Fpmt.h;h=86b634fc459a1b9206ca9d5ac34dfe835c3995c6;hp=76fb442f96013ff02fdbbf0bbf0f665b9580caf4;hb=3c282ef6f5bd54f2b0f4cb407d075cf321405b84;hpb=1a3bd31e5cfcba89f2db03a2b4fa550de1fa2823 diff --git a/lib/dvb/pmt.h b/lib/dvb/pmt.h index 76fb442..86b634f 100644 --- a/lib/dvb/pmt.h +++ b/lib/dvb/pmt.h @@ -1,11 +1,14 @@ #ifndef __lib_dvb_dvbmid_h #define __lib_dvb_dvbmid_h +#ifndef SWIG #include +#include #include #include #include #include +#include #include #include @@ -15,41 +18,67 @@ #include #include -class eDVBServicePMTHandler; +class eDVBCAService; +class eDVBScan; + +struct channel_data: public Object +{ + ePtr m_channel; + ePtr m_stateChangedConn; + int m_prevChannelState; + int m_dataDemux; +}; + +// TODO .. put all static stuff into a 'eDVBCAServiceHandler class' typedef std::map CAServiceMap; +typedef std::map ChannelMap; class eDVBCAService: public Object { + eIOBuffer m_buffer; + ePtr m_sn; 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; struct sockaddr_un m_servaddr; unsigned int m_sendstate; unsigned char m_capmt[2048]; - eTimer m_retryTimer; + ePtr m_retryTimer; void sendCAPMT(); void Connect(); + void socketCB(int what); + static void DVBChannelAdded(eDVBChannel*); + static void DVBChannelStateChanged(iDVBChannel*); static CAServiceMap exist; + static ChannelMap exist_channels; + static ePtr m_chanAddedConn; + static channel_data *getChannelData(eDVBChannelID &chid); + 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 *ptr ); + static void registerChannelCallback(eDVBResourceManager *res_mgr); + 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 *ptr ); void buildCAPMT(eTable *ptr); }; +#endif + class eDVBServicePMTHandler: public Object { +#ifndef SWIG friend class eDVBCAService; eServiceReferenceDVB m_reference; ePtr m_service; int m_last_channel_state; eDVBCAService *m_ca_servicePtr; + ePtr m_dvb_scan; // for sdt scan eAUTable > m_PMT; eAUTable > m_PAT; @@ -61,15 +90,29 @@ class eDVBServicePMTHandler: public Object void channelStateChanged(iDVBChannel *); ePtr m_channelStateChanged_connection; + void channelEvent(iDVBChannel *, int event); + ePtr m_channelEvent_connection; + void SDTScanEvent(int); + ePtr m_scan_event_connection; void PMTready(int error); void PATready(int error); - int m_record; + int m_pmt_pid; + + int m_use_decode_demux; + uint8_t m_decode_demux_num; public: - eDVBServicePMTHandler(int record); + eDVBServicePMTHandler(); ~eDVBServicePMTHandler(); - +#endif + +#ifdef SWIG +private: + eDVBServicePMTHandler(); +public: +#endif + enum { eventNoResources, // a requested resource couldn't be allocated @@ -78,45 +121,107 @@ 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 - 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 + + eventPreStart, // before start filepush thread + eventSOF, // seek pre start + eventEOF, // a file playback did end + + eventMisconfiguration, // a channel was not found in any list, or no frontend was found which could provide this channel }; - +#ifndef SWIG Signal1 serviceEvent; struct videoStream { int pid; int component_tag; + enum { vtMPEG2, vtMPEG4_H264, vtMPEG1, vtMPEG4_Part2, vtVC1, vtVC1_SM }; + int type; }; struct audioStream { - int pid; - enum { atMPEG, atAC3, atDTS }; + int pid, + rdsPid; // hack for some radio services which transmit radiotext on different pid (i.e. harmony fm, HIT RADIO FFH, ...) + enum { atMPEG, atAC3, atDTS, atAAC, atAACHE, atLPCM }; int type; // mpeg2, ac3, dts, ... int component_tag; std::string language_code; /* iso-639, if available. */ }; - + + struct subtitleStream + { + int pid; + int subtitling_type; /* see ETSI EN 300 468 table 26 component_type + when stream_content is 0x03 + 0x10..0x13, 0x20..0x23 is used for dvb subtitles + 0x01 is used for teletext subtitles */ + union + { + int composition_page_id; // used for dvb subtitles + int teletext_page_number; // used for teletext subtitles + }; + union + { + int ancillary_page_id; // used for dvb subtitles + int teletext_magazine_number; // used for teletext subtitles + }; + std::string language_code; + bool operator<(const subtitleStream &s) const + { + if (pid != s.pid) + return pid < s.pid; + if (teletext_page_number != s.teletext_page_number) + return teletext_page_number < s.teletext_page_number; + return teletext_magazine_number < s.teletext_magazine_number; + } + }; + struct program { + struct capid_pair + { + uint16_t caid; + int capid; + bool operator< (const struct capid_pair &t) const { return t.caid < caid; } + }; std::vector videoStreams; std::vector audioStreams; - // ca info + int defaultAudioStream; + std::vector subtitleStreams; + std::list caids; int pcrPid; int pmtPid; - bool isCrypted; + int textPid; + bool isCrypted() { return !caids.empty(); } + PyObject *createPythonObject(); }; + + int getProgramInfo(program &program); + int getDataDemux(ePtr &demux); + int getDecodeDemux(ePtr &demux); + PyObject *getCaIds(bool pair=false); // caid / ecmpid pair - int getProgramInfo(struct program &program); - int getDemux(ePtr &demux); int getPVRChannel(ePtr &pvr_channel); - int getService(eServiceReferenceDVB &service) { service = m_reference; return 0; } + int getServiceReference(eServiceReferenceDVB &service) { service = m_reference; return 0; } + int getService(ePtr &service) { service = m_service; return 0; } int getPMT(ePtr > &ptr) { return m_PMT.getCurrent(ptr); } int getChannel(eUsePtr &channel); + void resetCachedProgram() { m_have_cached_program = false; } - int tune(eServiceReferenceDVB &ref); + /* deprecated interface */ + int tune(eServiceReferenceDVB &ref, int use_decode_demux, eCueSheet *sg=0, bool simulate=false, eDVBService *service = 0); + + /* new interface */ + int tuneExt(eServiceReferenceDVB &ref, int use_decode_demux, ePtr &, const char *streaminfo_file, eCueSheet *sg=0, bool simulate=false, eDVBService *service = 0); + + void free(); +private: + bool m_have_cached_program; + program m_cached_program; +#endif }; #endif