Ticket #11053: mythtv_11053_cache_all_channel_id_results.patch

File mythtv_11053_cache_all_channel_id_results.patch, 1.7 KB (added by Rune Petersen <rune@…>, 11 years ago)

  • mythtv/libs/libmythtv/eithelper.cpp 

    diff --git a/mythtv/libs/libmythtv/eithelper.cpp b/mythtv/libs/libmythtv/eithelper.cpp
index 9ee2cc8..221647a 100644
    a b static inline void parse_dvb_component_descriptors(desc_list_t list, 
    285285
    286286void EITHelper::AddEIT(const DVBEventInformationTable *eit)
    287287{
     288    uint chanid = GetChanID(eit->ServiceID(), eit->OriginalNetworkID(),
     289                            eit->TSID());
     290    if (!chanid)
     291        return;
     292
    288293    uint descCompression = (eit->TableID() > 0x80) ? 2 : 1;
    289294    uint fix = fixup.value(eit->OriginalNetworkID() << 16);
    290295    fix |= fixup.value((((uint64_t)eit->TSID()) << 32) |
    … … void EITHelper::AddEIT(const DVBEventInformationTable *eit) 
    295300                  (uint64_t)eit->ServiceID());
    296301    fix |= EITFixUp::kFixGenericDVB;
    297302
    298     uint chanid = GetChanID(eit->ServiceID(), eit->OriginalNetworkID(),
    299                             eit->TSID());
    300     if (!chanid)
    301         return;
    302 
    303303    uint tableid   = eit->TableID();
    304304    uint version   = eit->Version();
    305305    for (uint i = 0; i < eit->EventCount(); i++)
    … … uint EITHelper::GetChanID(uint atsc_major, uint atsc_minor) 
    648648        return max(*it, 0);
    649649
    650650    uint chanid = get_chan_id_from_db(sourceid, atsc_major, atsc_minor);
    651     if (chanid)
    652         srv_to_chanid[key] = chanid;
     651    srv_to_chanid[key] = chanid;
    653652
    654653    return chanid;
    655654}
    … … uint EITHelper::GetChanID(uint serviceid, uint networkid, uint tsid) 
    667666        return max(*it, 0);
    668667
    669668    uint chanid = get_chan_id_from_db(sourceid, serviceid, networkid, tsid);
    670     if (chanid)
    671         srv_to_chanid[key] = chanid;
     669    srv_to_chanid[key] = chanid;
    672670
    673671    return chanid;
    674672}