Ticket #8337: vbi_cleanup.diff

mythtv/libs/libmythtv/vbitext/vbi.c

@@ -16 +16 @@
 #include "vt.h"
 #include "vbi.h"
 #include "hamm.h"
+#include "videodev_myth.h"
 
 #define FAC    (1<<16)         // factor for fix-point arithmetic
 
 static unsigned char *rawbuf;          // one common buffer for raw vbi data.
 static int rawbuf_size;                // its current size
 
-
 /***** bttv api *****/
 
 #define BASE_VIDIOCPRIVATE     192
 #define BTTV_VERSION           _IOR('v' , BASE_VIDIOCPRIVATE+6, int)
 #define BTTV_VBISIZE           _IOR('v' , BASE_VIDIOCPRIVATE+8, int)
 
-/***** v4l2 vbi-api *****/
-
-/* #include "/usr/src/linux/include/linux/videodev2.h" */
-
-enum v4l2_buf_type {
-        V4L2_BUF_TYPE_VIDEO_CAPTURE  = 1,
-        V4L2_BUF_TYPE_VIDEO_OUTPUT   = 2,
-        V4L2_BUF_TYPE_VIDEO_OVERLAY  = 3,
-        V4L2_BUF_TYPE_VBI_CAPTURE    = 4,
-        V4L2_BUF_TYPE_VBI_OUTPUT     = 5,
-        V4L2_BUF_TYPE_PRIVATE        = 0x80,
-};
-
-struct v4l2_vbi_format
-{
-    unsigned int sampling_rate;                /* in 1 Hz */
-    unsigned int offset;                       /* sampling starts # samples after rising hs */
-    unsigned int samples_per_line;
-    unsigned int sample_format;                /* V4L2_VBI_SF_* */
-    signed int start[2];
-    unsigned int count[2];
-    unsigned int flags;                        /* V4L2_VBI_* */
-    unsigned int reserved2;            /* must be zero */
-};
-
-struct v4l2_format
-{
-    enum v4l2_buf_type type;                   /* V4L2_BUF_TYPE_* */
-    union
-    {
-       struct v4l2_vbi_format vbi;     /*  VBI data  */
-       unsigned char raw_data[200];            /* user-defined */
-    } fmt;
-};
-
-#define V4L2_PIX_FMT_GREY     0x59455247 /* v4l2_fourcc('G','R','E','Y') *//*  8  Greyscale     */
-#define VIDIOC_G_FMT           _IOWR('V',  4, struct v4l2_format)
-
 /***** end of api definitions *****/
 
 static void
@@ -572 +534 @@
 #ifdef _WIN32
     (void) vbi;
 #else // if !_WIN32
-    struct v4l2_format v4l2_format[1];
-    struct v4l2_vbi_format *vbifmt = &v4l2_format->fmt.vbi;
+    struct v4l2_format v4l2_format;
+    struct v4l2_vbi_format *vbifmt = &v4l2_format.fmt.vbi;
 
     memset(&v4l2_format, 0, sizeof(v4l2_format));
-    v4l2_format->type = V4L2_BUF_TYPE_VBI_CAPTURE;
-    if (ioctl(vbi->fd, VIDIOC_G_FMT, v4l2_format) == -1)
+    v4l2_format.type = V4L2_BUF_TYPE_VBI_CAPTURE;
+    if (ioctl(vbi->fd, VIDIOC_G_FMT, &v4l2_format) == -1)
     {
        // not a v4l2 device.  assume bttv and create a standard fmt-struct.
        int size;