X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/e68ab3a6255de286aad4f503ee9929d0c503ebcc..9262e5481897560267651620c1b5307f4c36c1de:/lib/dvb/epgcache.cpp diff --git a/lib/dvb/epgcache.cpp b/lib/dvb/epgcache.cpp index 1428cc7c..6758e4db 100644 --- a/lib/dvb/epgcache.cpp +++ b/lib/dvb/epgcache.cpp @@ -861,10 +861,10 @@ void eEPGCache::thread() void eEPGCache::load() { - singleLock s(cache_lock); FILE *f = fopen("/hdd/epg.dat", "r"); if (f) { + unlink("/hdd/epg.dat"); int size=0; int cnt=0; #if 0 @@ -898,6 +898,7 @@ void eEPGCache::load() fread( text1, 13, 1, f); if ( !strncmp( text1, "ENIGMA_EPG_V7", 13) ) { + singleLock s(cache_lock); fread( &size, sizeof(int), 1, f); while(size--) { @@ -1385,13 +1386,13 @@ RESULT eEPGCache::lookupEventTime(const eServiceReference &service, time_t t, co It->second.second.upper_bound(t); // just > if ( i != It->second.second.end() ) { - if ( direction < 0 || (direction == 0 && i->second->getStartTime() > t) ) + if ( direction < 0 || (direction == 0 && i->first > t) ) { timeMap::iterator x = i; --x; if ( x != It->second.second.end() ) { - time_t start_time = x->second->getStartTime(); + time_t start_time = x->first; if (direction >= 0) { if (t < start_time) @@ -1507,31 +1508,33 @@ RESULT eEPGCache::lookupEventId(const eServiceReference &service, int event_id, RESULT eEPGCache::startTimeQuery(const eServiceReference &service, time_t begin, int minutes) { const eServiceReferenceDVB &ref = (const eServiceReferenceDVB&)handleGroup(service); + if (begin == -1) + begin = eDVBLocalTimeHandler::getInstance()->nowTime(); Lock(); eventCache::iterator It = eventDB.find(ref); 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() ) { - m_timemap_cursor = It->second.second.lower_bound(begin); - if ( m_timemap_cursor != It->second.second.end() ) + if ( m_timemap_cursor->first != begin ) { - if ( m_timemap_cursor->second->getStartTime() != begin ) + timeMap::iterator x = m_timemap_cursor; + --x; + if ( x != It->second.second.end() ) { - 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; - } + time_t start_time = x->first; + if ( begin > start_time && begin < (start_time+x->second->getDuration())) + m_timemap_cursor = x; } } } + + if (minutes != -1) + m_timemap_end = It->second.second.upper_bound(begin+minutes*60); else - m_timemap_cursor = It->second.second.begin(); + m_timemap_end = It->second.second.end(); + currentQueryTsidOnid = (ref.getTransportStreamID().get()<<16) | ref.getOriginalNetworkID().get(); Unlock(); return 0; @@ -1581,7 +1584,7 @@ RESULT eEPGCache::getNextTimeEntry(ePtr &result) return -1; } -void fillTuple(ePyObject tuple, char *argstring, int argcount, ePyObject service, ePtr &ptr, ePyObject nowTime, ePyObject service_name ) +void fillTuple(ePyObject tuple, char *argstring, int argcount, ePyObject service, eServiceEvent *ptr, ePyObject nowTime, ePyObject service_name ) { ePyObject tmp; int pos=0; @@ -1635,7 +1638,7 @@ void fillTuple(ePyObject tuple, char *argstring, int argcount, ePyObject service } } -int handleEvent(ePtr &ptr, ePyObject dest_list, char* argstring, int argcount, ePyObject service, ePyObject nowTime, ePyObject service_name, ePyObject convertFunc, ePyObject convertFuncArgs) +int handleEvent(eServiceEvent *ptr, ePyObject dest_list, char* argstring, int argcount, ePyObject service, ePyObject nowTime, ePyObject service_name, ePyObject convertFunc, ePyObject convertFuncArgs) { if (convertFunc) { @@ -1689,7 +1692,7 @@ int handleEvent(ePtr &ptr, ePyObject dest_list, char* argstring, // +1 = event after given start_time // 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 ) +// when type is time then it is the start_time ( -1 for now_time ) // the fourth is the end_time .. ( optional .. for query all events in time range) PyObject *eEPGCache::lookupEvent(ePyObject list, ePyObject convertFunc) @@ -1793,6 +1796,10 @@ PyObject *eEPGCache::lookupEvent(ePyObject list, ePyObject convertFunc) break; } } + + if (minutes && stime == -1) + stime = eDVBLocalTimeHandler::getInstance()->nowTime(); + eServiceReference ref(handleGroup(eServiceReference(PyString_AS_STRING(service)))); if (ref.type != eServiceReference::idDVB) { @@ -1855,29 +1862,39 @@ PyObject *eEPGCache::lookupEvent(ePyObject list, ePyObject convertFunc) Lock(); if (!startTimeQuery(ref, stime, minutes)) { - ePtr ptr; - while (!getNextTimeEntry(ptr)) + while ( m_timemap_cursor != m_timemap_end ) { - if (handleEvent(ptr, dest_list, argstring, argcount, service, nowTime, service_name, convertFunc, convertFuncArgs)) + Event ev((uint8_t*)m_timemap_cursor++->second->get()); + eServiceEvent evt; + evt.parseFrom(&ev, currentQueryTsidOnid); + if (handleEvent(&evt, dest_list, argstring, argcount, service, nowTime, service_name, convertFunc, convertFuncArgs)) { Unlock(); return 0; // error } } } + else + handleEvent(0, dest_list, argstring, argcount, service, nowTime, service_name, convertFunc, convertFuncArgs); Unlock(); } else { - ePtr ptr; + eServiceEvent evt; + Event *ev=0; if (stime) { if (type == 2) - lookupEventId(ref, event_id, ptr); + lookupEventId(ref, event_id, ev); else - lookupEventTime(ref, stime, ptr, type); + lookupEventTime(ref, stime, ev, type); + if (ev) + { + const eServiceReferenceDVB &dref = (const eServiceReferenceDVB&)ref; + evt.parseFrom(ev, (dref.getTransportStreamID().get()<<16)|dref.getOriginalNetworkID().get()); + } } - if (handleEvent(ptr, dest_list, argstring, argcount, service, nowTime, service_name, convertFunc, convertFuncArgs)) + if (handleEvent(ev ? &evt : 0, dest_list, argstring, argcount, service, nowTime, service_name, convertFunc, convertFuncArgs)) return 0; // error } if (service_changed) @@ -1895,7 +1912,7 @@ skip_entry: return dest_list; } -void fillTuple2(ePyObject tuple, const char *argstring, int argcount, eventData *evData, ePtr &ptr, ePyObject service_name, ePyObject service_reference) +void fillTuple2(ePyObject tuple, const char *argstring, int argcount, eventData *evData, eServiceEvent *ptr, ePyObject service_name, ePyObject service_reference) { ePyObject tmp; int pos=0; @@ -2233,11 +2250,11 @@ PyObject *eEPGCache::search(ePyObject arg) if (ref.valid()) { // create servive event - ePtr ptr; + eServiceEvent ptr; + Event *ev=0; if (needServiceEvent) { - lookupEventId(ref, evid, ptr); - if (!ptr) + if (lookupEventId(ref, evid, ev)) eDebug("event not found !!!!!!!!!!!"); } // create service name @@ -2286,7 +2303,7 @@ PyObject *eEPGCache::search(ePyObject arg) // create tuple ePyObject tuple = PyTuple_New(argcount); // fill tuple - fillTuple2(tuple, argstring, argcount, evit->second, ptr, service_name, service_reference); + fillTuple2(tuple, argstring, argcount, evit->second, ev ? &ptr : 0, service_name, service_reference); PyList_Append(ret, tuple); Py_DECREF(tuple); --maxcount; @@ -2712,6 +2729,7 @@ void eEPGCache::channel_data::storeTitle(std::map<__u32, mhw_title_t>::iterator // data is borrowed from calling proc to save memory space. { __u8 name[34]; + // For each title a separate EIT packet will be sent to eEPGCache::sectionRead() bool isMHW2 = itTitle->second.mhw2_mjd_hi || itTitle->second.mhw2_mjd_lo || itTitle->second.mhw2_duration_hi || itTitle->second.mhw2_duration_lo; @@ -2719,6 +2737,7 @@ void eEPGCache::channel_data::storeTitle(std::map<__u32, mhw_title_t>::iterator eit_t *packet = (eit_t *) data; packet->table_id = 0x50; packet->section_syntax_indicator = 1; + packet->service_id_hi = m_channels[ itTitle->second.channel_id - 1 ].channel_id_hi; packet->service_id_lo = m_channels[ itTitle->second.channel_id - 1 ].channel_id_lo; packet->version_number = 0; // eEPGCache::sectionRead() will dig this for the moment @@ -2903,10 +2922,11 @@ void eEPGCache::channel_data::readMHWData(const __u8 *data) int record_size = sizeof( mhw_channel_name_t ); int nbr_records = int (len/record_size); + m_channels.resize(nbr_records); for ( int i = 0; i < nbr_records; i++ ) { mhw_channel_name_t *channel = (mhw_channel_name_t*) &data[4 + i*record_size]; - m_channels.push_back( *channel ); + m_channels[i]=*channel; } haveData |= MHW; @@ -2972,7 +2992,7 @@ void eEPGCache::channel_data::readMHWData(const __u8 *data) m_titles[ title_id ] = *title; if ( (title->ms.summary_available) && (m_program_ids.find(program_id) == m_program_ids.end()) ) // program_ids will be used to gather summaries. - m_program_ids[ program_id ] = title_id; + m_program_ids.insert(std::pair<__u32,__u32>(program_id,title_id)); return; // Continue reading of the current table. } else if (!checkTimeout()) @@ -3005,7 +3025,7 @@ void eEPGCache::channel_data::readMHWData(const __u8 *data) memcpy(&tmp, &data, sizeof(void*)); tmp[len+3] = 0; // Terminate as a string. - std::map<__u32, __u32>::iterator itProgid( m_program_ids.find( program_id ) ); + std::multimap<__u32, __u32>::iterator itProgid( m_program_ids.find( program_id ) ); if ( itProgid == m_program_ids.end() ) { /* This part is to prevent to looping forever if some summaries are not received yet. There is a timeout of 4 sec. after the last successfully read summary. */ @@ -3064,10 +3084,11 @@ void eEPGCache::channel_data::readMHWData2(const __u8 *data) else if (m_MHWFilterMask2.pid == 0x231 && m_MHWFilterMask2.data[0] == 0xC8 && m_MHWFilterMask2.data[1] == 0) // Channels table { - int num_channels = data[120]; - if(dataLen > 120) + int num_channels = data[119]; + m_channels.resize(num_channels); + if(dataLen > 119) { - int ptr = 121 + 6 * num_channels; + int ptr = 120 + 8 * num_channels; if( dataLen > ptr ) { for( int chid = 0; chid < num_channels; ++chid ) @@ -3083,18 +3104,17 @@ void eEPGCache::channel_data::readMHWData2(const __u8 *data) else goto abort; // data seems consistent... - const __u8 *tmp = data+121; + const __u8 *tmp = data+120; for (int i=0; i < num_channels; ++i) { mhw_channel_name_t channel; + channel.network_id_hi = *(tmp++); + channel.network_id_lo = *(tmp++); channel.transport_stream_id_hi = *(tmp++); channel.transport_stream_id_lo = *(tmp++); channel.channel_id_hi = *(tmp++); channel.channel_id_lo = *(tmp++); -#warning FIXME hardcoded network_id in mhw2 epg - channel.network_id_hi = 0; // hardcoded astra 19.2 - channel.network_id_lo = 1; - m_channels.push_back(channel); + m_channels[i]=channel; tmp+=2; } for (int i=0; i < num_channels; ++i) @@ -3173,7 +3193,7 @@ void eEPGCache::channel_data::readMHWData2(const __u8 *data) __u8 slen = data[pos+10] & 0x3f; __u8 *dest = ((__u8*)title.title)-4; memcpy(dest, &data[pos+11], slen>33 ? 33 : slen); - memset(dest+slen, 0x20, 33-slen); + memset(dest+slen, 0, 33-slen); pos += 11 + slen; // not used theme id (data[7] & 0x3f) + (data[pos] & 0x3f); __u32 summary_id = (data[pos+1] << 8) | data[pos+2]; @@ -3181,19 +3201,27 @@ void eEPGCache::channel_data::readMHWData2(const __u8 *data) // Create unique key per title __u32 title_id = (title.channel_id<<16) | (title.program_id_ml<<8) | title.program_id_lo; -// eDebug("program_id: %08x, %s", program_id, -// std::string((const char *)title.title, (int)(slen > 23 ? 23 : slen)).c_str()); - pos += 4; - if ( m_titles.find( title_id ) == m_titles.end() ) + std::map<__u32, mhw_title_t>::iterator it = m_titles.find( title_id ); + if ( it == m_titles.end() ) { - startTimeout(4000); + startTimeout(5000); m_titles[ title_id ] = title; - if (summary_id != 0xFFFF && // no summary avail - m_program_ids.find(summary_id) == m_program_ids.end()) + if (summary_id != 0xFFFF) { - m_program_ids[ summary_id ] = title_id; + bool add=true; + std::multimap<__u32, __u32>::iterator it(m_program_ids.lower_bound(summary_id)); + while (it != m_program_ids.end() && it->first == summary_id) + { + if (it->second == title_id) { + add=false; + break; + } + ++it; + } + if (add) + m_program_ids.insert(std::pair<__u32,__u32>(summary_id,title_id)); } } else @@ -3213,7 +3241,7 @@ start_summary: // Titles table has been read, there are summaries to read. // Start reading summaries, store corresponding titles on the fly. startMHWReader2(0x236, 0x96); - startTimeout(4000); + startTimeout(15000); return; } } @@ -3223,84 +3251,91 @@ start_summary: else if (m_MHWFilterMask2.pid == 0x236 && m_MHWFilterMask2.data[0] == 0x96) // Summaries table { - int len, loop, pos, lenline; - bool valid; - valid = true; - if( dataLen > 18 ) + if (!checkTimeout()) { - loop = data[12]; - pos = 13 + loop; - if( dataLen > pos ) + int len, loop, pos, lenline; + bool valid; + valid = true; + if( dataLen > 15 ) { - loop = data[pos] & 0x0f; - pos += 1; + loop = data[14]; + pos = 15 + loop; if( dataLen > pos ) { - len = 0; - for( ; loop > 0; --loop ) + loop = data[pos] & 0x0f; + pos += 1; + if( dataLen > pos ) { - if( dataLen > (pos+len) ) + len = 0; + for( ; loop > 0; --loop ) { - lenline = data[pos+len]; - len += lenline + 1; + if( dataLen > (pos+len) ) + { + lenline = data[pos+len]; + len += lenline + 1; + } + else + valid=false; } - else - valid=false; } } } - } - else if (!checkTimeout()) - return; // continue reading - if (valid && !checkTimeout()) - { - // data seems consistent... - __u32 summary_id = (data[3]<<8)|data[4]; - - // ugly workaround to convert const __u8* to char* - char *tmp=0; - memcpy(&tmp, &data, sizeof(void*)); - - len = 0; - loop = data[12]; - pos = 13 + loop; - loop = tmp[pos] & 0x0f; - pos += 1; - for( ; loop > 0; loop -- ) - { - lenline = tmp[pos+len]; - tmp[pos+len] = ' '; - len += lenline + 1; - } - if( len > 0 ) - tmp[pos+len] = 0; - else - tmp[pos+1] = 0; - - std::map<__u32, __u32>::iterator itProgid( m_program_ids.find( summary_id ) ); - if ( itProgid == m_program_ids.end() ) - { /* This part is to prevent to looping forever if some summaries are not received yet. - There is a timeout of 4 sec. after the last successfully read summary. */ - - if ( !m_program_ids.empty() && !checkTimeout() ) - return; // Continue reading of the current table. - } else + return; // continue reading + if (valid) { - startTimeout(4000); - std::string the_text = (char *) (data + pos + 1); + // data seems consistent... + __u32 summary_id = (data[3]<<8)|data[4]; + + // ugly workaround to convert const __u8* to char* + char *tmp=0; + memcpy(&tmp, &data, sizeof(void*)); - // Find corresponding title, store title and summary in epgcache. - std::map<__u32, mhw_title_t>::iterator itTitle( m_titles.find( itProgid->second ) ); - if ( itTitle != m_titles.end() ) + len = 0; + loop = data[14]; + pos = 15 + loop; + loop = tmp[pos] & 0x0f; + pos += 1; + for( ; loop > 0; loop -- ) + { + lenline = tmp[pos+len]; + tmp[pos+len] = ' '; + len += lenline + 1; + } + if( len > 0 ) + tmp[pos+len] = 0; + else + tmp[pos+1] = 0; + + std::multimap<__u32, __u32>::iterator itProgId( m_program_ids.lower_bound(summary_id) ); + if ( itProgId == m_program_ids.end() || itProgId->first != summary_id) + { /* This part is to prevent to looping forever if some summaries are not received yet. + There is a timeout of 4 sec. after the last successfully read summary. */ + if ( !m_program_ids.empty() ) + return; // Continue reading of the current table. + } + else { - storeTitle( itTitle, the_text, data ); - m_titles.erase( itTitle ); + startTimeout(15000); + std::string the_text = (char *) (data + pos + 1); + + while( itProgId != m_program_ids.end() && itProgId->first == summary_id ) + { + // Find corresponding title, store title and summary in epgcache. + std::map<__u32, mhw_title_t>::iterator itTitle( m_titles.find( itProgId->second ) ); + if ( itTitle != m_titles.end() ) + { + storeTitle( itTitle, the_text, data ); + m_titles.erase( itTitle ); + } + m_program_ids.erase( itProgId++ ); + } + if ( !m_program_ids.empty() ) + return; // Continue reading of the current table. } - m_program_ids.erase( itProgid ); - if ( !m_program_ids.empty() ) - return; // Continue reading of the current table. } + else + return; // continue reading } } if (isRunning & eEPGCache::MHW)