X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/25a8a62bada406cd8164704ff10ba922853fd39d..97d46aee1158e549c110d66a0e1c4185c3cbbdf3:/lib/dvb/epgcache.h diff --git a/lib/dvb/epgcache.h b/lib/dvb/epgcache.h index 3c2b612b..4d45d87e 100644 --- a/lib/dvb/epgcache.h +++ b/lib/dvb/epgcache.h @@ -1,17 +1,36 @@ #ifndef __epgcache_h_ #define __epgcache_h_ +#define ENABLE_PRIVATE_EPG 1 +//#define ENABLE_MHW_EPG 1 + #ifndef SWIG +/* Test for gcc >= maj.min, as per __GNUC_PREREQ in glibc */ +#if defined (__GNUC__) && defined (__GNUC_MINOR__) +#define __GNUC_PREREQ(maj, min) \ + ((__GNUC__ << 16) + __GNUC_MINOR__ >= ((maj) << 16) + (min)) +#else +#define __GNUC_PREREQ(maj, min) 0 +#endif + #include #include +#if 0 && __GNUC_PREREQ(4,3) +#include +#include +#else #include #include +#endif #include #include #include +#ifdef ENABLE_MHW_EPG +#include +#endif #include #include #include @@ -19,6 +38,7 @@ #include #include #include +#include #define CLEAN_INTERVAL 60000 // 1 min #define UPDATE_INTERVAL 3600000 // 60 min @@ -28,6 +48,7 @@ class eventData; class eServiceReferenceDVB; +class eDVBServicePMTHandler; struct uniqueEPGKey { @@ -84,20 +105,34 @@ struct hash_uniqueEPGKey }; #define tidMap std::set<__u32> -#if defined(__GNUC__) && ((__GNUC__ == 3 && __GNUC_MINOR__ >= 1) || __GNUC__ == 4 ) // check if gcc version >= 3.1 +#if 0 && __GNUC_PREREQ(4,3) + #define eventCache std::unordered_map, hash_uniqueEPGKey, uniqueEPGKey::equal> + #ifdef ENABLE_PRIVATE_EPG + #define contentTimeMap std::unordered_map > + #define contentMap std::unordered_map + #define contentMaps std::unordered_map + #endif +#elif __GNUC_PREREQ(3,1) #define eventCache __gnu_cxx::hash_map, hash_uniqueEPGKey, uniqueEPGKey::equal> + #ifdef ENABLE_PRIVATE_EPG + #define contentTimeMap __gnu_cxx::hash_map > + #define contentMap __gnu_cxx::hash_map + #define contentMaps __gnu_cxx::hash_map + #endif #else // for older gcc use following #define eventCache std::hash_map, hash_uniqueEPGKey, uniqueEPGKey::equal > + #ifdef ENABLE_PRIVATE_EPG + #define contentTimeMap std::hash_map > + #define contentMap std::hash_map + #define contentMaps std::hash_map + #endif #endif #define descriptorPair std::pair #define descriptorMap std::map<__u32, descriptorPair > -#endif // SWIG - class eventData { -#ifndef SWIG friend class eEPGCache; private: __u8* EITdata; @@ -108,17 +143,14 @@ private: static int CacheSize; static void load(FILE *); static void save(FILE *); -#endif // SWIG public: eventData(const eit_event_struct* e=NULL, int size=0, int type=0); ~eventData(); -#ifndef SWIG const eit_event_struct* get() const; operator const eit_event_struct*() const { return get(); } -#endif int getEventID() { return (EITdata[0] << 8) | EITdata[1]; @@ -130,8 +162,9 @@ public: int getDuration() { return fromBCD(EITdata[7])*3600+fromBCD(EITdata[8])*60+fromBCD(EITdata[9]); - } + } }; +#endif class eEPGCache: public eMainloop, private eThread, public Object { @@ -139,23 +172,68 @@ class eEPGCache: public eMainloop, private eThread, public Object DECLARE_REF(eEPGCache) struct channel_data: public Object { + pthread_mutex_t channel_active; channel_data(eEPGCache*); eEPGCache *cache; - eTimer abortTimer, zapTimer; - __u8 state, isRunning, haveData, can_delete; + ePtr abortTimer, zapTimer; + int prevChannelState; + __u8 state, isRunning, haveData; ePtr channel; - ePtr m_stateChangedConn, m_NowNextConn, m_ScheduleConn, m_ScheduleOtherConn; - ePtr m_NowNextReader, m_ScheduleReader, m_ScheduleOtherReader; - tidMap seenSections[3], calcedSections[3]; + ePtr m_stateChangedConn, m_NowNextConn, m_ScheduleConn, m_ScheduleOtherConn, m_ViasatConn; + ePtr m_NowNextReader, m_ScheduleReader, m_ScheduleOtherReader, m_ViasatReader; + tidMap seenSections[4], calcedSections[4]; +#ifdef ENABLE_PRIVATE_EPG + ePtr startPrivateTimer; + int m_PrevVersion; + int m_PrivatePid; + uniqueEPGKey m_PrivateService; + ePtr m_PrivateConn; + ePtr m_PrivateReader; + std::set<__u8> seenPrivateSections; + void readPrivateData(const __u8 *data); + void startPrivateReader(); +#endif +#ifdef ENABLE_MHW_EPG + std::vector m_channels; + std::map<__u8, mhw_theme_name_t> m_themes; + std::map<__u32, mhw_title_t> m_titles; + std::multimap<__u32, __u32> m_program_ids; + ePtr m_MHWConn, m_MHWConn2; + ePtr m_MHWReader, m_MHWReader2; + eDVBSectionFilterMask m_MHWFilterMask, m_MHWFilterMask2; + ePtr m_MHWTimeoutTimer; + __u16 m_mhw2_channel_pid, m_mhw2_title_pid, m_mhw2_summary_pid; + bool m_MHWTimeoutet; + void MHWTimeout() { m_MHWTimeoutet=true; } + void readMHWData(const __u8 *data); + void readMHWData2(const __u8 *data); + void startMHWReader(__u16 pid, __u8 tid); + void startMHWReader2(__u16 pid, __u8 tid, int ext=-1); + void startTimeout(int msek); + bool checkTimeout() { return m_MHWTimeoutet; } + void cleanup(); + __u8 *delimitName( __u8 *in, __u8 *out, int len_in ); + void timeMHW2DVB( u_char hours, u_char minutes, u_char *return_time); + void timeMHW2DVB( int minutes, u_char *return_time); + void timeMHW2DVB( u_char day, u_char hours, u_char minutes, u_char *return_time); + void storeTitle(std::map<__u32, mhw_title_t>::iterator itTitle, std::string sumText, const __u8 *data); +#endif void readData(const __u8 *data); + void readDataViasat(const __u8 *data); void startChannel(); void startEPG(); bool finishEPG(); void abortEPG(); void abortNonAvail(); }; + bool FixOverlapping(std::pair &servicemap, time_t TM, int duration, const timeMap::iterator &tm_it, const uniqueEPGKey &service); public: - enum {NOWNEXT=1, SCHEDULE=2, SCHEDULE_OTHER=4}; + enum {PRIVATE=0, NOWNEXT=1, SCHEDULE=2, SCHEDULE_OTHER=4 +#ifdef ENABLE_MHW_EPG + ,MHW=8 +#endif + ,VIASAT=16 + }; struct Message { enum @@ -163,11 +241,11 @@ public: flush, startChannel, leaveChannel, - pause, - restart, - updated, - isavail, quit, + got_private_pid, + got_mhw2_channel_pid, + got_mhw2_title_pid, + got_mhw2_summary_pid, timeChanged }; int type; @@ -177,6 +255,7 @@ public: int err; time_t time; bool avail; + int pid; }; Message() :type(0), time(0) {} @@ -196,7 +275,7 @@ private: friend class channel_data; static eEPGCache *instance; - eTimer cleanTimer; + ePtr cleanTimer; std::map m_knownChannels; ePtr m_chanAddedConn; @@ -204,11 +283,18 @@ private: updateMap channelLastUpdated; static pthread_mutex_t cache_lock, channel_map_lock; +#ifdef ENABLE_PRIVATE_EPG + contentMaps content_time_tables; +#endif + void thread(); // thread function // called from epgcache thread void save(); void load(); +#ifdef ENABLE_PRIVATE_EPG + void privateSectionRead(const uniqueEPGKey &, const __u8 *); +#endif void sectionRead(const __u8 *data, int source, channel_data *channel); void gotMessage(const Message &message); void flushEPG(const uniqueEPGKey & s=uniqueEPGKey()); @@ -221,12 +307,24 @@ private: void DVBChannelRunning(iDVBChannel *); timeMap::iterator m_timemap_cursor, m_timemap_end; + int currentQueryTsidOnid; // needed for getNextTimeEntry.. only valid until next startTimeQuery call +#else + eEPGCache(); + ~eEPGCache(); #endif // SWIG public: static eEPGCache *getInstance() { return instance; } +#ifndef SWIG eEPGCache(); ~eEPGCache(); +#ifdef ENABLE_PRIVATE_EPG + void PMTready(eDVBServicePMTHandler *pmthandler); +#else + void PMTready(eDVBServicePMTHandler *pmthandler) {} +#endif + +#endif // called from main thread inline void Lock(); inline void Unlock(); @@ -234,30 +332,41 @@ public: // at moment just for one service.. RESULT startTimeQuery(const eServiceReference &service, time_t begin=-1, int minutes=-1); +#ifndef SWIG // eventData's are plain entrys out of the cache.. it's not safe to use them after cache unlock // but its faster in use... its not allowed to delete this pointers via delete or free.. - SWIG_VOID(RESULT) lookupEventId(const eServiceReference &service, int event_id, const eventData *&SWIG_OUTPUT); - SWIG_VOID(RESULT) lookupEventTime(const eServiceReference &service, time_t, const eventData *&SWIG_OUTPUT); - SWIG_VOID(RESULT) getNextTimeEntry(const eventData *&SWIG_OUTPUT); + RESULT lookupEventId(const eServiceReference &service, int event_id, const eventData *&); + RESULT lookupEventTime(const eServiceReference &service, time_t, const eventData *&, int direction=0); + RESULT getNextTimeEntry(const eventData *&); -#ifndef SWIG // eit_event_struct's are plain dvb eit_events .. it's not safe to use them after cache unlock // its not allowed to delete this pointers via delete or free.. RESULT lookupEventId(const eServiceReference &service, int event_id, const eit_event_struct *&); - RESULT lookupEventTime(const eServiceReference &service, time_t , const eit_event_struct *&); + RESULT lookupEventTime(const eServiceReference &service, time_t , const eit_event_struct *&, int direction=0); RESULT getNextTimeEntry(const eit_event_struct *&); // Event's are parsed epg events.. it's safe to use them after cache unlock // after use this Events must be deleted (memleaks) RESULT lookupEventId(const eServiceReference &service, int event_id, Event* &); - RESULT lookupEventTime(const eServiceReference &service, time_t, Event* &); + RESULT lookupEventTime(const eServiceReference &service, time_t, Event* &, int direction=0); RESULT getNextTimeEntry(Event *&); #endif + enum { + SIMILAR_BROADCASTINGS_SEARCH, + EXAKT_TITLE_SEARCH, + PARTIAL_TITLE_SEARCH + }; + enum { + CASE_CHECK, + NO_CASE_CHECK + }; + PyObject *lookupEvent(SWIG_PYOBJECT(ePyObject) list, SWIG_PYOBJECT(ePyObject) convertFunc=(PyObject*)0); + PyObject *search(SWIG_PYOBJECT(ePyObject)); // eServiceEvent are parsed epg events.. it's safe to use them after cache unlock // for use from python ( members: m_start_time, m_duration, m_short_description, m_extended_description ) SWIG_VOID(RESULT) lookupEventId(const eServiceReference &service, int event_id, ePtr &SWIG_OUTPUT); - SWIG_VOID(RESULT) lookupEventTime(const eServiceReference &service, time_t, ePtr &SWIG_OUTPUT); + SWIG_VOID(RESULT) lookupEventTime(const eServiceReference &service, time_t, ePtr &SWIG_OUTPUT, int direction=0); SWIG_VOID(RESULT) getNextTimeEntry(ePtr &SWIG_OUTPUT); };