X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/a434abbb775f2b4083ab0c7a7570ec14bd1cbce9..bafa2efb0fcfef6e502552345243ddd7164d3a0b:/lib/dvb/epgcache.h diff --git a/lib/dvb/epgcache.h b/lib/dvb/epgcache.h index 8a62325d..9f94d5ca 100644 --- a/lib/dvb/epgcache.h +++ b/lib/dvb/epgcache.h @@ -1,6 +1,11 @@ #ifndef __epgcache_h_ #define __epgcache_h_ +#define ENABLE_PRIVATE_EPG 1 +#define NEED_DEMUX_WORKAROUND 1 + +#ifndef SWIG + #include #include #include @@ -16,6 +21,8 @@ #include #include #include +#include +#include #define CLEAN_INTERVAL 60000 // 1 min #define UPDATE_INTERVAL 3600000 // 60 min @@ -25,14 +32,15 @@ class eventData; class eServiceReferenceDVB; +class eDVBServicePMTHandler; struct uniqueEPGKey { int sid, onid, tsid; - uniqueEPGKey( const eServiceReferenceDVB &ref ) - :sid( ref.type != eServiceReference::idInvalid ? ref.getServiceID().get() : -1 ) - ,onid( ref.type != eServiceReference::idInvalid ? ref.getOriginalNetworkID().get() : -1 ) - ,tsid( ref.type != eServiceReference::idInvalid ? ref.getTransportStreamID().get() : -1 ) + uniqueEPGKey( const eServiceReference &ref ) + :sid( ref.type != eServiceReference::idInvalid ? ((eServiceReferenceDVB&)ref).getServiceID().get() : -1 ) + ,onid( ref.type != eServiceReference::idInvalid ? ((eServiceReferenceDVB&)ref).getOriginalNetworkID().get() : -1 ) + ,tsid( ref.type != eServiceReference::idInvalid ? ((eServiceReferenceDVB&)ref).getTransportStreamID().get() : -1 ) { } uniqueEPGKey() @@ -72,22 +80,6 @@ struct uniqueEPGKey #define channelMapIterator std::map::iterator #define updateMap std::map -struct hash_32 -{ - inline size_t operator()( const __u32 &x) const - { - return (x >> 8)&0xFFFF; - } -}; - -struct equal_32 -{ - inline size_t operator()(const __u32 &x, const __u32 &y) const - { - return x == y; - } -}; - struct hash_uniqueEPGKey { inline size_t operator()( const uniqueEPGKey &x) const @@ -96,12 +88,21 @@ struct hash_uniqueEPGKey } }; +#define tidMap std::set<__u32> #if defined(__GNUC__) && ((__GNUC__ == 3 && __GNUC_MINOR__ >= 1) || __GNUC__ == 4 ) // check if gcc version >= 3.1 #define eventCache __gnu_cxx::hash_map, hash_uniqueEPGKey, uniqueEPGKey::equal> - #define tidMap __gnu_cxx::hash_set<__u32, hash_32, equal_32> + #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 > - #define tidMap std::hash_map<__u32, hash_32, equal_32> + #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 @@ -109,17 +110,18 @@ struct hash_uniqueEPGKey class eventData { - friend class eEPGCache; + friend class eEPGCache; private: __u8* EITdata; - int ByteSize; + __u8 ByteSize; + __u8 type; static descriptorMap descriptors; -public: - int type; + static __u8 data[4108]; static int CacheSize; static void load(FILE *); static void save(FILE *); - eventData(const eit_event_struct* e, int size, int type); +public: + eventData(const eit_event_struct* e=NULL, int size=0, int type=0); ~eventData(); const eit_event_struct* get() const; operator const eit_event_struct*() const @@ -137,22 +139,37 @@ public: int getDuration() { return fromBCD(EITdata[7])*3600+fromBCD(EITdata[8])*60+fromBCD(EITdata[9]); - } + } }; +#endif class eEPGCache: public eMainloop, private eThread, public Object { +#ifndef SWIG DECLARE_REF(eEPGCache) struct channel_data: public Object { channel_data(eEPGCache*); eEPGCache *cache; eTimer abortTimer, zapTimer; + int prevChannelState; __u8 state, isRunning, haveData, can_delete; ePtr channel; ePtr m_stateChangedConn, m_NowNextConn, m_ScheduleConn, m_ScheduleOtherConn; ePtr m_NowNextReader, m_ScheduleReader, m_ScheduleOtherReader; tidMap seenSections[3], calcedSections[3]; +#ifdef ENABLE_PRIVATE_EPG +#ifdef NEED_DEMUX_WORKAROUND + int m_PrevVersion; +#endif + int m_PrivatePid; + uniqueEPGKey m_PrivateService; + ePtr m_PrivateConn; + ePtr m_PrivateReader; + std::set<__u8> seenPrivateSections; + void readPrivateData(const __u8 *data); + void startPrivateReader(int pid, int version); +#endif void readData(const __u8 *data); void startChannel(); void startEPG(); @@ -174,6 +191,7 @@ public: updated, isavail, quit, + got_private_pid, timeChanged }; int type; @@ -183,6 +201,7 @@ public: int err; time_t time; bool avail; + int pid; }; Message() :type(0), time(0) {} @@ -192,7 +211,7 @@ public: :type(type), avail(b) {} Message(int type, iDVBChannel *channel, int err=0) :type(type), channel(channel), err(err) {} - Message(int type, const eServiceReferenceDVB& service, int err=0) + Message(int type, const eServiceReference& service, int err=0) :type(type), service(service), err(err) {} Message(int type, time_t time) :type(type), time(time) {} @@ -210,11 +229,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()); @@ -225,74 +251,61 @@ private: void DVBChannelAdded(eDVBChannel*); void DVBChannelStateChanged(iDVBChannel*); 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 RESULT getInstance(ePtr &ptr); + static eEPGCache *getInstance() { return instance; } +#ifndef SWIG eEPGCache(); ~eEPGCache(); +#endif // called from main thread inline void Lock(); inline void Unlock(); +#ifdef ENABLE_PRIVATE_EPG + void PMTready(eDVBServicePMTHandler *pmthandler); +#else + void PMTready(eDVBServicePMTHandler *pmthandler) {} +#endif - // result Event * must be deleted by caller of lookupEvent - inline RESULT lookupEvent(const eServiceReferenceDVB &service, int event_id, Event *& ); - inline RESULT lookupEvent(const eServiceReferenceDVB &service, time_t , Event *& ); - - // methods for faster use.. but not thread save .. - // Lock and Unlock should be used !! - RESULT lookupEvent(const eServiceReferenceDVB &service, int event_id, const eventData *& ); - RESULT lookupEvent(const eServiceReferenceDVB &service, time_t , const eventData *& ); + // 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, int direction=0); + SWIG_VOID(RESULT) getNextTimeEntry(const eventData *&SWIG_OUTPUT); + + // 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 *&, 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* &, int direction=0); + RESULT getNextTimeEntry(Event *&); +#endif + PyObject *lookupEvent(PyObject *list, PyObject *convertFunc=NULL); - inline RESULT getEventMap(const eServiceReferenceDVB &service, const eventMap *& ); - inline RESULT getTimeMap(const eServiceReferenceDVB &service, const timeMap *& ); + // 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, int direction=0); + SWIG_VOID(RESULT) getNextTimeEntry(ePtr &SWIG_OUTPUT); }; -TEMPLATE_TYPEDEF(ePtr,eEPGCachePtr); - -inline RESULT eEPGCache::lookupEvent(const eServiceReferenceDVB &service, time_t t, Event *& result ) -{ - const eventData *data=0; - RESULT ret = lookupEvent(service, t, data); - if ( !ret && data ) - result = new Event((uint8_t*)data->get()); - return ret; -} - -inline RESULT eEPGCache::lookupEvent(const eServiceReferenceDVB &service, int event_id, Event *& result) -{ - const eventData *data=0; - RESULT ret = lookupEvent(service, event_id, data); - if ( !ret && data ) - result = new Event((uint8_t*)data->get()); - return ret; -} - -inline RESULT eEPGCache::getEventMap(const eServiceReferenceDVB &service, const eventMap *& result) -{ - eventCache::iterator It = eventDB.find( service ); - if ( It != eventDB.end() && It->second.first.size() ) - { - result=&(It->second.first); - return 0; - } - else - result=0; - return -1; -} - -inline RESULT eEPGCache::getTimeMap(const eServiceReferenceDVB &service, const timeMap *& result) -{ - eventCache::iterator It = eventDB.find( service ); - if ( It != eventDB.end() && It->second.second.size() ) - { - result=&(It->second.second); - return 0; - } - else - result=0; - return -1; -} - +#ifndef SWIG inline void eEPGCache::Lock() { pthread_mutex_lock(&cache_lock); @@ -302,5 +315,6 @@ inline void eEPGCache::Unlock() { pthread_mutex_unlock(&cache_lock); } +#endif #endif