Ticket #6611: hdpvr-signalmonitor-trunk-25379.patch

libs/libmythtv/analogsignalmonitor.cpp

@@ -4 +4 @@
 #include <cerrno>
 #include <unistd.h>
 #include <sys/ioctl.h>
+#include <poll.h>
 
 #include <linux/videodev.h>
 
@@ -17 +18 @@
 AnalogSignalMonitor::AnalogSignalMonitor(
     int db_cardnum, V4LChannel *_channel, uint64_t _flags) :
     SignalMonitor(db_cardnum, _channel, _flags),
-    usingv4l2(false)
+    m_usingv4l2(false), m_stage(0)
 {
     int videofd = channel->GetFd();
     if (videofd >= 0)
-        usingv4l2 = CardUtil::hasV4L2(videofd);
+    {
+        m_usingv4l2 = CardUtil::hasV4L2(videofd);
+        CardUtil::GetV4LInfo(videofd, m_card, m_driver, m_version);
+        VERBOSE(VB_RECORD, LOC + QString("card '%1' driver '%2' version '%3'")
+                .arg(m_card).arg(m_driver).arg(m_version));
+    }
+}
+
+bool AnalogSignalMonitor::handleHDPVR(int videofd)
+{
+    struct v4l2_encoder_cmd command;
+    struct pollfd polls;
+
+    if (m_stage == 0)
+    {
+        VERBOSE(VB_RECORD, LOC + "hd-pvr start encoding");
+        // Tell it to start encoding, then wait for it to actually feed us
+        // some data.
+        memset(&command, 0, sizeof(struct v4l2_encoder_cmd));
+        command.cmd = V4L2_ENC_CMD_START;
+        if (ioctl(videofd, VIDIOC_ENCODER_CMD, &command) == 0)
+            m_stage = 1;
+        else
+        {
+            VERBOSE(VB_IMPORTANT, LOC_ERR + "Start encoding failed" + ENO);
+            command.cmd = V4L2_ENC_CMD_STOP;
+            ioctl(videofd, VIDIOC_ENCODER_CMD, &command);
+        }
+    }
+
+    if (m_stage == 1)
+    {
+        VERBOSE(VB_RECORD, LOC + "hd-pvr wait for data");
+
+        polls.fd      = videofd;
+        polls.events  = POLLIN;
+        polls.revents = 0;
+
+        if (poll(&polls, 1, 1500) > 0)
+        {
+            m_stage = 2;
+            QMutexLocker locker(&statusLock);
+            signalStrength.SetValue(25);
+        }
+        else
+        {
+            VERBOSE(VB_RECORD, LOC + "Poll timed-out.  Resetting");
+            memset(&command, 0, sizeof(struct v4l2_encoder_cmd));
+            command.cmd = V4L2_ENC_CMD_STOP;
+            ioctl(videofd, VIDIOC_ENCODER_CMD, &command);
+            m_stage = 0;
+
+            QMutexLocker locker(&statusLock);
+            signalStrength.SetValue(0);
+        }
+    }
+
+    if (m_stage == 2)
+    {
+        VERBOSE(VB_RECORD, LOC + "hd-pvr data ready.  Stop encoding");
+
+        command.cmd = V4L2_ENC_CMD_STOP;
+        if (ioctl(videofd, VIDIOC_ENCODER_CMD, &command) == 0)
+            m_stage = 3;
+        else
+        {
+            QMutexLocker locker(&statusLock);
+            signalStrength.SetValue(50);
+        }
+    }
+
+    if (m_stage == 3)
+    {
+        struct v4l2_format vfmt;
+        memset(&vfmt, 0, sizeof(vfmt));
+        vfmt.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+
+        VERBOSE(VB_RECORD, LOC + "hd-pvr waiting for valid resolution");
+        if ((ioctl(videofd, VIDIOC_G_FMT, &vfmt) == 0) && vfmt.fmt.pix.width)
+        {
+            VERBOSE(VB_RECORD, LOC + QString("hd-pvr resolution %1 x %2")
+                    .arg(vfmt.fmt.pix.width).arg(vfmt.fmt.pix.height));
+            m_stage = 4;
+        }
+        else
+        {
+            QMutexLocker locker(&statusLock);
+            signalStrength.SetValue(75);
+        }
+    }
+
+    return (m_stage == 4);
 }
 
 void AnalogSignalMonitor::UpdateValues(void)
@@ -37 +129 @@
         return;
 
     bool isLocked = false;
-    if (usingv4l2)
+    if (m_usingv4l2)
     {
-        struct v4l2_tuner tuner;
-        bzero(&tuner, sizeof(tuner));
-
-        if (ioctl(videofd, VIDIOC_G_TUNER, &tuner, 0) < 0)
-        {
-            VERBOSE(VB_IMPORTANT,
-                    LOC_ERR + "Failed to probe signal (v4l2)" + ENO);
-        }
+        if (m_driver == "hdpvr")
+            isLocked = handleHDPVR(videofd);
         else
         {
-            isLocked = tuner.signal;
+            struct v4l2_tuner tuner;
+            bzero(&tuner, sizeof(tuner));
+
+            if (ioctl(videofd, VIDIOC_G_TUNER, &tuner, 0) < 0)
+            {
+                VERBOSE(VB_IMPORTANT,
+                        LOC_ERR + "Failed to probe signal (v4l2)" + ENO);
+            }
+            else
+            {
+                isLocked = tuner.signal;
+            }
         }
     }
     else
@@ -71 +168 @@
     {
         QMutexLocker locker(&statusLock);
         signalLock.SetValue(isLocked);
-        signalStrength.SetValue(isLocked ? 100 : 0);
+        if (isLocked)
+            signalStrength.SetValue(100);
     }
 
     EmitStatus();

libs/libmythtv/analogsignalmonitor.h

@@ -19 +19 @@
     virtual void UpdateValues(void);
 
   private:
-    bool usingv4l2;
+    bool handleHDPVR(int videofd);
+
+    bool     m_usingv4l2;
+    QString  m_card;
+    QString  m_driver;
+    uint32_t m_version;
+    int      m_stage;
 };
 
 #endif // _ANALOG_SIGNAL_MONITOR_H_

libs/libmythtv/mpegrecorder.cpp

@@ -1043 +1043 @@
 
     if (driver == "hdpvr")
     {
-        if (curRecording->GetRecordingGroup() == "LiveTV")
-        {
-            // Don't bother checking resolution, always use best bitrate
-            int maxbitrate = std::max(high_mpeg4peakbitrate,
-                                      high_mpeg4avgbitrate);
-            SetBitrate(high_mpeg4avgbitrate, maxbitrate, "LiveTV");
-        }
-
         int progNum = 1;
         MPEGStreamData *sd = new MPEGStreamData(progNum, true);
         sd->SetRecordingType(_recording_type);
@@ -1530 +1522 @@
     memset(&command, 0, sizeof(struct v4l2_encoder_cmd));
     command.cmd = V4L2_ENC_CMD_START;
 
-    if (driver == "hdpvr" && curRecording->GetRecordingGroup() != "LiveTV")
+    if (driver == "hdpvr")
         HandleResolutionChanges();
 
     VERBOSE(VB_RECORD, LOC + "StartEncoding");
@@ -1620 +1612 @@
         DTVRecorder::BufferedWrite(_scratch[i]);
 }
 
-/// After a resolution change, it can take the HD-PVR a few
-/// seconds before it is usable again.
-bool MpegRecorder::WaitFor_HDPVR(void)
-{
-    struct v4l2_encoder_cmd command;
-    struct v4l2_format vfmt;
-    struct pollfd polls;
-    int    idx;
-
-    // Tell it to start encoding, then wait for it to actually feed us
-    // some data.
-    QMutexLocker locker(&start_stop_encoding_lock);
-
-    // Sleep any less than 1.5 seconds, and the HD-PVR will
-    // return the old resolution, when the resolution is changing.
-    usleep(1500 * 1000);
-
-    memset(&command, 0, sizeof(struct v4l2_encoder_cmd));
-    command.cmd = V4L2_ENC_CMD_START;
-
-    for (idx = 0; idx < 20; ++idx)
-    {
-        if (ioctl(readfd, VIDIOC_ENCODER_CMD, &command) == 0)
-            break;
-        usleep(100 * 1000);
-    }
-
-    if (idx == 20)
-        return false;
-
-    polls.fd      = readfd;
-    polls.events  = POLLIN;
-    polls.revents = 0;
-
-    if (poll(&polls, 1, 5000) <= 0)
-        return false;
-
-    // HD-PVR should now be "ready"
-    command.cmd = V4L2_ENC_CMD_STOP;
-
-    if (ioctl(readfd, VIDIOC_ENCODER_CMD, &command) < 0)
-        return false;
-
-    memset(&vfmt, 0, sizeof(vfmt));
-    vfmt.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
-
-    for (idx = 0; idx < 20; ++idx)
-    {
-        if (0 == ioctl(chanfd, VIDIOC_G_FMT, &vfmt))
-            return true;
-        // Typically takes 0.9 seconds after a resolution change
-        usleep(100 * 1000);
-    }
-
-    VERBOSE(VB_RECORD, LOC + "WaitForHDPVR failed");
-    return false;
-}
-
 void MpegRecorder::SetBitrate(int bitrate, int maxbitrate,
                               const QString & reason)
 {
@@ -1715 +1649 @@
     memset(&vfmt, 0, sizeof(vfmt));
     vfmt.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
 
-    if (driver == "hdpvr")
-        WaitFor_HDPVR();
-
     if (0 == ioctl(chanfd, VIDIOC_G_FMT, &vfmt))
     {
         VERBOSE(VB_RECORD, LOC + QString("Got Resolution %1x%2")

libs/libmythtv/mpegrecorder.h

@@ -85 +85 @@
 
     void ResetForNewFile(void);
 
-    bool WaitFor_HDPVR(void);
     void SetBitrate(int bitrate, int maxbitrate, const QString & reason);
     void HandleResolutionChanges(void);
 

libs/libmythtv/signalmonitor.cpp

@@ -96 +96 @@
 #endif
 
 #ifdef USING_V4L
-#if 0 // Just use ChannelChangeMonitor for these types
-    if ((cardtype.toUpper() == "V4L") ||
-        (cardtype.toUpper() == "MPEG"))
+    if ((cardtype.toUpper() == "HDPVR"))
     {
         V4LChannel *chan = dynamic_cast<V4LChannel*>(channel);
         if (chan)
             signalMonitor = new AnalogSignalMonitor(db_cardnum, chan);
     }
 #endif
-#endif
 
 #ifdef USING_HDHOMERUN
     if (cardtype.toUpper() == "HDHOMERUN")

libs/libmythtv/signalmonitor.h

@@ -306 +306 @@
     return (CardUtil::IsDVBCardType(cardtype) ||
             (cardtype.toUpper() == "HDTV")      ||
             (cardtype.toUpper() == "HDHOMERUN") ||
+            (cardtype.toUpper() == "HDPVR") ||
             (cardtype.toUpper() == "FIREWIRE")  ||
             (cardtype.toUpper() == "FREEBOX"));
 }