[mythtv-commits] Ticket #12932: Patch to EIT table version handling in DVBStreamData

[MythTV]

#12932: Patch to EIT table version handling in DVBStreamData
-----------------------------------+-----------------------------
 Reporter:  Roger James <roger@…>  |          Owner:  stuarta
     Type:  Patch - Bug Fix        |         Status:  assigned
 Priority:  major                  |      Milestone:  29.0
Component:  MythTV - DVB           |        Version:  Master Head
 Severity:  high                   |     Resolution:
 Keywords:                         |  Ticket locked:  0
-----------------------------------+-----------------------------

Comment (by Roger James <roger@…>):

 A couple of recent commits

 {{{
 roger at dragon:~/mythdev/mythrfj$ git show f37a341
 commit f37a341c89b6c0416faab6d3a3ea06baace6514c
 Author: Roger James <roger at beardandsandals.co.uk>
 Date:   Thu Dec 29 11:43:03 2016 +0000

     Bug fix in SD table handling

 diff --git a/mythtv/libs/libmythtv/mpeg/dvbstreamdata.cpp
 b/mythtv/libs/libmythtv/mpeg/dvbstreamdata.cpp
 index 5a41b08..c5f010c 100644
 --- a/mythtv/libs/libmythtv/mpeg/dvbstreamdata.cpp
 +++ b/mythtv/libs/libmythtv/mpeg/dvbstreamdata.cpp
 @@ -273,7 +273,7 @@ void DVBStreamData::Reset(uint desired_netid, uint
 desired_tsid,
              DeleteCachedTableSection(*nit);
          _cached_nit.clear();

 -        //ValidateSDTCache();
 +        ValidateSDTCache();

          for (sdt_tsn_cache_t::iterator network = _cached_sdts.begin();
                  network != _cached_sdts.end(); ++network)
 @@ -974,7 +974,7 @@ sdt_const_vec_t DVBStreamData::GetCachedSDTs() const
 for (sdt_t_cache_t::iterator table = (*stream).begin(); table !=
 (*stream).end(); ++table)
              {
                  for (sdt_sections_cache_t::iterator section =
 (*table).sections.begin();
 -                        section != (*table).sections.end(); ++table)
 +                        section != (*table).sections.end(); ++section)
                      sdts.push_back(*section);
              }
          }
 @@ -1164,8 +1164,9 @@ void DVBStreamData::ValidateEITCache()
              }
          }
      }
 -    LOG(VB_DVBSICACHE|VB_FLUSH, LOG_DEBUG, LOC + QString(
 +    LOG(VB_DVBSICACHE, LOG_DEBUG, LOC + QString(
              "============================================="));
 +    LOG(VB_FLUSH, LOG_DEBUG, "");
  }


 @@ -1202,8 +1203,9 @@ void DVBStreamData::ValidateSDTCache()
              }
          }
      }
 -    LOG(VB_DVBSICACHE|VB_FLUSH, LOG_DEBUG, LOC + QString(
 +    LOG(VB_DVBSICACHE, LOG_DEBUG, LOC + QString(
              "============================================="));
 +    LOG(VB_FLUSH, LOG_DEBUG, "");
  }


 roger at dragon:~/mythdev/mythrfj$ git show f2811df
 commit f2811df18874356d201d9dd9eef26222465c8916
 Author: Roger James <roger at beardandsandals.co.uk>
 Date:   Thu Dec 29 16:17:48 2016 +0000

     Another SD table fix

 diff --git a/mythtv/libs/libmythtv/mpeg/dvbstreamdata.cpp
 b/mythtv/libs/libmythtv/mpeg/dvbstreamdata.cpp
 index c5f010c..2addcdf 100644
 --- a/mythtv/libs/libmythtv/mpeg/dvbstreamdata.cpp
 +++ b/mythtv/libs/libmythtv/mpeg/dvbstreamdata.cpp
 @@ -959,8 +959,9 @@ sdt_const_ptr_t DVBStreamData::GetCachedSDTSection(
  sdt_const_vec_t DVBStreamData::GetCachedSDTs() const
  {
      // This function is purely for use by channelscan_sm
 -    // It should return all the actual SD table sections
 -    // in the cache
 +    // It returns a copy of all the actual SD table sections
 +    // in the cache. It is the responsibility of the caller
 +    // to delete these copies
      QMutexLocker locker(&_cache_lock);


 @@ -975,7 +976,7 @@ sdt_const_vec_t DVBStreamData::GetCachedSDTs() const
 {
                  for (sdt_sections_cache_t::iterator section =
 (*table).sections.begin();
                          section != (*table).sections.end(); ++section)
 -                    sdts.push_back(*section);
 +                    sdts.push_back(new
 ServiceDescriptionTable(**section));
              }
          }
      }
 roger at dragon:~/mythdev/mythrfj$
 }}}

--
Ticket URL: <https://code.mythtv.org/trac/ticket/12932#comment:13>
MythTV <http://www.mythtv.org>
MythTV Media Center