Ticket #11018: 0002-libmythtv-EIT-ActiveScan-Control-optimized.patch

mythtv/libs/libmythtv/eitscanner.cpp

@@ -133 +133 @@
             if (!(*activeScanNextChan).isEmpty())
             {
                 eitHelper->WriteEITCache();
-                rec->SetChannel(*activeScanNextChan, TVRec::kFlagEITScan);
-                LOG(VB_EIT, LOG_INFO,
-                    LOC_ID + QString("Now looking for EIT data on "
-                                     "multiplex of channel %1")
+                if (rec->QueueEITChannelChange(*activeScanNextChan))
+                {
+                    LOG(VB_EIT, LOG_INFO,
+                        LOC_ID + QString("Now looking for EIT data on "
+                                         "multiplex of channel %1")
                         .arg(*activeScanNextChan));
+                }
             }
 
             activeScanNextTrig = QDateTime::currentDateTime()
@@ -216 +218 @@
 
     eitHelper->WriteEITCache();
     eitHelper->SetSourceID(0);
+
+    LOG(VB_EIT, LOG_INFO, LOC_ID + "Stopped passive scan.");
 }
 
 void EITScanner::StartActiveScan(TVRec *_rec, uint max_seconds_per_source)
@@ -280 +284 @@
     activeScan = false;
     rec = NULL;
     StopPassiveScan();
+
+    LOG(VB_EIT, LOG_INFO, LOC_ID + "Stopped active scan.");
 }

mythtv/libs/libmythtv/tv_rec.cpp

@@ -36 +36 @@
 #include "tv_rec.h"
 #include "mythmiscutil.h"
 #include "osd.h"
+#include "cardutil.h"
 
 #define DEBUG_CHANNEL_PREFIX 0 /**< set to 1 to channel prefixing */
 
@@ -52 +53 @@
 static int init_jobs(const RecordingInfo *rec, RecordingProfile &profile,
                      bool on_host, bool transcode_bfr_comm, bool on_line_comm);
 static void apply_broken_dvb_driver_crc_hack(ChannelBase*, MPEGStreamData*);
-
+static int eit_start_rand(uint cardid, int eitTransportTimeout);
 
 /** \class TVRec
  *  \brief This is the coordinating class of the \ref recorder_subsystem.
@@ -161 +162 @@
         gCoreContext->GetNumSetting("AutoTranscodeBeforeAutoCommflag", 0);
     earlyCommFlag     = gCoreContext->GetNumSetting("AutoCommflagWhileRecording", 0);
     runJobOnHostOnly  = gCoreContext->GetNumSetting("JobsRunOnRecordHost", 0);
-    eitTransportTimeout=gCoreContext->GetNumSetting("EITTransportTimeout", 5) * 60;
+    eitTransportTimeout =
+        max(gCoreContext->GetNumSetting("EITTransportTimeout", 5) * 60, 6);
     eitCrawlIdleStart = gCoreContext->GetNumSetting("EITCrawIdleStart", 60);
     audioSampleRateDB = gCoreContext->GetNumSetting("AudioSampleRate");
     overRecordSecNrml = gCoreContext->GetNumSetting("RecordOverTime");
@@ -974 +976 @@
 
     bool changed = false;
 
+    LOG(VB_GENERAL, LOG_INFO, LOC + "GetCardIDs to stop EITscan");
+    vector<uint> cardids = CardUtil::GetCardIDs("","DVB","");
+    uint no_cards = cardids.size();
+
     QString transMsg = QString(" %1 to %2")
         .arg(StateToString(nextState))
         .arg(StateToString(desiredNextState));
@@ -998 +1004 @@
     if (TRANSITION(kState_None, kState_WatchingLiveTV))
     {
         tuningRequests.enqueue(TuningRequest(kFlagLiveTV));
+        for (uint i = 0; i < no_cards; i++)
+        {
+           if (cardids[i] != cardid)
+            {       
+               TVRec *rec = GetTVRec(cardids[i]);
+               if (rec && !rec->HasFlags(kFlagEITScanPaused))
+                   rec->SetFlags(kFlagEITScanPaused);
+           }
+        }       
         SET_NEXT();
     }
     else if (TRANSITION(kState_WatchingLiveTV, kState_None))
     {
         tuningRequests.enqueue(TuningRequest(kFlagKillRec|kFlagKillRingBuffer));
+         eitScanStartTime = QDateTime::currentDateTime();
+         uint j = 0;
+         TVRec *arec = NULL;
+        for (uint i = 0; i < no_cards; i++)
+         {
+            if (cardids[i] != cardid)
+            {       
+                TVRec *rec = GetTVRec(cardids[i]);        
+                if (!HasFlags(kFlagEITScanPaused))
+                {               
+                    if (rec && rec->HasFlags(kFlagEITScanPaused))
+                    {
+                        rec->eitScanStartTime = eitScanStartTime.addSecs(
+                            eitCrawlIdleStart + eit_start_rand(cardids[i], eitTransportTimeout));
+                        rec->ClearFlags(kFlagEITScanPaused);
+                        LOG(VB_IDLE, LOG_INFO, LOC + "Start EIT-ActiveScanIdle-Timer for " +
+                            QString("cardid %1, next start time: ").arg(cardids[i]) +
+                                 rec->eitScanStartTime.toString(Qt::ISODate));
+                    }
+                }
+                else if (rec && rec->GetState() != kState_None)
+                     arec = rec; j++;
+             }                  
+         }
+         if (j == 1)
+             arec->ClearFlags(kFlagEITScanPaused);        
         SET_NEXT();
     }
     else if (TRANSITION(kState_WatchingLiveTV, kState_RecordingOnly))
@@ -1015 +1058 @@
     {
         SetPseudoLiveTVRecording(NULL);
         tuningRequests.enqueue(TuningRequest(kFlagRecording, curRecording));
+        for (uint i = 0; i < no_cards; i++)
+        {
+            if (cardids[i] != cardid)
+            {       
+                TVRec *rec = GetTVRec(cardids[i]);
+                if (rec && !rec->HasFlags(kFlagEITScanPaused))
+                        rec->SetFlags(kFlagEITScanPaused);
+            }
+        }       
         SET_NEXT();
     }
     else if (TRANSITION(kState_RecordingOnly, kState_None))
@@ -1022 +1074 @@
         tuningRequests.enqueue(
             TuningRequest(kFlagCloseRec|kFlagKillRingBuffer|
                           (GetFlags()&kFlagKillRec)));
+        eitScanStartTime = QDateTime::currentDateTime();
+        uint j = 0;
+        TVRec *arec = NULL;
+        for (uint i = 0; i < no_cards; i++)
+        {
+            if (cardids[i] != cardid)
+            {       
+                TVRec *rec = GetTVRec(cardids[i]);        
+                if (!HasFlags(kFlagEITScanPaused))
+                {               
+                    if (rec && rec->HasFlags(kFlagEITScanPaused))
+                    {
+                        rec->eitScanStartTime = eitScanStartTime.addSecs(
+                             eitCrawlIdleStart + eit_start_rand(cardids[i], eitTransportTimeout));
+                        rec->ClearFlags(kFlagEITScanPaused);
+                        LOG(VB_IDLE, LOG_INFO, LOC + "Start EIT-ActiveScanIdle-Timer for " +
+                            QString("cardid %1, next start time: ").arg(cardids[i]) +
+                                rec->eitScanStartTime.toString(Qt::ISODate));
+                    }
+                }
+                else if (rec && rec->GetState() != kState_None)
+                    arec = rec; j++;
+            }                   
+        }
+        if (j == 1)
+            arec->ClearFlags(kFlagEITScanPaused);        
         SET_NEXT();
     }
 
@@ -1034 +1114 @@
 
     eitScanStartTime = QDateTime::currentDateTime();
     if (scanner && (internalState == kState_None))
-        eitScanStartTime = eitScanStartTime.addSecs(eitCrawlIdleStart);
+    {
+        eitScanStartTime = eitScanStartTime.addSecs(
+            eitCrawlIdleStart + eit_start_rand(cardid, eitTransportTimeout));
+    }
     else
         eitScanStartTime = eitScanStartTime.addYears(1);
 }
@@ -1130 +1213 @@
          CardUtil::IsV4L(genOpt.cardtype)))
     {
         channel->Close();
+        LOG(VB_GENERAL, LOG_INFO, LOC + QString("Close Card %1")
+                .arg(CardUtil::ProbeDVBFrontendName(CardUtil::GetVideoDevice(cardid))) );
+//                      GetDeviceLabel(cardid))
     }
 }
 
@@ -1213 +1299 @@
     return -1;
 }
 
+static int eit_start_rand(uint cardid, int eitTransportTimeout)
+{
+    // randomize start time a bit
+    int timeout = random() % (eitTransportTimeout / 3);
+    // get the number of capture cards and the position of the current card
+    // to distribute the the scan start evenly over eitTransportTimeout
+    int card_pos = no_capturecards(cardid);
+    int no_cards = no_capturecards(0);
+    if (no_cards > 0 && card_pos >= 0)
+        timeout += eitTransportTimeout * card_pos / no_cards;
+    return timeout;
+}
+
 /// \brief Event handling method, contains event loop.
 void TVRec::run(void)
 {
@@ -1227 +1326 @@
         (dvbOpt.dvb_eitscan || get_use_eit(cardid)))
     {
         scanner = new EITScanner(cardid);
-        uint timeout = eitCrawlIdleStart;
-        // get the number of capture cards and the position of the current card
-        // to distribute the the scan start evenly over eitTransportTimeout
-        int card_pos = no_capturecards(cardid);
-        int no_cards = no_capturecards(0);
-        if (no_cards > 0 && card_pos >= 0)
-            timeout += eitTransportTimeout * card_pos / no_cards;
-        else
-            timeout += random() % eitTransportTimeout;
-
-        eitScanStartTime = eitScanStartTime.addSecs(timeout);
+        eitScanStartTime = eitScanStartTime.addSecs(
+            eitCrawlIdleStart + eit_start_rand(cardid, eitTransportTimeout));
     }
     else
         eitScanStartTime = eitScanStartTime.addYears(1);
@@ -1370 +1460 @@
         }
 
         if (scanner && channel &&
-            QDateTime::currentDateTime() > eitScanStartTime)
+            QDateTime::currentDateTime() > eitScanStartTime &&
+            !HasFlags(kFlagEITScanPaused))
         {
             if (!dvbOpt.dvb_eitscan)
             {
@@ -1392 +1483 @@
             }
         }
 
+        //Stop EIT-Scanning if recording begins on another card, 
+        if (scanner && HasFlags(kFlagEITScanPaused) &&
+            HasFlags(kFlagEITScannerRunning))
+        {
+            scanner->StopActiveScan();
+            ClearFlags(kFlagEITScannerRunning);
+            TuningShutdowns(TuningRequest(kFlagNoRec));
+        }
+
         // We should be no more than a few thousand milliseconds,
         // as the end recording code does not have a trigger...
         // NOTE: If you change anything here, make sure that
@@ -3052 +3152 @@
     // Clear the RingBuffer reset flag, in case we wait for a reset below
     ClearFlags(kFlagRingBufferReady);
 
+    // Clear out any EITScan channel change requests
+    TuningQueue::iterator it = tuningRequests.begin();
+    while (it != tuningRequests.end())
+    {
+        if ((*it).flags & kFlagEITScan)
+            it = tuningRequests.erase(it);
+        else
+            ++it;
+    }
+
     // Actually add the tuning request to the queue, and
     // then wait for it to start tuning
     tuningRequests.enqueue(TuningRequest(requestType, name));
@@ -3066 +3176 @@
     LOG(VB_CHANNEL, LOG_INFO, LOC + QString("SetChannel(%1) -- end").arg(name));
 }
 
+/** \brief Queues up a channel change for the EITScanner.
+ *
+ *   Unlike the normal SetChannel() this does not block until
+ *   the channel change occurs to avoid a deadlock if
+ *   EITScanner::StopActiveScan() is called with the stateChangeLock
+ *   held while the EITScanner is calling TVRec::SetChannel().
+ */
+bool TVRec::QueueEITChannelChange(const QString &name)
+{
+    LOG(VB_CHANNEL, LOG_INFO, LOC +
+        QString("QueueEITChannelChange(%1) -- begin").arg(name));
+
+    bool ok = false;
+    if (stateChangeLock.tryLock())
+    {
+        if (tuningRequests.empty())
+        {
+            tuningRequests.enqueue(TuningRequest(kFlagEITScan, name));
+            ok = true;
+        }
+        stateChangeLock.unlock();
+    }
+
+    LOG(VB_CHANNEL, LOG_INFO, LOC +
+        QString("QueueEITChannelChange(%1) -- end --> %2").arg(name).arg(ok));
+
+    return ok;
+}
+
 void TVRec::GetNextProgram(BrowseDirection direction,
                            QString &title,       QString &subtitle,
                            QString &desc,        QString &category,
@@ -4204 +4343 @@
         msg += "Errored,";
     if (kFlagCancelNextRecording & f)
         msg += "CancelNextRecording,";
+    if (kFlagEITScanPaused & f)
+        msg += "EITScanPaused,";
 
     // Tuning flags
     if ((kFlagRec & f) == kFlagRec)

mythtv/libs/libmythtv/tv_rec.h

@@ -156 +156 @@
     void FinishRecording(void)  { SetFlags(kFlagFinishRecording); }
     /// \brief Tells TVRec that the frontend's TV class is ready for messages.
     void FrontendReady(void)    { SetFlags(kFlagFrontendReady); }
+    void PauseEITActiveScan(void)    { SetFlags(kFlagEITScanPaused); }
+    void RestartEITActiveScan(void)    { ClearFlags(kFlagEITScanPaused); }
     void CancelNextRecording(bool cancel);
     ProgramInfo *GetRecording(void);
 
@@ -198 +200 @@
     void ChangeChannel(ChannelChangeDirection dir)
         { SetChannel(QString("NextChannel %1").arg((int)dir)); }
     void SetChannel(QString name, uint requestType = kFlagDetect);
+    bool QueueEITChannelChange(const QString &name);
 
     int SetSignalMonitoringRate(int msec, int notifyFrontend = 1);
     int  GetPictureAttribute(PictureAttribute attr);
@@ -409 +412 @@
     static const uint kFlagFinishRecording      = 0x00000008;
     static const uint kFlagErrored              = 0x00000010;
     static const uint kFlagCancelNextRecording  = 0x00000020;
+    static const uint kFlagEITScanPaused        = 0x00000040;
 
     // Tuning flags
     /// final result desired is LiveTV recording
@@ -432 +436 @@
 
     // Waiting stuff
     static const uint kFlagWaitingForRecPause   = 0x00100000;
-    static const uint kFlagWaitingForSignal     = 0x00200000;
+    static const uint kFlagWaitingForSignal     = 0x00200000;    
     static const uint kFlagNeedToStartRecorder  = 0x00800000;
     static const uint kFlagPendingActions       = 0x00F00000;
 

mythtv/programs/mythbackend/main_helpers.cpp

@@ -192 +192 @@
                 }
                 else
                 {
-                    LOG(VB_GENERAL, LOG_ERR, "Problem with capture cards" +
-                            cidmsg + "failed init");
+                    LOG(VB_GENERAL, LOG_ERR, "Problem with capture cards - " +
+                            cidmsg + " failed init");
                     delete tv;
                 }
             }