}
else
{
- RESULT res;
- data.m_NowNextReader = new eDVBSectionReader( demux, this, res );
+ RESULT res = demux->createSectionReader( this, data.m_NowNextReader );
if ( res )
{
eDebug("[eEPGCache] couldnt initialize nownext reader!!");
return;
}
data.m_NowNextReader->connectRead(slot(data, &eEPGCache::channel_data::readData), data.m_NowNextConn);
- data.m_ScheduleReader = new eDVBSectionReader( demux, this, res );
+ res = demux->createSectionReader( this, data.m_ScheduleReader );
if ( res )
{
eDebug("[eEPGCache] couldnt initialize schedule reader!!");
return;
}
data.m_ScheduleReader->connectRead(slot(data, &eEPGCache::channel_data::readData), data.m_ScheduleConn);
- data.m_ScheduleOtherReader = new eDVBSectionReader( demux, this, res );
+ res = demux->createSectionReader( this, data.m_ScheduleOtherReader );
if ( res )
{
eDebug("[eEPGCache] couldnt initialize schedule other reader!!");
}
}
-int eEPGCache::sectionRead(const __u8 *data, int source, channel_data *channel)
+void eEPGCache::sectionRead(const __u8 *data, int source, channel_data *channel)
{
eit_t *eit = (eit_t*) data;
int len=HILO(eit->section_length)-1;//+3-4;
int ptr=EIT_SIZE;
if ( ptr >= len )
- return 0;
+ return;
- //
// This fixed the EPG on the Multichoice irdeto systems
// the EIT packet is non-compliant.. their EIT packet stinks
if ( data[ptr-1] < 0x40 )
int duration;
time_t TM = parseDVBtime( eit_event->start_time_1, eit_event->start_time_2, eit_event->start_time_3, eit_event->start_time_4, eit_event->start_time_5);
-// FIXME !!! TIME CORRECTION !
time_t now = time(0)+eDVBLocalTimeHandler::getInstance()->difference();
if ( TM != 3599 && TM > -1)
int ev_erase_count = 0;
int tm_erase_count = 0;
-// search in eventmap
+ // search in eventmap
eventMap::iterator ev_it =
servicemap.first.find(event_id);
if ( source > ev_it->second->type ) // update needed ?
goto next; // when not.. the skip this entry
-// search this event in timemap
+ // search this event in timemap
timeMap::iterator tm_it_tmp =
servicemap.second.find(ev_it->second->getStartTime());
}
}
-// search in timemap, for check of a case if new time has coincided with time of other event
-// or event was is not found in eventmap
+ // search in timemap, for check of a case if new time has coincided with time of other event
+ // or event was is not found in eventmap
timeMap::iterator tm_it =
servicemap.second.find(TM);
if ( tm_it != servicemap.second.end() )
{
-// i think, if event is not found on eventmap, but found on timemap updating nevertheless demands
+ // i think, if event is not found on eventmap, but found on timemap updating nevertheless demands
#if 0
if ( source > tm_it->second->type && tm_erase_count == 0 ) // update needed ?
goto next; // when not.. the skip this entry
#endif
-// search this time in eventmap
+ // search this time in eventmap
eventMap::iterator ev_it_tmp =
servicemap.first.find(tm_it->second->getEventID());
i=0;
for (timeMap::iterator it(servicemap.second.begin())
; it != servicemap.second.end(); ++it )
- fprintf(f, "%d(key %d) -> time %d, event_id %d, data %p\n",
- i++, (int)it->first, (int)it->second->getStartTime(), (int)it->second->getEventID(), it->second );
+ fprintf(f, "%d(key %d) -> time %d, event_id %d, data %p\n",
+ i++, (int)it->first, (int)it->second->getStartTime(), (int)it->second->getEventID(), it->second );
fclose(f);
eFatal("(1)map sizes not equal :( sid %04x tsid %04x onid %04x size %d size2 %d",
ptr += eit_event_size;
eit_event=(eit_event_struct*)(((__u8*)eit_event)+eit_event_size);
}
-
- return 0;
}
void eEPGCache::flushEPG(const uniqueEPGKey & s)
eDebug("[EPGC] stop caching events");
zapTimer.start(UPDATE_INTERVAL, 1);
eDebug("[EPGC] next update in %i min", UPDATE_INTERVAL / 60000);
-
+ seenSections.clear();
+ calcedSections.clear();
singleLock l(cache->cache_lock);
cache->channelLastUpdated[channel->getChannelID()] = time(0)+eDVBLocalTimeHandler::getInstance()->difference();
can_delete=1;
state=0;
haveData=0;
can_delete=0;
+ seenSections.clear();
+ calcedSections.clear();
eDVBSectionFilterMask mask;
memset(&mask, 0, sizeof(mask));
m_ScheduleOtherReader->start(mask);
isRunning |= SCHEDULE_OTHER;
- abortTimer.start(5000,true);
+ abortTimer.start(7000,true);
}
void eEPGCache::channel_data::abortNonAvail()
m_ScheduleOtherReader->stop();
}
if ( isRunning )
- abortTimer.start(20000, true);
+ abortTimer.start(50000, true);
else
- finishEPG();
+ {
+ ++state;
+ seenSections.clear();
+ calcedSections.clear();
+ can_delete=1;
+ }
}
++state;
}
void eEPGCache::channel_data::abortEPG()
{
+ seenSections.clear();
+ calcedSections.clear();
abortTimer.stop();
zapTimer.stop();
if (isRunning)
else
{
int source = data[0] > 0x5F ? eEPGCache::SCHEDULE_OTHER : data[0] > 0x4F ? eEPGCache::SCHEDULE : eEPGCache::NOWNEXT;
- if ( state == 2 )
+ if ( state == 1 && calcedSections == seenSections || state > 1 )
{
iDVBSectionReader *reader=NULL;
switch (source)
finishEPG();
}
else
- cache->sectionRead(data, source, this);
+ {
+ eit_t *eit = (eit_t*) data;
+ __u32 sectionNo = data[0] << 24;
+ sectionNo |= data[3] << 16;
+ sectionNo |= data[4] << 8;
+ sectionNo |= eit->section_number;
+
+ tidMap::iterator it =
+ seenSections.find(sectionNo);
+
+ if ( it == seenSections.end() )
+ {
+ seenSections.insert(sectionNo);
+ __u32 tmpval = sectionNo & 0xFFFFFF00;
+ __u8 incr = source == NOWNEXT ? 1 : 8;
+ for ( int i = 0; i <= eit->last_section_number; i+=incr )
+ {
+ if ( i == eit->section_number )
+ {
+ for (int x=i; x <= eit->segment_last_section_number; ++x)
+ calcedSections.insert(tmpval|(x&0xFF));
+ }
+ else
+ calcedSections.insert(tmpval|(i&0xFF));
+ }
+ cache->sectionRead(data, source, this);
+ }
+ }
}
}
#include <vector>
#include <list>
#include <ext/hash_map>
+#include <ext/hash_set>
-// check if gcc version >= 3.4
-#if defined(__GNUC__) && ((__GNUC__ == 3 && __GNUC_MINOR__ >= 4) || __GNUC__ == 4 )
-#else
-#include <ext/stl_hash_fun.h>
-#endif
#include <errno.h>
#include <lib/dvb/eit.h>
#define timeMap std::map<time_t, eventData*>
#define channelMapIterator std::map<iDVBChannel*, channel_data*>::iterator
-
-#define tmpMap std::map<uniqueEPGKey, std::pair<time_t, int> >
#define updateMap std::map<eDVBChannelID, time_t>
-#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>, __gnu_cxx::hash<uniqueEPGKey>, uniqueEPGKey::equal>
- namespace __gnu_cxx
-#else // for older gcc use following
- #define eventCache std::hash_map<uniqueEPGKey, std::pair<eventMap, timeMap>, std::hash<uniqueEPGKey>, uniqueEPGKey::equal >
- namespace std
-#endif
+struct hash_32
{
-template<> struct hash<uniqueEPGKey>
+ 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
{
- return (x.tsid << 16) | x.onid;
+ return (x.onid << 16) | x.tsid;
}
};
-}
+
+#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>
+#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>
+#endif
class eventData
{
ePtr<eDVBChannel> channel;
ePtr<eConnection> m_stateChangedConn, m_NowNextConn, m_ScheduleConn, m_ScheduleOtherConn;
ePtr<iDVBSectionReader> m_NowNextReader, m_ScheduleReader, m_ScheduleOtherReader;
+ tidMap seenSections, calcedSections;
void readData(const __u8 *data);
void startChannel();
void startEPG();
// called from epgcache thread
void save();
void load();
- int sectionRead(const __u8 *data, int source, channel_data *channel);
+ void sectionRead(const __u8 *data, int source, channel_data *channel);
void gotMessage(const Message &message);
void flushEPG(const uniqueEPGKey & s=uniqueEPGKey());
void cleanLoop();
projects / vuplus_dvbapp / commitdiff