Ticket #4466: 4466-hack-v1.patch

libs/libmythtv/channel.cpp

@@ -746 +746 @@
     return fmt;
 }
 
+static bool convertx_hack(
+    const QString &loc_err_msg,
+    int videofd, int inputNumV4L, int &ioctlval, bool &undo_convertx_hack)
+{
+    bool ok = true;
+    undo_convertx_hack = false;
+
+    // ConvertX (wis-go7007) requires streaming to be disabled
+    // before an input switch, do this if initial switch failed.
+    int  streamType = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+
+    ioctlval = ioctl(videofd, VIDIOC_STREAMOFF, &streamType);
+    if (ioctlval < 0)
+    {
+        VERBOSE(VB_IMPORTANT, loc_err_msg +
+                "\n\t\t\twhile disabling streaming (v4l v2)" + ENO);
+
+        ok = false;
+        ioctlval = 0;
+    }
+    else
+    {
+        undo_convertx_hack = true;
+
+        // Resend the input switch ioctl.
+        ioctlval = ioctl(videofd, VIDIOC_S_INPUT, &inputNumV4L);
+    }
+
+    return ok;
+}
+
+static bool convertx_unhack(const QString &loc_err_msg, int videofd)
+{
+    bool ok = true;
+
+    // ConvertX (wis-go7007) requires streaming to be disabled
+    // before an input switch, here we try to re-enable streaming.
+    int  streamType = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+
+    int ioctlval = ioctl(videofd, VIDIOC_STREAMON, &streamType);
+    if (ioctlval < 0)
+    {
+        VERBOSE(VB_IMPORTANT, loc_err_msg +
+                "\n\t\t\twhile reenabling ivtv streaming (v4l v2)" + ENO);
+
+        ok = false;
+    }
+
+    return ok;
+}
+
+static bool ivtv_hack(
+    const QString &loc_err_msg,
+    int videofd, int inputNumV4L, int &ioctlval, bool &undo_ivtv_hack)
+{
+    bool ok = true;
+    undo_ivtv_hack = false;
+
+    // The ivtv 0.10.6+ drivers require streaming to be disabled
+    // before an input switch, do this if initial switch failed.
+    struct v4l2_encoder_cmd command;
+    memset(&command, 0, sizeof(struct v4l2_encoder_cmd));
+    command.cmd   = V4L2_ENC_CMD_PAUSE;
+    command.flags = V4L2_ENC_CMD_STOP_AT_GOP_END;
+
+    ioctlval = ioctl(videofd, VIDIOC_ENCODER_CMD, &command);
+    if (ioctlval < 0)
+    {
+        VERBOSE(VB_IMPORTANT, loc_err_msg +
+                "\n\t\t\twhile disabling ivtv streaming (v4l v2)" + ENO);
+
+        ok = false;
+        ioctlval = 0;
+    }
+    else
+    {
+        undo_ivtv_hack = true;
+
+        // Resend the input switch ioctl.
+        ioctlval = ioctl(videofd, VIDIOC_S_INPUT, &inputNumV4L);
+    }
+
+    return ok;
+}
+
+static bool ivtv_unhack(const QString &loc_err_msg, int videofd)
+{
+    bool ok = true;
+
+    // The ivtv 0.10.6+ drivers require streaming to be disabled
+    // before an input switch, here we try to re-enable streaming.
+    struct v4l2_encoder_cmd command;
+    memset(&command, 0, sizeof(struct v4l2_encoder_cmd));
+    command.cmd = V4L2_ENC_CMD_RESUME;
+
+    int ioctlval = ioctl(videofd, VIDIOC_ENCODER_CMD, &command);
+    if (ioctlval < 0)
+    {
+        VERBOSE(VB_IMPORTANT, loc_err_msg +
+                "\n\t\t\twhile reenabling ivtv streaming (v4l v2)" + ENO);
+
+        ok = false;
+    }
+
+    return ok;
+}
+
 bool Channel::SetInputAndFormat(int inputNum, QString newFmt)
 {
     InputMap::const_iterator it = inputs.find(inputNum);
@@ -765 +872 @@
 
         int ioctlval = ioctl(videofd, VIDIOC_S_INPUT, &inputNumV4L);
 
-        // ConvertX (wis-go7007) requires streaming to be disabled
-        // before an input switch, do this if initial switch failed.
-        bool streamingDisabled = false;
-        int  streamType = V4L2_BUF_TYPE_VIDEO_CAPTURE;
-        if ((ioctlval < 0) && (errno == EBUSY))
+        bool undo_convertx_hack = false;
+        bool undo_ivtv_hack = false;
+        if ((driver_name == "ivtv") && (ioctlval < 0) && (errno == EBUSY))
         {
-            ioctlval = ioctl(videofd, VIDIOC_STREAMOFF, &streamType);
-            if (ioctlval < 0)
-            {
-                VERBOSE(VB_IMPORTANT, LOC_ERR + msg +
-                        "\n\t\t\twhile disabling streaming (v4l v2)" + ENO);
-
-                ok = false;
-                ioctlval = 0;
-            }
-            else
-            {
-                streamingDisabled = true;
-
-                // Resend the input switch ioctl.
-                ioctlval = ioctl(videofd, VIDIOC_S_INPUT, &inputNumV4L);
-            }
+            ok = ivtv_hack(LOC_ERR + msg, videofd, inputNumV4L,
+                           ioctlval, undo_ivtv_hack);
         }
+        else if ((ioctlval < 0) && (errno == EBUSY))
+        {
+            ok = convertx_hack(LOC_ERR + msg, videofd, inputNumV4L,
+                               ioctlval, undo_convertx_hack);
+        }
 
         if (ioctlval < 0)
         {
@@ -807 +903 @@
             ok = false;
         }
 
-        // ConvertX (wis-go7007) requires streaming to be disabled
-        // before an input switch, here we try to re-enable streaming.
-        if (streamingDisabled)
-        {
-            ioctlval = ioctl(videofd, VIDIOC_STREAMON, &streamType);
-            if (ioctlval < 0)
-            {
-                VERBOSE(VB_IMPORTANT, LOC_ERR + msg +
-                        "\n\t\t\twhile reenabling streaming (v4l v2)" + ENO);
-
-                ok = false;
-            }
-        }
+        if (undo_convertx_hack)
+            ok &= convertx_unhack(LOC_ERR + msg, videofd);
+        if (undo_ivtv_hack)
+            ok &= ivtv_unhack(LOC_ERR + msg, videofd);
     }
 
     if (usingv4l1)