diff options
Diffstat (limited to 'kstars/kstars/indi/webcam/v4l2_base.cpp')
-rw-r--r-- | kstars/kstars/indi/webcam/v4l2_base.cpp | 62 |
1 files changed, 31 insertions, 31 deletions
diff --git a/kstars/kstars/indi/webcam/v4l2_base.cpp b/kstars/kstars/indi/webcam/v4l2_base.cpp index 26ec3d51..a4ba8d72 100644 --- a/kstars/kstars/indi/webcam/v4l2_base.cpp +++ b/kstars/kstars/indi/webcam/v4l2_base.cpp @@ -168,7 +168,7 @@ int V4L2_Base::read_frame(char *errmsg) buf.type = V4L2_BUF_TYPE_VIDEO_CAPTURE; buf.memory = V4L2_MEMORY_MMAP; - if (-1 == xioctl (fd, VIDIOC_DQBUF, &buf)) { + if (-1 == xioctl (fd, VIDIOC_DTQBUF, &buf)) { switch (errno) { case EAGAIN: return 0; @@ -179,7 +179,7 @@ int V4L2_Base::read_frame(char *errmsg) /* fall through */ default: - return errno_exit ("VIDIOC_DQBUF", errmsg); + return errno_exit ("VIDIOC_DTQBUF", errmsg); } } @@ -206,8 +206,8 @@ int V4L2_Base::read_frame(char *errmsg) break; } - if (-1 == xioctl (fd, VIDIOC_QBUF, &buf)) - return errno_exit ("VIDIOC_QBUF", errmsg); + if (-1 == xioctl (fd, VIDIOC_TQBUF, &buf)) + return errno_exit ("VIDIOC_TQBUF", errmsg); if (dropFrame) { @@ -227,7 +227,7 @@ int V4L2_Base::read_frame(char *errmsg) buf.type = V4L2_BUF_TYPE_VIDEO_CAPTURE; buf.memory = V4L2_MEMORY_USERPTR; - if (-1 == xioctl (fd, VIDIOC_DQBUF, &buf)) { + if (-1 == xioctl (fd, VIDIOC_DTQBUF, &buf)) { switch (errno) { case EAGAIN: return 0; @@ -238,7 +238,7 @@ int V4L2_Base::read_frame(char *errmsg) /* fall through */ default: - errno_exit ("VIDIOC_DQBUF", errmsg); + errno_exit ("VIDIOC_DTQBUF", errmsg); } } @@ -251,8 +251,8 @@ int V4L2_Base::read_frame(char *errmsg) //process_image ((void *) buf.m.userptr); - if (-1 == xioctl (fd, VIDIOC_QBUF, &buf)) - errno_exit ("VIDIOC_QBUF", errmsg); + if (-1 == xioctl (fd, VIDIOC_TQBUF, &buf)) + errno_exit ("VIDIOC_TQBUF", errmsg); break; } @@ -309,8 +309,8 @@ int V4L2_Base::start_capturing(char * errmsg) buf.memory = V4L2_MEMORY_MMAP; buf.index = i; - if (-1 == xioctl (fd, VIDIOC_QBUF, &buf)) - return errno_exit ("VIDIOC_QBUF", errmsg); + if (-1 == xioctl (fd, VIDIOC_TQBUF, &buf)) + return errno_exit ("VIDIOC_TQBUF", errmsg); } @@ -336,8 +336,8 @@ int V4L2_Base::start_capturing(char * errmsg) buf.m.userptr = (unsigned long) buffers[i].start; buf.length = buffers[i].length; - if (-1 == xioctl (fd, VIDIOC_QBUF, &buf)) - return errno_exit ("VIDIOC_QBUF", errmsg); + if (-1 == xioctl (fd, VIDIOC_TQBUF, &buf)) + return errno_exit ("VIDIOC_TQBUF", errmsg); } @@ -414,7 +414,7 @@ int V4L2_Base::init_mmap(char *errmsg) req.type = V4L2_BUF_TYPE_VIDEO_CAPTURE; req.memory = V4L2_MEMORY_MMAP; - if (-1 == xioctl (fd, VIDIOC_REQBUFS, &req)) { + if (-1 == xioctl (fd, VIDIOC_RETQBUFS, &req)) { if (EINVAL == errno) { fprintf (stderr, "%s does not support " "memory mapping\n", dev_name); @@ -422,7 +422,7 @@ int V4L2_Base::init_mmap(char *errmsg) "memory mapping\n", dev_name); return -1; } else { - return errno_exit ("VIDIOC_REQBUFS", errmsg); + return errno_exit ("VIDIOC_RETQBUFS", errmsg); } } @@ -453,8 +453,8 @@ int V4L2_Base::init_mmap(char *errmsg) buf.memory = V4L2_MEMORY_MMAP; buf.index = n_buffers; - if (-1 == xioctl (fd, VIDIOC_QUERYBUF, &buf)) - return errno_exit ("VIDIOC_QUERYBUF", errmsg); + if (-1 == xioctl (fd, VIDIOC_TQUERYBUF, &buf)) + return errno_exit ("VIDIOC_TQUERYBUF", errmsg); buffers[n_buffers].length = buf.length; buffers[n_buffers].start = @@ -482,13 +482,13 @@ void V4L2_Base::init_userp(unsigned int buffer_size) req.type = V4L2_BUF_TYPE_VIDEO_CAPTURE; req.memory = V4L2_MEMORY_USERPTR; - if (-1 == xioctl (fd, VIDIOC_REQBUFS, &req)) { + if (-1 == xioctl (fd, VIDIOC_RETQBUFS, &req)) { if (EINVAL == errno) { fprintf (stderr, "%s does not support " "user pointer i/o\n", dev_name); exit (EXIT_FAILURE); } else { - errno_exit ("VIDIOC_REQBUFS", errmsg); + errno_exit ("VIDIOC_RETQBUFS", errmsg); } } @@ -514,7 +514,7 @@ int V4L2_Base::init_device(char *errmsg, int pixelFormat , int width, int height { unsigned int min; - if (-1 == xioctl (fd, VIDIOC_QUERYCAP, &cap)) + if (-1 == xioctl (fd, VIDIOC_TQUERYCAP, &cap)) { if (EINVAL == errno) { fprintf (stderr, "%s is no V4L2 device\n", @@ -522,7 +522,7 @@ int V4L2_Base::init_device(char *errmsg, int pixelFormat , int width, int height snprintf(errmsg, ERRMSGSIZ, "%s is no V4L2 device\n", dev_name); return -1; } else { - return errno_exit ("VIDIOC_QUERYCAP", errmsg); + return errno_exit ("VIDIOC_TQUERYCAP", errmsg); } } @@ -953,7 +953,7 @@ void V4L2_Base::enumerate_ctrl (void) for (queryctrl.id = V4L2_CID_BASE; queryctrl.id < V4L2_CID_LASTP1; queryctrl.id++) { - if (0 == xioctl (fd, VIDIOC_QUERYCTRL, &queryctrl)) + if (0 == xioctl (fd, VIDIOC_TQUERYCTRL, &queryctrl)) { cerr << "Control " << queryctrl.name << endl; @@ -969,14 +969,14 @@ void V4L2_Base::enumerate_ctrl (void) if (errno == EINVAL) continue; - errno_exit("VIDIOC_QUERYCTRL", errmsg); + errno_exit("VIDIOC_TQUERYCTRL", errmsg); return; } } for (queryctrl.id = V4L2_CID_PRIVATE_BASE; ; queryctrl.id++) { - if (0 == xioctl (fd, VIDIOC_QUERYCTRL, &queryctrl)) + if (0 == xioctl (fd, VIDIOC_TQUERYCTRL, &queryctrl)) { cerr << "Private Control " << queryctrl.name << endl; @@ -989,7 +989,7 @@ void V4L2_Base::enumerate_ctrl (void) if (errno == EINVAL) break; - errno_exit ("VIDIOC_QUERYCTRL", errmsg); + errno_exit ("VIDIOC_TQUERYCTRL", errmsg); return; } @@ -1007,12 +1007,12 @@ void V4L2_Base::enumerate_menu (void) for (querymenu.index = queryctrl.minimum; querymenu.index <= queryctrl.maximum; querymenu.index++) { - if (0 == xioctl (fd, VIDIOC_QUERYMENU, &querymenu)) + if (0 == xioctl (fd, VIDIOC_TQUERYMENU, &querymenu)) { cerr << " " << querymenu.name << endl; } else { - errno_exit("VIDIOC_QUERYMENU", errmsg); + errno_exit("VIDIOC_TQUERYMENU", errmsg); return; } } @@ -1027,10 +1027,10 @@ int V4L2_Base::query_ctrl(unsigned int ctrl_id, double & ctrl_min, double & ctr queryctrl.id = ctrl_id; - if (-1 == ioctl (fd, VIDIOC_QUERYCTRL, &queryctrl)) + if (-1 == ioctl (fd, VIDIOC_TQUERYCTRL, &queryctrl)) { if (errno != EINVAL) - return errno_exit ("VIDIOC_QUERYCTRL", errmsg); + return errno_exit ("VIDIOC_TQUERYCTRL", errmsg); else { @@ -1074,7 +1074,7 @@ int V4L2_Base::queryINTControls(INumberVectorProperty *nvp) for (queryctrl.id = V4L2_CID_BASE; queryctrl.id < V4L2_CID_LASTP1; queryctrl.id++) { - if (0 == ioctl (fd, VIDIOC_QUERYCTRL, &queryctrl)) + if (0 == ioctl (fd, VIDIOC_TQUERYCTRL, &queryctrl)) { if (queryctrl.flags & V4L2_CTRL_FLAG_DISABLED) { @@ -1113,13 +1113,13 @@ int V4L2_Base::queryINTControls(INumberVectorProperty *nvp) } } else if (errno != EINVAL) - return errno_exit ("VIDIOC_QUERYCTRL", errmsg); + return errno_exit ("VIDIOC_TQUERYCTRL", errmsg); } for (queryctrl.id = V4L2_CID_PRIVATE_BASE; ; queryctrl.id++) { - if (0 == ioctl (fd, VIDIOC_QUERYCTRL, &queryctrl)) + if (0 == ioctl (fd, VIDIOC_TQUERYCTRL, &queryctrl)) { if (queryctrl.flags & V4L2_CTRL_FLAG_DISABLED) { |