#ifndef __epgcache_h_
#define __epgcache_h_
+#define ENABLE_PRIVATE_EPG 1
+#define NEED_DEMUX_WORKAROUND 1
+
+#ifndef SWIG
+
#include <vector>
#include <list>
#include <ext/hash_map>
#include <lib/base/ebase.h>
#include <lib/base/thread.h>
#include <lib/base/message.h>
+#include <lib/service/event.h>
+#include <lib/python/python.h>
#define CLEAN_INTERVAL 60000 // 1 min
#define UPDATE_INTERVAL 3600000 // 60 min
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()
#define channelMapIterator std::map<iDVBChannel*, channel_data*>::iterator
#define updateMap std::map<eDVBChannelID, time_t>
-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
}
};
+#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<uniqueEPGKey, std::pair<eventMap, timeMap>, 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<time_t, std::pair<time_t, __u16> >
+ #define contentMap __gnu_cxx::hash_map<int, contentTimeMap >
+ #define contentMaps __gnu_cxx::hash_map<uniqueEPGKey, contentMap, hash_uniqueEPGKey, uniqueEPGKey::equal >
+ #endif
#else // for older gcc use following
#define eventCache std::hash_map<uniqueEPGKey, std::pair<eventMap, timeMap>, hash_uniqueEPGKey, uniqueEPGKey::equal >
- #define tidMap std::hash_map<__u32, hash_32, equal_32>
+ #ifdef ENABLE_PRIVATE_EPG
+ #define contentTimeMap std::hash_map<time_t, std::pair<time_t, __u16> >
+ #define contentMap std::hash_map<int, contentTimeMap >
+ #define contentMaps std::hash_map<uniqueEPGKey, contentMap, hash_uniqueEPGKey, uniqueEPGKey::equal>
+ #endif
#endif
+#define descriptorPair std::pair<int,__u8*>
+#define descriptorMap std::map<__u32, descriptorPair >
+
class eventData
{
- friend class eEPGCache;
+ friend class eEPGCache;
private:
__u8* EITdata;
- int ByteSize;
-public:
- int type;
+ __u8 ByteSize;
+ __u8 type;
+ static descriptorMap descriptors;
+ static __u8 data[4108];
static int CacheSize;
- eventData(const eit_event_struct* e, int size, int type)
- :ByteSize(size), type(type)
- {
- CacheSize+=size;
- EITdata = new __u8[size];
- if (e)
- memcpy(EITdata, (__u8*) e, size);
- }
- ~eventData()
- {
- CacheSize-=ByteSize;
- delete [] EITdata;
- }
+ static void load(FILE *);
+ static void save(FILE *);
+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
{
- return (const eit_event_struct*) EITdata;
- }
- const eit_event_struct* get() const
- {
- return (const eit_event_struct*) EITdata;
+ return get();
}
int getEventID()
{
- return HILO( ((const eit_event_struct*) EITdata)->event_id );
+ return (EITdata[0] << 8) | EITdata[1];
}
time_t getStartTime()
{
- return parseDVBtime(
- EITdata[2], EITdata[3],
- EITdata[4], EITdata[5], EITdata[6]);
+ return parseDVBtime(EITdata[2], EITdata[3], EITdata[4], EITdata[5], EITdata[6]);
}
+ 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<eDVBChannel> channel;
ePtr<eConnection> m_stateChangedConn, m_NowNextConn, m_ScheduleConn, m_ScheduleOtherConn;
ePtr<iDVBSectionReader> 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<eConnection> m_PrivateConn;
+ ePtr<iDVBSectionReader> 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();
updated,
isavail,
quit,
+ got_private_pid,
timeChanged
};
int type;
int err;
time_t time;
bool avail;
+ int pid;
};
Message()
:type(0), time(0) {}
: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) {}
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());
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<eEPGCache> &ptr);
+ static eEPGCache *getInstance() { return instance; }
+#ifndef SWIG
eEPGCache();
~eEPGCache();
+#endif
// called from main thread
inline void Lock();
inline void Unlock();
- Event *lookupEvent(const eServiceReferenceDVB &service, int event_id, bool plain=false );
- Event *lookupEvent(const eServiceReferenceDVB &service, time_t=0, bool plain=false );
- const eventMap* getEventMap(const eServiceReferenceDVB &service);
- const timeMap* getTimeMap(const eServiceReferenceDVB &service);
-};
+#ifdef ENABLE_PRIVATE_EPG
+ void PMTready(eDVBServicePMTHandler *pmthandler);
+#else
+ void PMTready(eDVBServicePMTHandler *pmthandler) {}
+#endif
-TEMPLATE_TYPEDEF(ePtr<eEPGCache>,eEPGCachePtr);
+ // at moment just for one service..
+ RESULT startTimeQuery(const eServiceReference &service, time_t begin=-1, int minutes=-1);
-inline const eventMap* eEPGCache::getEventMap(const eServiceReferenceDVB &service)
-{
- eventCache::iterator It = eventDB.find( service );
- if ( It != eventDB.end() && It->second.first.size() )
- return &(It->second.first);
- else
- return 0;
-}
+#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);
-inline const timeMap* eEPGCache::getTimeMap(const eServiceReferenceDVB &service)
-{
- eventCache::iterator It = eventDB.find( service );
- if ( It != eventDB.end() && It->second.second.size() )
- return &(It->second.second);
- else
- return 0;
-}
+ // 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);
+
+ // 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<eServiceEvent> &SWIG_OUTPUT);
+ SWIG_VOID(RESULT) lookupEventTime(const eServiceReference &service, time_t, ePtr<eServiceEvent> &SWIG_OUTPUT, int direction=0);
+ SWIG_VOID(RESULT) getNextTimeEntry(ePtr<eServiceEvent> &SWIG_OUTPUT);
+};
+
+#ifndef SWIG
inline void eEPGCache::Lock()
{
pthread_mutex_lock(&cache_lock);
{
pthread_mutex_unlock(&cache_lock);
}
+#endif
#endif
git.cweiske.de / enigma2.git / blobdiff