Ticket #927: tuning_patch.diff

dvbchannel.cpp

@@ -82 +82 @@
     dvbcam = new DVBCam(cardnum);
     bzero(&info, sizeof(info));
     has_crc_bug = CardUtil::HasDVBCRCBug(aCardNum);
+    frequency_incr = -10;
 }
 
 DVBChannel::~DVBChannel()
@@ -642 +643 @@
     bool has_diseq = (FE_QPSK == info.type) && diseqc;
     struct dvb_frontend_parameters params = channel.tuning.params;
 
+    prev_channel.tuning = channel.tuning;
+
 // (begin)softcam-0.4
     GENERAL(QString("invalidating DeCSA for card %1").arg(cardnum));
     //DVBRecorder::UpdateDeCSAKeys(cardnum, 'I', 0, NULL, 0);
@@ -674 +677 @@
         // Adjust for Satelite recievers which offset the frequency.
         params.frequency = tuned_frequency(channel.tuning, info.type, NULL);
 
+        frequency_incr = 0 - frequency_incr;
+        params.frequency = params.frequency + frequency_incr;
+
         if (ioctl(fd_frontend, FE_SET_FRONTEND, &params) < 0)
         {
             ERRNO("DVBChannel::Tune: "
@@ -691 +697 @@
     return true;
 }
 
+bool DVBChannel::Tune_again(void)
+{
+    return Tune(prev_channel, true);
+}
+
 /** \fn DVBChannel::GetTuningParams(DVBTuning& tuning) const
  *  \brief Fetches DVBTuning params from driver
  *  \return true on success, false on failure

dvbchannel.h

@@ -65 +65 @@
     bool SwitchToInput(const QString &inputname, const QString &chan);
     bool SwitchToInput(int newcapchannel, bool setstarting);
     bool Tune(const dvb_channel_t& channel, bool force_reset=false);
+    bool Tune_again(void);
 
     // Set/Get/Command just for SIScan/ScanWizardScanner
     void SetMultiplexID(int mplexid)          { currentTID = mplexid; };
@@ -105 +106 @@
     dvb_frontend_info info;        ///< Contains info on tuning hardware
     dvb_channel_t     chan_opts;   ///< Tuning options sent to tuning hardware
     DVBTuning         prev_tuning; ///< Last tuning options sent to hardware
+    dvb_channel_t     prev_channel;
 
     volatile int      fd_frontend; ///< File descriptor for tuning hardware
     int               cardnum;     ///< DVB Card number
@@ -114 +116 @@
     bool              first_tune;  ///< Used to force hardware reset
 
     int               nextcapchannel; ///< Signal an input change
+    int               frequency_incr;
 };
 
 #endif

dvbdiseqc.cpp

@@ -52 +52 @@
 {
 
     // Number of repeats for DiSEqC 1.1 devices
-    repeat = 1;
+    repeat = 2;
 }
 
 DVBDiSEqC::~DVBDiSEqC()

dvbrecorder.cpp

@@ -127 +127 @@
     initDeCSA();
 // (end)softcsa-0.5.pre3
 
+    _has_payload = false;
 }
 
 DVBRecorder::~DVBRecorder()
@@ -880 +881 @@
     if (!info->payloadStartSeen)
     {
         if (!tspacket.PayloadStart())
+        {
+            _has_payload = false;
             return true; // not payload start - drop packet
+        }
 
         VERBOSE(VB_RECORD,
                 QString("PID 0x%1 Found Payload Start").arg(pid,0,16));
         info->payloadStartSeen = true;
+        _has_payload = true;
     }
 
     // Write PAT & PMT tables occasionally

dvbrecorder.h

@@ -94 +94 @@
     bool IsOpen(void) const { return _stream_fd >= 0; }
     void Close(void);
 
+    bool HasPayload(void) const
+        { return _has_payload; }
+
     bool RecordsTransportStream(void) const
         { return _record_transport_stream_option; }
 
@@ -165 +168 @@
     ProgramMapTable         *_pmt;
     uint            _next_pmt_version;
     int             _ts_packets_until_psip_sync;
+    bool            _has_payload;
 
     // Input Misc
     /// PMT on input side

tv_rec.cpp

@@ -130 +130 @@
       // RingBuffer info
       ringBuffer(NULL), rbFilePrefix(""), rbFileExt("mpg")
 {
+      // Retune stuff
+      retune_timer = new TuningTimer();
+      retune_timer->setTimeout(10000);
+      retune_timer->start();
+      retune_requests = 0;
 }
 
 /** \fn TVRec::Init()
@@ -3188 +3193 @@
  */
 void TVRec::HandleTuning(void)
 {
+    bool handle_done = false;
+
     if (tuningRequests.size())
     {
         const TuningRequest *request = &tuningRequests.front();
@@ -3199 +3206 @@
                               kFlagEITScan|kFlagAntennaAdjust))
         {
             if (!recorder)
+            {
                 TuningFrequency(*request);
+                retune_timer->restart();
+                retune_timer->addMSecs(1);
+                retune_requests = 0;
+            }
             else
                 SetFlags(kFlagWaitingForRecPause);
         }
@@ -3221 +3233 @@
             GetDVBRecorder()->Close();
             GetDVBRecorder()->SetRingBuffer(NULL);
         }
+
+        retune_timer->restart();
+        retune_timer->addMSecs(1);
+        retune_requests = 0;
 #endif // USING_DVB
         TuningFrequency(lastTuningRequest);
     }
-
+   
     if (HasFlags(kFlagWaitingForSignal))
     {
         if (!TuningSignalCheck())
-            return;
+            handle_done = true;
     }
 
     if (HasFlags(kFlagWaitingForSIParser))
     {
         if (!TuningPMTCheck())
-            return;
+            handle_done = true;
     }
 
+#ifdef USING_DVB
+    if (HasFlags(kFlagWaitingForSignal) ||  // Just because we have signal, we
+        HasFlags(kFlagWaitingForSIParser))  // may not have the right transponder
+        if (!retune_timer->elapsed() && (retune_requests < 30))
+        {
+            RetuneChannel();
+            retune_requests++;
+        }
+#endif // USING_DVB
+
+    if (handle_done)
+        return;
+
     if (HasFlags(kFlagNeedToStartRecorder))
     {
         if (recorder)
@@ -3244 +3273 @@
         else
             TuningNewRecorder();
 
-        // If we got this far it is safe to set a new starting channel...
-        if (channel)
-            channel->StoreInputChannels();
+        SetFlags(kFlagWaitingForPayload);
+    }
+
+    if (HasFlags(kFlagWaitingForPayload))
+    {
+#ifdef USING_DVB
+        if (GetDVBRecorder())
+        {
+            // Check to see if we have a Payload Start
+            if (GetDVBRecorder()->HasPayload())
+            {
+                ClearFlags(kFlagWaitingForPayload);
+
+                // If we got this far it is safe to set a new starting channel...
+                if (channel)
+                    channel->StoreInputChannels();
+            }
+        }
+        else
+        {
+#endif // USING_DVB
+
+            ClearFlags(kFlagWaitingForPayload);
+
+            if (channel)
+                channel->StoreInputChannels();
+#if USING_DVB
+        }
+#endif // USING_DVB
     }
 }
 
@@ -3321 +3376 @@
     ClearFlags(kFlagPendingActions);
 }
 
+/** \fn TVRec::RetuneChannel(void)
+ *  \brief Retunes a DVB channel
+ */
+bool TVRec::RetuneChannel(void)
+{
+#ifdef USING_DVB
+    if (GetDVBChannel())
+        return GetDVBChannel()->Tune_again();
+#endif // USING_DVB
+    return false;
+}
+
 /** \fn TVRec::TuningFrequency(const TuningRequest&)
  *  \brief Performs initial tuning required for any tuning event.
  *
@@ -3880 +3947 @@
             msg += "WaitingForSignal,";
         if (kFlagWaitingForSIParser & f)
             msg += "WaitingForSIParser,";
+        if (kFlagWaitingForPayload & f)
+            msg += "kFlagWaitingForPayload,";
         if (kFlagNeedToStartRecorder & f)
             msg += "NeedToStartRecorder,";
         if (kFlagKillRingBuffer & f)

tv_rec.h

@@ -13 +13 @@
 #include "mythdeque.h"
 #include "programinfo.h"
 #include "tv.h"
+#include "util.h"
 
 class QSocket;
 class NuppelVideoRecorder;
@@ -37 +38 @@
 
 class PMTObject;
 
+class TuningTimer
+{
+  public:
+    TuningTimer() {}
+
+    void setTimeout(long t) { _timeout = t; }
+    long timeout(void) { return _timeout; }
+    void start() { t_timer.start(); }
+    int restart() { int ret = elapsed();
+                    t_timer.restart();
+                    return ret;
+                  }
+    int elapsed() { int ret = t_timer.elapsed();
+                    if (ret > _timeout) { ret = 0;  t_timer.restart(); }
+                    return ret;
+                  }
+
+    void addMSecs(int ms) { t_timer.addMSecs(ms); }
+
+  private:
+    QTime t_timer;
+    long _timeout;
+};
+
 /// Used to request ProgramInfo for channel browsing.
 typedef enum
 {
@@ -276 +301 @@
     void TuningNewRecorder(void);
     void TuningRestartRecorder(void);
 
+    bool RetuneChannel(void);
+
     void HandleStateChange(void);
     void ChangeState(TVState nextState);
     bool StateIsRecording(TVState state);
@@ -362 +389 @@
     QString      rbFilePrefix;
     QString      rbFileExt;
 
+    // Retune stuff
+    TuningTimer *retune_timer;
+    int retune_requests;
+
   public:
     static const uint kEITScanStartTimeout;
     static const uint kSignalMonitoringRate;
@@ -394 +425 @@
 
     static const uint kFlagNoRec                = 0x0000F000;
     static const uint kFlagKillRingBuffer       = 0x00010000;
+    static const uint kFlagWaitingForPayload    = 0x00020000;
 
     // Waiting stuff
     static const uint kFlagWaitingForRecPause   = 0x00100000;