X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/7273e47b06dacbd32e145e19728e09d9d86e7a6e..48dce974f57f2a7f875787c2bbcb594531dce1c0:/lib/dvb/epgcache.cpp diff --git a/lib/dvb/epgcache.cpp b/lib/dvb/epgcache.cpp index c22bf89e..e3a45856 100644 --- a/lib/dvb/epgcache.cpp +++ b/lib/dvb/epgcache.cpp @@ -8,68 +8,64 @@ #include // for statfs // #include #include +#include int eventData::CacheSize=0; descriptorMap eventData::descriptors; - +__u8 eventData::data[4108]; extern const uint32_t crc32_table[256]; eventData::eventData(const eit_event_struct* e, int size, int type) - :ByteSize(size), type(type) + :ByteSize(size&0xFF), type(type&0xFF) { if (!e) return; - std::list<__u32> d; + + __u32 descr[65]; + __u32 *pdescr=descr; + __u8 *data = (__u8*)e; int ptr=10; int descriptors_length = (data[ptr++]&0x0F) << 8; descriptors_length |= data[ptr++]; while ( descriptors_length > 0 ) { - int descr_len = data[ptr+1] + 2; - __u8 *descr = new __u8[descr_len]; - unsigned int crc=0; + __u8 *descr = data+ptr; + int descr_len = descr[1]+2; + + __u32 crc = 0; int cnt=0; - while(cnt < descr_len && descriptors_length > 0) - { - crc = (crc << 8) ^ crc32_table[((crc >> 24) ^ data[ptr]) & 0xff]; - descr[cnt++] = data[ptr++]; - --descriptors_length; - } + while(cnt++ < descr_len) + crc = (crc << 8) ^ crc32_table[((crc >> 24) ^ data[ptr++]) & 0xFF]; + descriptorMap::iterator it = descriptors.find(crc); if ( it == descriptors.end() ) { CacheSize+=descr_len; - descriptors[crc] = descriptorPair(1, descr); + __u8 *d = new __u8[descr_len]; + memcpy(d, descr, descr_len); + descriptors[crc] = descriptorPair(1, d); } else - { ++it->second.first; - delete [] descr; - } - d.push_back(crc); + + *pdescr++=crc; + descriptors_length -= descr_len; } - ByteSize = 12+d.size()*4; + ByteSize = 12+((pdescr-descr)*4); EITdata = new __u8[ByteSize]; CacheSize+=ByteSize; memcpy(EITdata, (__u8*) e, 12); - __u32 *p = (__u32*)(EITdata+12); - for (std::list<__u32>::iterator it(d.begin()); it != d.end(); ++it) - *p++ = *it; + memcpy(EITdata+12, descr, ByteSize-12); } const eit_event_struct* eventData::get() const { - static __u8 *data=NULL; - if ( data ) - delete [] data; - - int bytes = 12; - std::list<__u8*> d; - -// cnt needed bytes + int pos = 12; int tmp = ByteSize-12; + + memcpy(data, EITdata, 12); __u32 *p = (__u32*)(EITdata+12); while(tmp>0) { @@ -77,27 +73,14 @@ const eit_event_struct* eventData::get() const descriptors.find(*p++); if ( it != descriptors.end() ) { - d.push_back(it->second.second); - bytes += it->second.second[1]; + int b = it->second.second[1]+2; + memcpy(data+pos, it->second.second, b ); + pos += b; } - bytes += 2; // descr_type, descr_len tmp-=4; } -// copy eit_event header to buffer - data = new __u8[bytes]; - memcpy(data, EITdata, 12); - - tmp=12; -// copy all descriptors to buffer - for(std::list<__u8*>::iterator it(d.begin()); it != d.end(); ++it) - { - int b=(*it)[1]+2; - memcpy(data+tmp, *it, b); - tmp+=b; - } - - return (eit_event_struct*)data; + return (const eit_event_struct*)data; } eventData::~eventData() @@ -116,8 +99,8 @@ eventData::~eventData() descriptorPair &p = it->second; if (!--p.first) // no more used descriptor { - CacheSize -= p.second[1]+2; - delete [] p.second; // free descriptor memory + CacheSize -= it->second.second[1]; + delete [] it->second.second; // free descriptor memory descriptors.erase(it); // remove entry from descriptor map } } @@ -206,9 +189,10 @@ void eEPGCache::DVBChannelAdded(eDVBChannel *chan) { if ( chan ) { - eDebug("[eEPGCache] add channel %p", chan); +// eDebug("[eEPGCache] add channel %p", chan); channel_data *data = new channel_data(this); data->channel = chan; + data->prevChannelState = -1; singleLock s(channel_map_lock); m_knownChannels.insert( std::pair(chan, data) ); chan->connectStateChange(slot(*this, &eEPGCache::DVBChannelStateChanged), data->m_stateChangedConn); @@ -231,7 +215,7 @@ void eEPGCache::DVBChannelRunning(iDVBChannel *chan) else { ePtr demux; - if ( data.channel->getDemux(demux) ) + if ( data.channel->getDemux(demux, 0) ) { eDebug("[eEPGCache] no demux!!"); return; @@ -274,31 +258,31 @@ void eEPGCache::DVBChannelStateChanged(iDVBChannel *chan) { int state=0; chan->getState(state); - switch (state) + if ( it->second->prevChannelState != state ) { - case iDVBChannel::state_idle: - break; - case iDVBChannel::state_tuning: - break; - case iDVBChannel::state_unavailable: - break; - case iDVBChannel::state_ok: + switch (state) { - eDebug("[eEPGCache] channel %p running", chan); - DVBChannelRunning(chan); - break; - } - case iDVBChannel::state_release: - { - eDebug("[eEPGCache] remove channel %p", chan); - messages.send(Message(Message::leaveChannel, chan)); - while(!it->second->can_delete) - usleep(1000); - delete it->second; - m_knownChannels.erase(it); - // -> gotMessage -> abortEPG - break; + case iDVBChannel::state_ok: + { + eDebug("[eEPGCache] channel %p running", chan); + DVBChannelRunning(chan); + break; + } + case iDVBChannel::state_release: + { + eDebug("[eEPGCache] remove channel %p", chan); + messages.send(Message(Message::leaveChannel, chan)); + while(!it->second->can_delete) + usleep(1000); + delete it->second; + m_knownChannels.erase(it); + // -> gotMessage -> abortEPG + break; + } + default: // ignore all other events + return; } + it->second->prevChannelState = state; } } } @@ -597,70 +581,6 @@ eEPGCache::~eEPGCache() delete It->second; } -RESULT eEPGCache::lookupEvent(const eServiceReferenceDVB &service, int event_id, const eventData *&result ) -{ - singleLock s(cache_lock); - uniqueEPGKey key( service ); - - eventCache::iterator It = eventDB.find( key ); - if ( It != eventDB.end() && !It->second.first.empty() ) // entrys cached? - { - eventMap::iterator i( It->second.first.find( event_id )); - if ( i != It->second.first.end() ) - { - result = i->second; - return 0; - } - else - { - result = 0; - eDebug("event %04x not found in epgcache", event_id); - } - } - return -1; -} - -RESULT eEPGCache::lookupEvent(const eServiceReferenceDVB &service, time_t t, const eventData *&result ) -// if t == 0 we search the current event... -{ - singleLock s(cache_lock); - uniqueEPGKey key(service); - - // check if EPG for this service is ready... - eventCache::iterator It = eventDB.find( key ); - if ( It != eventDB.end() && !It->second.first.empty() ) // entrys cached ? - { - if (!t) - t = time(0)+eDVBLocalTimeHandler::getInstance()->difference(); - - timeMap::iterator i = It->second.second.lower_bound(t); - if ( i != It->second.second.end() ) - { - i--; - if ( i != It->second.second.end() ) - { - if ( t <= i->first+i->second->getDuration() ) - { - result = i->second; - return 0; - } - } - } - - for ( eventMap::iterator i( It->second.first.begin() ); i != It->second.first.end(); i++) - { - int duration = i->second->getDuration(); - time_t begTime = i->second->getStartTime(); - if ( t >= begTime && t <= begTime+duration) // then we have found - { - result = i->second; - return 0; - } - } - } - return -1; -} - void eEPGCache::gotMessage( const Message &msg ) { switch (msg.type) @@ -709,7 +629,6 @@ void eEPGCache::thread() void eEPGCache::load() { -#if 0 FILE *f = fopen("/hdd/epg.dat", "r"); if (f) { @@ -718,6 +637,7 @@ void eEPGCache::load() int size=0; int cnt=0; bool md5ok=false; +#if 0 if (!md5_file("/hdd/epg.dat", 1, md5)) { FILE *f = fopen("/hdd/epg.dat.md5", "r"); @@ -730,10 +650,11 @@ void eEPGCache::load() } } if ( md5ok ) +#endif { char text1[13]; fread( text1, 13, 1, f); - if ( !strncmp( text1, "ENIGMA_EPG_V2", 13) ) + if ( !strncmp( text1, "ENIGMA_EPG_V4", 13) ) { fread( &size, sizeof(int), 1, f); while(size--) @@ -746,11 +667,11 @@ void eEPGCache::load() fread( &size, sizeof(int), 1, f); while(size--) { - int len=0; - int type=0; + __u8 len=0; + __u8 type=0; eventData *event=0; - fread( &type, sizeof(int), 1, f); - fread( &len, sizeof(int), 1, f); + fread( &type, sizeof(__u8), 1, f); + fread( &len, sizeof(__u8), 1, f); event = new eventData(0, len, type); event->EITdata = new __u8[len]; eventData::CacheSize+=len; @@ -769,12 +690,10 @@ void eEPGCache::load() fclose(f); } } -#endif } void eEPGCache::save() { -#if 0 struct statfs s; off64_t tmp; if (statfs("/hdd", &s)<0) @@ -799,7 +718,7 @@ void eEPGCache::save() int cnt=0; if ( f ) { - const char *text = "ENIGMA_EPG_V2"; + const char *text = "ENIGMA_EPG_V4"; fwrite( text, 13, 1, f ); int size = eventDB.size(); fwrite( &size, sizeof(int), 1, f ); @@ -811,9 +730,9 @@ void eEPGCache::save() fwrite( &size, sizeof(int), 1, f); for (timeMap::iterator time_it(timemap.begin()); time_it != timemap.end(); ++time_it) { - int len = time_it->second->ByteSize; - fwrite( &time_it->second->type, sizeof(int), 1, f ); - fwrite( &len, sizeof(int), 1, f); + __u8 len = time_it->second->ByteSize; + fwrite( &time_it->second->type, sizeof(__u8), 1, f ); + fwrite( &len, sizeof(__u8), 1, f); fwrite( time_it->second->EITdata, len, 1, f); ++cnt; } @@ -821,6 +740,7 @@ void eEPGCache::save() eDebug("%d events written to /hdd/epg.dat", cnt); eventData::save(f); fclose(f); +#if 0 unsigned char md5[16]; if (!md5_file("/hdd/epg.dat", 1, md5)) { @@ -831,16 +751,8 @@ void eEPGCache::save() fclose(f); } } - } #endif -} - -RESULT eEPGCache::getInstance(ePtr &ptr) -{ - ptr = instance; - if (!ptr) - return -1; - return 0; + } } eEPGCache::channel_data::channel_data(eEPGCache *ml) @@ -1091,3 +1003,477 @@ void eEPGCache::channel_data::readData( const __u8 *data) } } } + +RESULT eEPGCache::lookupEventTime(const eServiceReference &service, time_t t, const eventData *&result ) +// if t == -1 we search the current event... +{ + singleLock s(cache_lock); + uniqueEPGKey key(service); + + // check if EPG for this service is ready... + eventCache::iterator It = eventDB.find( key ); + if ( It != eventDB.end() && !It->second.first.empty() ) // entrys cached ? + { + if (t==-1) + t = time(0)+eDVBLocalTimeHandler::getInstance()->difference(); + timeMap::iterator i = It->second.second.lower_bound(t); // find > or equal + if ( i != It->second.second.end() ) + { + if ( i->second->getStartTime() != t ) + { + timeMap::iterator x = i; + --x; + if ( x != It->second.second.end() ) + { + time_t start_time = x->second->getStartTime(); + if (t < start_time) + return -1; + if (t > (start_time+x->second->getDuration())) + return -1; + i = x; + } + else + return -1; + } + result = i->second; + return 0; + } + } + return -1; +} + +RESULT eEPGCache::lookupEventTime(const eServiceReference &service, time_t t, const eit_event_struct *&result ) +{ + singleLock s(cache_lock); + const eventData *data=0; + RESULT ret = lookupEventTime(service, t, data); + if ( !ret && data ) + result = data->get(); + return ret; +} + +RESULT eEPGCache::lookupEventTime(const eServiceReference &service, time_t t, Event *& result ) +{ + singleLock s(cache_lock); + const eventData *data=0; + RESULT ret = lookupEventTime(service, t, data); + if ( !ret && data ) + result = new Event((uint8_t*)data->get()); + return ret; +} + +RESULT eEPGCache::lookupEventTime(const eServiceReference &service, time_t t, ePtr &result ) +{ + singleLock s(cache_lock); + const eventData *data=0; + RESULT ret = lookupEventTime(service, t, data); + if ( !ret && data ) + { + Event ev((uint8_t*)data->get()); + result = new eServiceEvent(); + const eServiceReferenceDVB &ref = (const eServiceReferenceDVB&)service; + ret = result->parseFrom(&ev, (ref.getTransportStreamID().get()<<16)|ref.getOriginalNetworkID().get()); + } + return ret; +} + +RESULT eEPGCache::lookupEventId(const eServiceReference &service, int event_id, const eventData *&result ) +{ + singleLock s(cache_lock); + uniqueEPGKey key( service ); + + eventCache::iterator It = eventDB.find( key ); + if ( It != eventDB.end() && !It->second.first.empty() ) // entrys cached? + { + eventMap::iterator i( It->second.first.find( event_id )); + if ( i != It->second.first.end() ) + { + result = i->second; + return 0; + } + else + { + result = 0; + eDebug("event %04x not found in epgcache", event_id); + } + } + return -1; +} + +RESULT eEPGCache::lookupEventId(const eServiceReference &service, int event_id, const eit_event_struct *&result) +{ + singleLock s(cache_lock); + const eventData *data=0; + RESULT ret = lookupEventId(service, event_id, data); + if ( !ret && data ) + result = data->get(); + return ret; +} + +RESULT eEPGCache::lookupEventId(const eServiceReference &service, int event_id, Event *& result) +{ + singleLock s(cache_lock); + const eventData *data=0; + RESULT ret = lookupEventId(service, event_id, data); + if ( !ret && data ) + result = new Event((uint8_t*)data->get()); + return ret; +} + +RESULT eEPGCache::lookupEventId(const eServiceReference &service, int event_id, ePtr &result) +{ + singleLock s(cache_lock); + const eventData *data=0; + RESULT ret = lookupEventId(service, event_id, data); + if ( !ret && data ) + { + Event ev((uint8_t*)data->get()); + result = new eServiceEvent(); + const eServiceReferenceDVB &ref = (const eServiceReferenceDVB&)service; + ret = result->parseFrom(&ev, (ref.getTransportStreamID().get()<<16)|ref.getOriginalNetworkID().get()); + } + return ret; +} + +RESULT eEPGCache::startTimeQuery(const eServiceReference &service, time_t begin, int minutes) +{ + eventCache::iterator It = eventDB.find( service ); + if ( It != eventDB.end() && It->second.second.size() ) + { + m_timemap_end = minutes != -1 ? It->second.second.upper_bound(begin+minutes*60) : It->second.second.end(); + if ( begin != -1 ) + { + m_timemap_cursor = It->second.second.lower_bound(begin); + if ( m_timemap_cursor != It->second.second.end() ) + { + if ( m_timemap_cursor->second->getStartTime() != begin ) + { + timeMap::iterator x = m_timemap_cursor; + --x; + if ( x != It->second.second.end() ) + { + time_t start_time = x->second->getStartTime(); + if ( begin > start_time && begin < (start_time+x->second->getDuration())) + m_timemap_cursor = x; + } + } + } + } + else + m_timemap_cursor = It->second.second.begin(); + const eServiceReferenceDVB &ref = (const eServiceReferenceDVB&)service; + currentQueryTsidOnid = (ref.getTransportStreamID().get()<<16) | ref.getOriginalNetworkID().get(); + return 0; + } + return -1; +} + +RESULT eEPGCache::getNextTimeEntry(const eventData *& result) +{ + if ( m_timemap_cursor != m_timemap_end ) + { + result = m_timemap_cursor++->second; + return 0; + } + return -1; +} + +RESULT eEPGCache::getNextTimeEntry(const eit_event_struct *&result) +{ + if ( m_timemap_cursor != m_timemap_end ) + { + result = m_timemap_cursor++->second->get(); + return 0; + } + return -1; +} + +RESULT eEPGCache::getNextTimeEntry(Event *&result) +{ + if ( m_timemap_cursor != m_timemap_end ) + { + result = new Event((uint8_t*)m_timemap_cursor++->second->get()); + return 0; + } + return -1; +} + +RESULT eEPGCache::getNextTimeEntry(ePtr &result) +{ + if ( m_timemap_cursor != m_timemap_end ) + { + Event ev((uint8_t*)m_timemap_cursor++->second->get()); + result = new eServiceEvent(); + return result->parseFrom(&ev, currentQueryTsidOnid); + } + return -1; +} + +void fillTuple(PyObject *tuple, char *argstring, int argcount, PyObject *service, ePtr &ptr, PyObject *nowTime, PyObject *service_name ) +{ + PyObject *tmp=NULL; + int pos=0; + while(pos < argcount) + { + bool inc_refcount=false; + switch(argstring[pos]) + { + case 'I': // Event Id + tmp = ptr ? PyLong_FromLong(ptr->getEventId()) : NULL; + break; + case 'B': // Event Begin Time + tmp = ptr ? PyLong_FromLong(ptr->getBeginTime()) : NULL; + break; + case 'D': // Event Duration + tmp = ptr ? PyLong_FromLong(ptr->getDuration()) : NULL; + break; + case 'T': // Event Title + tmp = ptr ? PyString_FromString(ptr->getEventName().c_str()) : NULL; + break; + case 'S': // Event Short Description + tmp = ptr ? PyString_FromString(ptr->getShortDescription().c_str()) : NULL; + break; + case 'E': // Event Extended Description + tmp = ptr ? PyString_FromString(ptr->getExtendedDescription().c_str()) : NULL; + break; + case 'C': // Current Time + tmp = nowTime; + inc_refcount = true; + break; + case 'R': // service reference string + tmp = service; + inc_refcount = true; + break; + case 'N': // service name + tmp = service_name; + inc_refcount = true; + } + if (!tmp) + { + tmp = Py_None; + inc_refcount = true; + } + if (inc_refcount) + Py_INCREF(tmp); + PyTuple_SET_ITEM(tuple, pos++, tmp); + } +} + +PyObject *handleEvent(ePtr &ptr, PyObject *dest_list, char* argstring, int argcount, PyObject *service, PyObject *nowTime, PyObject *service_name, PyObject *convertFunc, PyObject *convertFuncArgs) +{ + if (convertFunc) + { + fillTuple(convertFuncArgs, argstring, argcount, service, ptr, nowTime, service_name); + PyObject *result = PyEval_CallObject(convertFunc, convertFuncArgs); + if (result == NULL) + { + if (service_name) + Py_DECREF(service_name); + if (nowTime) + Py_DECREF(nowTime); + Py_DECREF(convertFuncArgs); + Py_DECREF(dest_list); + return result; + } + PyList_Append(dest_list, result); + Py_DECREF(result); + } + else + { + PyObject *tuple = PyTuple_New(argcount); + fillTuple(tuple, argstring, argcount, service, ptr, nowTime, service_name); + PyList_Append(dest_list, tuple); + Py_DECREF(tuple); + } + return 0; +} + +// here we get a list with tuples +// first tuple entry is the servicereference +// the second is the type of query (0 = time, 1 = event_id) +// the third +// when type is eventid it is the event_id +// when type is time then it is the start_time ( 0 for now_time ) +// the fourth is the end_time .. ( optional ) + +/* argv is a python string + I = Event Id + B = Event Begin Time + D = Event Duration + T = Event Title + S = Event Short Description + E = Event Extended Description + C = Current Time + R = Service Reference + N = Service Name +*/ + +PyObject *eEPGCache::lookupEvent(PyObject *list, PyObject *convertFunc) +{ + PyObject *convertFuncArgs=NULL; + int argcount=0; + char *argstring=NULL; + if (!PyList_Check(list)) + { + PyErr_SetString(PyExc_StandardError, + "type error"); + eDebug("no list"); + return NULL; + } + int listIt=0; + int listSize=PyList_Size(list); + if (!listSize) + { + PyErr_SetString(PyExc_StandardError, + "not params given"); + eDebug("not params given"); + return NULL; + } + else + { + PyObject *argv=PyList_GET_ITEM(list, 0); // borrowed reference! + if (PyString_Check(argv)) + { + argstring = PyString_AS_STRING(argv); + ++listIt; + } + else + argstring = "I"; // just event id as default + argcount = strlen(argstring); +// eDebug("have %d args('%s')", argcount, argstring); + } + if (convertFunc) + { + if (!PyCallable_Check(convertFunc)) + { + PyErr_SetString(PyExc_StandardError, + "convertFunc must be callable"); + eDebug("convertFunc is not callable"); + return NULL; + } + convertFuncArgs = PyTuple_New(argcount); + } + + PyObject *nowTime = strchr(argstring, 'C') ? + PyLong_FromLong(time(0)+eDVBLocalTimeHandler::getInstance()->difference()) : + NULL; + + bool must_get_service_name = strchr(argstring, 'N') ? true : false; + + // create dest list + PyObject *dest_list=PyList_New(0); + while(listSize > listIt) + { + PyObject *item=PyList_GET_ITEM(list, listIt++); // borrowed reference! + if (PyTuple_Check(item)) + { + int type=0; + long event_id=-1; + time_t stime=-1; + int minutes=0; + int tupleSize=PyTuple_Size(item); + int tupleIt=0; + PyObject *service=NULL; + while(tupleSize > tupleIt) // parse query args + { + PyObject *entry=PyTuple_GET_ITEM(item, tupleIt); // borrowed reference! + switch(tupleIt++) + { + case 0: + { + if (!PyString_Check(entry)) + { + eDebug("tuple entry 0 is no a string"); + continue; + } + service = entry; + break; + } + case 1: + type=PyInt_AsLong(entry); + if (type < 0 || type > 1) + { + eDebug("unknown type %d", type); + continue; + } + break; + case 2: + event_id=stime=PyInt_AsLong(entry); + break; + case 3: + minutes=PyInt_AsLong(entry); + break; + default: + eDebug("unneeded extra argument"); + break; + } + } + eServiceReference ref(PyString_AS_STRING(service)); + if (ref.type != eServiceReference::idDVB) + { + eDebug("service reference for epg query is not valid"); + continue; + } + PyObject *service_name=NULL; + if (must_get_service_name) + { + ePtr sptr; + eServiceCenterPtr service_center; + eServiceCenter::getPrivInstance(service_center); + if (service_center) + { + service_center->info(ref, sptr); + if (sptr) + { + std::string name; + sptr->getName(ref, name); + if (name.length()) + service_name = PyString_FromString(name.c_str()); + } + } + if (!service_name) + service_name = PyString_FromString(""); + } + if (minutes) + { + Lock(); + if (!startTimeQuery(ref, stime, minutes)) + { + ePtr ptr; + while (!getNextTimeEntry(ptr)) + { + PyObject *ret = handleEvent(ptr, dest_list, argstring, argcount, service, nowTime, service_name, convertFunc, convertFuncArgs); + if (ret) + return ret; + } + } + Unlock(); + } + else + { + ePtr ptr; + if (stime) + { + if (type == 0) + lookupEventTime(ref, stime, ptr); + else // type == 1 + lookupEventId(ref, event_id, ptr); + } + PyObject *ret = handleEvent(ptr, dest_list, argstring, argcount, service, nowTime, service_name, convertFunc, convertFuncArgs); + if (ret) + return ret; + } + if (service_name) + Py_DECREF(service_name); + } + } + if (convertFuncArgs) + Py_DECREF(convertFuncArgs); + if (nowTime) + Py_DECREF(nowTime); + return dest_list; +} + + + +