Ticket #2703: 2703-v1.patch

libs/libmythtv/dvbrecorder.cpp

@@ -58 +58 @@
 #include "programinfo.h"
 #include "mpegtables.h"
 #include "iso639.h"
+#include "dvbstreamdata.h"
 #include "atscstreamdata.h"
 #include "atsctables.h"
 #include "cardutil.h"
@@ -243 +244 @@
     }
 }
 
+void DVBRecorder::HandleSTT(const SystemTimeTable*)
+{
+    dvbchannel->SetTimeOffset(GetStreamData()->TimeOffset());
+}
+
+void DVBRecorder::HandleTDT(const TimeDateTable*)
+{
+    dvbchannel->SetTimeOffset(GetStreamData()->TimeOffset());
+}
+
 bool DVBRecorder::Open(void)
 {
     if (IsOpen())
@@ -301 +312 @@
     {
         data->AddMPEGListener(this);
 
+        DVBStreamData *dvb = dynamic_cast<DVBStreamData*>(data);
+        if (dvb)
+            dvb->AddDVBMainListener(this);
+
         ATSCStreamData *atsc = dynamic_cast<ATSCStreamData*>(data);
 
         if (atsc && atsc->DesiredMinorChannel())
@@ -512 +527 @@
     add_stream_type.push_back(StreamID::PrivSec);
     _stream_data->AddListeningPID(MPEG_PAT_PID);
 
+    add_pid.push_back(DVB_TDT_PID);
+    add_stream_type.push_back(StreamID::PrivSec);
+    _stream_data->AddListeningPID(DVB_TDT_PID);
+
     // Record the streams in the PMT...
     bool need_pcr_pid = true;
     for (uint i = 0; i < _input_pmt->StreamCount(); i++)

libs/libmythtv/dvbsignalmonitor.h

@@ -27 +27 @@
 
     virtual void SetRotorTarget(float target);
 
+    // MPEG
+    virtual void HandlePMT(uint, const ProgramMapTable*);
+
+    // ATSC Main
+    virtual void HandleSTT(const SystemTimeTable*);
+
+    // DVB Main
+    virtual void HandleTDT(const TimeDateTable*);
+
   public slots:
     void deleteLater(void);
 
@@ -52 +61 @@
     bool RemovePIDFilter(uint pid);
 
     int GetDVBCardNum(void) const;
+    DVBChannel *GetDVBChannel(void);
 
     bool SupportsTSMonitoring(void);
   protected:

libs/libmythtv/dvbdev/dvbci.cpp

@@ -1017 +1017 @@
 private:
   int interval;
   time_t lastTime;
+  int timeOffset;
   bool SendDateTime(void);
 public:
   cCiDateTime(int SessionId, cCiTransportConnection *Tc);
   virtual bool Process(int Length = 0, const uint8_t *Data = NULL);
+  void SetTimeOffset(double offset);
   };
 
 cCiDateTime::cCiDateTime(int SessionId, cCiTransportConnection *Tc)
@@ -1028 +1030 @@
 {
   interval = 0;
   lastTime = 0;
+  timeOffset = 0;
   dbgprotocol("New Date Time (session id %d)\n", SessionId);
 }
 
+void cCiDateTime::SetTimeOffset(double offset)
+{
+    timeOffset = (int) offset;
+    dbgprotocol("New Time Offset: %i secs\n", timeOffset);
+}
+
 bool cCiDateTime::SendDateTime(void)
 {
   time_t t = time(NULL);
   struct tm tm_gmt;
   struct tm tm_loc;
+
+  // Avoid using signed time_t types
+  if (timeOffset < 0)
+      t -= (time_t)(-timeOffset);
+  else
+      t += (time_t)(timeOffset);
+
   if (gmtime_r(&t, &tm_gmt) && localtime_r(&t, &tm_loc)) {
      int Y = tm_gmt.tm_year;
      int M = tm_gmt.tm_mon + 1;
@@ -1734 +1750 @@
   return cas && cas->SendPMT(CaPmt);
 }
 
+void cLlCiHandler::SetTimeOffset(double offset_in_seconds)
+{
+    cMutexLock MutexLock(&mutex);
+    cCiDateTime *dt = NULL;
+
+    for (uint i = 0; i < (uint) NumSlots(); i++)
+    {
+        dt = (cCiDateTime*) GetSessionByResourceId(RI_DATE_TIME, i);
+        if (dt)
+            dt->SetTimeOffset(offset_in_seconds);
+    }
+}
+
 bool cLlCiHandler::Reset(int Slot)
 {
   cMutexLock MutexLock(&mutex);

libs/libmythtv/dvbdev/dvbci.h

@@ -153 +153 @@
   virtual cCiEnquiry *GetEnquiry(void) = 0;
   virtual const unsigned short *GetCaSystemIds(int Slot) = 0;
   virtual bool SetCaPmt(cCiCaPmt &CaPmt, int Slot) = 0;
+  virtual void SetTimeOffset(double /*offset_in_seconds*/) { }
   };
 
 class cLlCiHandler : public cCiHandler {
@@ -188 +189 @@
   bool SetCaPmt(cCiCaPmt &CaPmt);
   const unsigned short *GetCaSystemIds(int Slot);
   bool SetCaPmt(cCiCaPmt &CaPmt, int Slot);
+  void SetTimeOffset(double offset_in_seconds);
   bool Reset(int Slot);
   bool connected() const;
   };

libs/libmythtv/dvbrecorder.h

@@ -55 +55 @@
  *
  *  \sa DTVRecorder, HDTVRecorder
  */
-class DVBRecorder : public DTVRecorder,
-                    private ReaderPausedCB,
-                    public MPEGStreamListener
+class DVBRecorder :
+    public DTVRecorder,
+    public MPEGStreamListener,
+    public DVBMainStreamListener,
+    public ATSCMainStreamListener,
+    private ReaderPausedCB
 {
   public:
     DVBRecorder(TVRec *rec, DVBChannel* dvbchannel);
@@ -82 +85 @@
     void HandleCAT(const ConditionalAccessTable*) {}
     void HandlePMT(uint pid, const ProgramMapTable*);
 
+    // ATSC Main
+    void HandleSTT(const SystemTimeTable*);
+    void HandleVCT(uint /*tsid*/, const VirtualChannelTable*) {}
+    void HandleMGT(const MasterGuideTable*) {}
+
+    // DVBMainStreamListener
+    void HandleTDT(const TimeDateTable*);
+    void HandleNIT(const NetworkInformationTable*) {}
+    void HandleSDT(uint /*tsid*/, const ServiceDescriptionTable*) {}
+
     void SetStreamData(MPEGStreamData*);
     MPEGStreamData* GetStreamData(void) { return _stream_data; }
 

libs/libmythtv/eithelper.cpp

@@ -635 +635 @@
 static int calc_eit_utc_offset(void)
 {
     QString config_offset = gContext->GetSetting("EITTimeOffset", "Auto");
+
     if (config_offset == "Auto")
-    {
-        QDateTime loc = QDateTime::currentDateTime(Qt::LocalTime);
-        QDateTime utc = QDateTime::currentDateTime(Qt::UTC);
+        return calc_utc_offset();
 
-        int utc_offset = MythSecsTo(utc, loc);
-
-        // clamp to nearest minute if within 10 seconds
-        int off = utc_offset % 60;
-        if (abs(off) < 10)
-            utc_offset -= off;
-        if (off < -50 && off > -60)
-            utc_offset -= 60 + off;
-        if (off > +50 && off < +60)
-            utc_offset += 60 - off;
-
-        return utc_offset;
-    }
     if (config_offset == "None")
         return 0;
 

libs/libmythtv/dvbchannel.h

@@ -32 +32 @@
 
     // Sets
     void SetPMT(const ProgramMapTable*);
+    void SetTimeOffset(double offset);
     void SetSlowTuning(uint how_slow_in_ms)
         { tuning_delay = how_slow_in_ms; }
 

libs/libmythtv/dvbcam.h

@@ -23 +23 @@
     bool Stop();
     bool IsRunning() const { return ciThreadRunning; }
     void SetPMT(const ProgramMapTable *pmt);
+    void SetTimeOffset(double offset_in_seconds);
 
   private:
     static void *CiHandlerThreadHelper(void*);

libs/libmythtv/mpeg/mpegstreamdata.cpp

@@ -1 +1 @@
 // -*- Mode: c++ -*-
 // Copyright (c) 2003-2004, Daniel Thor Kristjansson
+
+// POSIX headers
+#include <sys/time.h> // for gettimeofday
+
 #include "mpegstreamdata.h"
 #include "mpegtables.h"
 #include "RingBuffer.h"
@@ -46 +50 @@
  */
 MPEGStreamData::MPEGStreamData(int desiredProgram, bool cacheTables)
     : _sistandard("mpeg"),
-      _have_CRC_bug(false), _eit_helper(NULL), _eit_rate(0.0f),
+      _have_CRC_bug(false),
+      _local_utc_offset(0), _si_time_offset_cnt(0),
+      _si_time_offset_indx(0),
+      _eit_helper(NULL), _eit_rate(0.0f),
       _listener_lock(true),
       _cache_tables(cacheTables), _cache_lock(true),
       // Single program stuff
@@ -58 +65 @@
       _pat_single_program(NULL), _pmt_single_program(NULL),
       _invalid_pat_seen(false), _invalid_pat_warning(false)
 {
+    _local_utc_offset = calc_utc_offset();
+    bzero(_si_time_offsets, sizeof(_si_time_offsets));
+
     AddListeningPID(MPEG_PAT_PID);
 }
 
@@ -627 +637 @@
     }
 }
 
+double MPEGStreamData::TimeOffset(void) const
+{
+    QMutex locker(&_si_time_lock);
+    if (!_si_time_offset_cnt)
+        return 0.0;
+
+    double avg_offset = 0.0;
+    double mult = 1.0 / _si_time_offset_cnt;
+    for (uint i = 0; i < _si_time_offset_cnt; i++)
+        avg_offset += _si_time_offsets[i] * mult;
+
+    return avg_offset;
+}
+
+void MPEGStreamData::UpdateTimeOffset(uint64_t _si_utc_time)
+{
+    struct timeval tm;
+    if (gettimeofday(&tm, NULL) != 0)
+        return;
+
+    double utc_time = tm.tv_sec + (tm.tv_usec * 0.000001);
+    double si_time  = _si_utc_time;
+
+    QMutex locker(&_si_time_lock);
+    _si_time_offsets[_si_time_offset_indx] = si_time - utc_time;
+
+    if (_si_time_offset_indx + 1 > _si_time_offset_cnt)
+        _si_time_offset_cnt = _si_time_offset_indx + 1;
+
+    _si_time_offset_indx = (_si_time_offset_indx + 1) & 0xf;
+
+}
+
 #define DONE_WITH_PES_PACKET() { if (psip) delete psip; \
     if (morePSIPPackets) goto HAS_ANOTHER_PES; else return; }
 
@@ -642 +685 @@
     if (!psip)
        return;
 
+    // Don't do the usual checks on TDT - it has no CRC, etc...
+    if (TableID::TDT == psip->TableID())
+    {
+        HandleTables(tspacket->PID(), *psip);
+        DONE_WITH_PES_PACKET();
+    }
+
     // drop stuffing packets
     if ((TableID::ST       == psip->TableID()) ||
         (TableID::STUFFING == psip->TableID()))

libs/libmythtv/mpeg/atscstreamdata.cpp

@@ -308 +308 @@
         {
             SystemTimeTable stt(psip);
 
+            UpdateTimeOffset(stt.UTCUnix());
+
             // only update internal offset if it changes
             if (stt.GPSOffset() != _GPS_UTC_offset)
                 _GPS_UTC_offset = stt.GPSOffset();
 
+            _listener_lock.lock();
             for (uint i = 0; i < _atsc_main_listeners.size(); i++)
                 _atsc_main_listeners[i]->HandleSTT(&stt);
+            _listener_lock.unlock();
 
             if (_eit_helper && GPSOffset() != _eit_helper->GetGPSOffset())
                 _eit_helper->SetGPSOffset(GPSOffset());

libs/libmythtv/mpeg/dvbtables.cpp

@@ -169 +169 @@
     return is_eit;
 }
 
-uint DVBEventInformationTable::StartTimeUnixUTC(uint i) const
-{
-    const unsigned char *buf = StartTime(i);
-
-    // Modified Julian date as number of days since 17th November 1858.
-    // The unix epoch, 1st Jan 1970, was day 40587.
-    uint mjd = (buf[0] << 8) | buf[1];
-    if (mjd < 40587)
-        return 0; // we don't handle pre-unix dates..
-
-    uint secsSince1970 = (mjd - 40587)   * 86400;
-    secsSince1970 += byteBCD2int(buf[2]) * 3600;
-    secsSince1970 += byteBCD2int(buf[3]) * 60;
-    secsSince1970 += byteBCD2int(buf[4]);
-    return secsSince1970;
-}
-
 /** \fn dvbdate2qt(const unsigned char*)
- *  \return UTC time
+ *  \return UTC time as QDateTime
  */
 QDateTime dvbdate2qt(const unsigned char *buf)
 {
@@ -228 +211 @@
     return QDateTime(date, time);
 }
 
-uint dvbdate2key(const unsigned char *buf)
+/** \fn dvbdate2unix(const unsigned char*)
+ *  \return UTC time as time_t
+ */
+time_t dvbdate2unix(const unsigned char *buf)
 {
+    // Modified Julian date as number of days since 17th November 1858.
+    // The unix epoch, 1st Jan 1970, was day 40587.
+    uint mjd = (buf[0] << 8) | buf[1];
+    if (mjd < 40587)
+        return 0; // we don't handle pre-unix dates..
+
+    uint secsSince1970 = (mjd - 40587)   * 86400;
+    secsSince1970 += byteBCD2int(buf[2]) * 3600;
+    secsSince1970 += byteBCD2int(buf[3]) * 60;
+    secsSince1970 += byteBCD2int(buf[4]);
+    return secsSince1970;
+}
+
+/** \fn dvbdate2key(const unsigned char*)
+ *  \return UTC time as 32 bit key
+ */
+uint32_t dvbdate2key(const unsigned char *buf)
+{
     uint dt = (((uint)buf[0]) << 24) | (((uint)buf[1]) << 16); // 16 bits
     uint tm = ((byteBCD2int(buf[2]) * 3600) +
                (byteBCD2int(buf[3]) * 60) +

libs/libmythtv/mpeg/dvbstreamdata.cpp

@@ -19 +19 @@
     SetVersionNITo(-1,0);
     AddListeningPID(DVB_NIT_PID);
     AddListeningPID(DVB_SDT_PID);
+    AddListeningPID(DVB_TDT_PID);
 }
 
 DVBStreamData::~DVBStreamData()
@@ -89 +90 @@
         return SDTSectionSeen(psip.TableIDExtension(), psip.Section());
     }
 
+    if (TableID::TDT == table_id)
+        return false;
+
     bool is_eit = false;
     if (DVB_EIT_PID == pid)
     {
@@ -183 +187 @@
     }
     AddListeningPID(DVB_NIT_PID);
     AddListeningPID(DVB_SDT_PID);
+    AddListeningPID(DVB_TDT_PID);
 }
 
 /** \fn DVBStreamData::HandleTables(uint pid, const PSIPTable&)
@@ -244 +249 @@
 
             return true;
         }
+        case TableID::TDT:
+        {
+            TimeDateTable tdt(psip);
+
+            UpdateTimeOffset(tdt.UTCUnix());
+
+            QMutexLocker locker(&_listener_lock);
+            for (uint i = 0; i < _dvb_main_listeners.size(); i++)
+                _dvb_main_listeners[i]->HandleTDT(&tdt);
+
+            return true;
+        }
         case TableID::NITo:
         {
             SetVersionNITo(psip.Version(), psip.LastSection());

libs/libmythtv/mpeg/mpegtables.h

@@ -182 +182 @@
     DVB_SDT_PID   = 0x0011,
     DVB_EIT_PID   = 0x0012,
     DVB_RST_PID   = 0x0013,
-    DVB_TOT_PID   = 0x0013,
+    DVB_TDT_PID   = 0x0014,
 
     // Dishnet longterm EIT is on pid 0x300
     DVB_DNLONG_EIT_PID = 0x0300,

libs/libmythtv/mpeg/streamlisteners.h

@@ -31 +31 @@
 
 class NetworkInformationTable;
 class ServiceDescriptionTable;
+class TimeDateTable;
 class DVBEventInformationTable;
 
 class MPEGStreamListener
@@ -89 +90 @@
   protected:
     virtual ~DVBMainStreamListener() {}
   public:
+    virtual void HandleTDT(const TimeDateTable*) = 0;
     virtual void HandleNIT(const NetworkInformationTable*) = 0;
     virtual void HandleSDT(uint tsid, const ServiceDescriptionTable*) = 0;
 };

libs/libmythtv/mpeg/atsctables.h

@@ -651 +651 @@
     // protocol_version         8   8.0       0x00 for now
 
     // system_time             32   9.0
-    QDateTime SystemTimeGPS() const
+    uint32_t GPSRaw(void) const
     {
-        uint t = ((pesdata()[9]<<24)  | (pesdata()[10]<<16) |
-                  (pesdata()[11]<< 8) |  pesdata()[12]);
+        return ((pesdata()[9] <<24) | (pesdata()[10]<<16) |
+                (pesdata()[11]<< 8) |  pesdata()[12]);
+    }
+    QDateTime SystemTimeGPS(void) const
+    {
         QDateTime dt;
-        dt.setTime_t(secs_Between_1Jan1970_6Jan1980 + t);
+        dt.setTime_t(secs_Between_1Jan1970_6Jan1980 + GPSRaw());
         return dt;
     }
+    time_t GPSUnix(void) const
+        { return secs_Between_1Jan1970_6Jan1980 + GPSRaw(); }
+    time_t UTCUnix(void) const
+        { return GPSUnix() - GPSOffset(); }
+
     // GPS_UTC_offset           8  13.0 
     uint GPSOffset() const { return pesdata()[13]; }
     // daylight_savings        16  14.0

libs/libmythtv/mpeg/mpegstreamdata.h

@@ -50 +50 @@
     void SetCaching(bool cacheTables) { _cache_tables = cacheTables; }
     virtual void Reset(int desiredProgram);
 
+    /// \brief Current Offset from computer time to DVB time in seconds
+    double TimeOffset(void) const;
+
     // EIT Source
     virtual void SetEITHelper(EITHelper *eit_helper);
     virtual void SetEITRate(float rate);
@@ -217 +220 @@
 
     static int ResyncStream(unsigned char *buffer, int curr_pos, int len);
 
+    void UpdateTimeOffset(uint64_t si_utc_time);
+
     // Caching
     void IncrementRefCnt(const PSIPTable *psip) const;
     virtual void DeleteCachedTable(PSIPTable *psip) const;
@@ -228 +233 @@
 
     bool                      _have_CRC_bug;
 
+    int                       _local_utc_offset;
+
+    mutable QMutex            _si_time_lock;
+    uint                      _si_time_offset_cnt;
+    uint                      _si_time_offset_indx;
+    double                    _si_time_offsets[16];
+
     // Generic EIT stuff used for ATSC and DVB
     EITHelper                *_eit_helper;
     float                     _eit_rate;

libs/libmythtv/mpeg/dvbtables.h

@@ -8 +8 @@
 #include "dvbdescriptors.h"
 
 QDateTime dvbdate2qt(const unsigned char*);
-uint dvbdate2key(const unsigned char *);
+time_t dvbdate2unix(const unsigned char*);
+uint32_t dvbdate2key(const unsigned char*);
 
 /** \class NetworkInformationTable
  *  \brief This table tells the decoder on which PIDs to find other tables.
@@ -249 +250 @@
         { return _ptrs[i]+2; }
     QDateTime StartTimeUTC(uint i) const
         { return dvbdate2qt(StartTime(i)); }
-    uint StartTimeUnixUTC(uint i) const;
-    uint EndTimeUnixUTC(uint i) const
+    time_t StartTimeUnixUTC(uint i) const
+        { return dvbdate2unix(StartTime(i)); }
+    time_t EndTimeUnixUTC(uint i) const
         { return StartTimeUnixUTC(i) + DurationInSeconds(i); }
-    /// Returns 32 bit key representing time
-    uint StartTimeKey(uint i) const
+    uint32_t StartTimeKey(uint i) const
         { return dvbdate2key(StartTime(i)); }
     //   duration              24   7.0+x
     const unsigned char *Duration(uint i) const
@@ -286 +287 @@
     mutable vector<const unsigned char*> _ptrs; // used to parse
 };
 
+/** \class TimeDateTable
+ *  \brief This table gives the current DVB stream time
+ */
+class TimeDateTable : public PSIPTable
+{
+  public:
+    TimeDateTable(const PSIPTable& table)
+        : PSIPTable(table)
+    {
+        assert(TableID::TDT == TableID());
+    }
+    ~TimeDateTable() { ; }
 
+    // table_id                 8   0.0       0x70
+    // section_syntax_indicator 1   1.0          0
+    // reserved_future_use      1   1.1          1
+    // reserved                 2   1.2          3
+    // section_length          12   1.4         40
+    // UTC_time                40   3.0          0
+    const unsigned char *UTCdata(void) const
+        { return pesdata() + 3; }
+
+    QDateTime UTC(void)  const { return dvbdate2qt(UTCdata());   }
+    time_t UTCUnix(void) const { return dvbdate2unix(UTCdata()); }
+};
+
 #endif // _DVB_TABLES_H_

libs/libmythtv/dvbtypes.h

@@ -14 +14 @@
 #include <stdint.h>
 #include <unistd.h>
 
-// C++ headers
-#include <vector>
-using namespace std;
-
 // DVB headers
 #include <linux/dvb/version.h>
+#include <linux/dvb/frontend.h>
+#include <linux/dvb/dmx.h>
+
 #if (DVB_API_VERSION != 3)
-#error "DVB driver includes with API version 3 not found!"
+#    error "DVB driver includes with API version 3 not found!"
 #endif
 
 #ifndef DVB_API_VERSION_MINOR
-#define DVB_API_VERSION_MINOR 0
+#    define DVB_API_VERSION_MINOR 0
 #endif
 
-#include <linux/dvb/frontend.h>
-#include <linux/dvb/dmx.h>
-
 #if (DVB_API_VERSION >= 3 && DVB_API_VERSION_MINOR >= 1)
 #    define USE_ATSC
 #else
@@ -43 +39 @@
 #    define VSB_16        (fe_modulation)(QAM_AUTO+2)
 #endif
 
-#define MPEG_TS_PKT_SIZE 188
-#define DEF_DMX_BUF_SIZE  64 * 1024
-#define MAX_SECTION_SIZE 4096
-#define DMX_DONT_FILTER 0x2000
-
 #ifdef FE_GET_EXTENDED_INFO
   #define dvb_fe_params dvb_frontend_parameters_new
 #else
@@ -57 +48 @@
 class QString;
 QString toString(fe_status);
 
-typedef vector<uint16_t> dvb_pid_t;
-// needs to add provider id so dvbcam doesnt require parsing
-// of the pmt and or the pmtcache
-typedef vector<uint16_t> dvb_caid_t;
-
 #endif // DVB_TYPES_H

libs/libmythtv/dvbchannel.cpp

@@ -534 +534 @@
         dvbcam->SetPMT(pmt);
 }
 
+/** \fn DVBChannel::SetTimeOffset(double)
+ *  \brief Tells the Conditional Access Module the offset
+ *         from the computers utc time to dvb time.
+ */
+void DVBChannel::SetTimeOffset(double offset)
+{
+    if (dvbcam->IsRunning())
+        dvbcam->SetTimeOffset(offset);
+}
+
 /*****************************************************************************
            Tuning functions for each of the four types of cards.
  *****************************************************************************/

libs/libmythtv/siscan.h

@@ -94 +94 @@
     // DVB Main
     void HandleNIT(const NetworkInformationTable*);
     void HandleSDT(uint tsid, const ServiceDescriptionTable*);
+    void HandleTDT(const TimeDateTable*) {}
 
   private slots:
     void HandleAllGood(void);

libs/libmythtv/dvbcam.cpp

@@ -273 +273 @@
     pmt_updated = true;
 }
 
+void DVBCam::SetTimeOffset(double offset_in_seconds)
+{
+    ciHandler->SetTimeOffset(offset_in_seconds);
+}
+
 static const char *cplm_info[] =
 {
     "CPLM_MORE",

libs/libmythtv/dtvsignalmonitor.h

@@ -88 +88 @@
     void HandlePMT(uint, const ProgramMapTable*);
 
     // ATSC Main
-    void HandleSTT(const SystemTimeTable*) {}
+    void HandleSTT(const SystemTimeTable*);
     void HandleVCT(uint /*tsid*/, const VirtualChannelTable*) {}
     void HandleMGT(const MasterGuideTable*);
 
@@ -101 +101 @@
         const DirectedChannelChangeSelectionCodeTable*) {}
 
     // DVB Main
+    void HandleTDT(const TimeDateTable*);
     void HandleNIT(const NetworkInformationTable*);
     void HandleSDT(uint, const ServiceDescriptionTable*);
 

libs/libmythtv/dvbsignalmonitor.cpp

@@ -14 +14 @@
 #include "mythdbcon.h"
 #include "dvbsignalmonitor.h"
 #include "dvbchannel.h"
+#include "dvbstreamdata.h"
 #include "atscstreamdata.h"
 #include "mpegtables.h"
 #include "atsctables.h"
@@ -555 +556 @@
     }
 }
 
+void DVBSignalMonitor::HandlePMT(uint program_num, const ProgramMapTable *pmt)
+{
+    DTVSignalMonitor::HandlePMT(program_num, pmt);
+    GetDVBChannel()->SetPMT(pmt);
+}
+
+void DVBSignalMonitor::HandleSTT(const SystemTimeTable *stt)
+{
+    DTVSignalMonitor::HandleSTT(stt);
+    GetDVBChannel()->SetTimeOffset(GetStreamData()->TimeOffset());
+}
+
+void DVBSignalMonitor::HandleTDT(const TimeDateTable *tdt)
+{
+    DTVSignalMonitor::HandleTDT(tdt);
+    GetDVBChannel()->SetTimeOffset(GetStreamData()->TimeOffset());
+}
+
+DVBChannel *DVBSignalMonitor::GetDVBChannel(void)
+{
+    return dynamic_cast<DVBChannel*>(channel);
+}
+
 void DVBSignalMonitor::RunTableMonitor(void)
 {
     dtvMonitorRunning = true;

libs/libmythtv/dtvsignalmonitor.cpp

@@ -341 +341 @@
     }
 }
 
+void DTVSignalMonitor::HandleSTT(const SystemTimeTable*)
+{
+    VERBOSE(VB_CHANNEL, LOC + "Time Offset: "<<GetStreamData()->TimeOffset());
+}
+
 void DTVSignalMonitor::HandleMGT(const MasterGuideTable* mgt)
 {
     AddFlags(kDTVSigMon_MGTSeen);
@@ -405 +410 @@
     AddFlags(kDTVSigMon_VCTMatch | kDTVSigMon_CVCTMatch);
 }
 
+void DTVSignalMonitor::HandleTDT(const TimeDateTable*)
+{
+    VERBOSE(VB_CHANNEL, LOC + "Time Offset: "<<GetStreamData()->TimeOffset());
+}
+
 void DTVSignalMonitor::HandleNIT(const NetworkInformationTable *nit)
 {
     DBG_SM("SetNIT()", QString("net_id = %1").arg(nit->NetworkID()));

libs/libmyth/util.cpp

@@ -62 +62 @@
     return rettime;
 }
 
+int calc_utc_offset(void)
+{
+    QDateTime loc = QDateTime::currentDateTime(Qt::LocalTime);
+    QDateTime utc = QDateTime::currentDateTime(Qt::UTC);
+
+    int utc_offset = MythSecsTo(utc, loc);
+
+    // clamp to nearest minute if within 10 seconds
+    int off = utc_offset % 60;
+    if (abs(off) < 10)
+        utc_offset -= off;
+    if (off < -50 && off > -60)
+        utc_offset -= 60 + off;
+    if (off > +50 && off < +60)
+        utc_offset += 60 - off;
+
+    return utc_offset;
+}
+
 /** \fn encodeLongLong(QStringList&,long long)
  *  \brief Encodes a long for streaming in the MythTV protocol.
  *

libs/libmyth/util.h

@@ -39 +39 @@
 };
 
 MPUBLIC QDateTime mythCurrentDateTime();
+MPUBLIC int calc_utc_offset(void);
 
 // This is necessary for GCC 3.3, which has llabs(long long)
 // but not abs(long long) or std::llabs(long long)