From 17485ccc96a2c562ba947070acc0a77be2b7db9c Mon Sep 17 00:00:00 2001 From: Klaus Schmidinger Date: Tue, 14 Feb 2012 13:41:52 +0100 Subject: Changed cDvbDevice::GrabImage() to use V4L2 (backport from version 1.7.3) --- CONTRIBUTORS | 4 ++ HISTORY | 5 ++ config.h | 4 +- dvbdevice.c | 148 ++++++++++++++++++++++++++++++++++++----------------------- dvbdevice.h | 6 +-- 5 files changed, 105 insertions(+), 62 deletions(-) diff --git a/CONTRIBUTORS b/CONTRIBUTORS index f4cbf23d..ab8d1199 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -2363,3 +2363,7 @@ Edgar Toernig Winfried Köhler for fixing wrong value for TableIdBAT in libsi/si.h + +Ralf Schueler + for backporting "Changed cDvbDevice::GrabImage() to use V4L" from version 1.7.3 + to 1.6.0-3 diff --git a/HISTORY b/HISTORY index a85d3891..b31cceb1 100644 --- a/HISTORY +++ b/HISTORY @@ -5758,3 +5758,8 @@ Video Disk Recorder Revision History - Fixed wrong value for TableIdBAT in libsi/si.h (thanks to Winfried Köhler). - Removed unneeded include files und from remux.h (reported by Tobias Grimm). + +2012-02-14: Version 1.6.0-3 + +- Changed cDvbDevice::GrabImage() to use V4L2 + (backport from version 1.7.3, thanks to Ralf Schueler). diff --git a/config.h b/config.h index d35d718d..132b8ce3 100644 --- a/config.h +++ b/config.h @@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: config.h 1.310.1.2 2008/09/06 14:30:00 kls Exp $ + * $Id: config.h 1.310.1.3 2012/02/14 12:16:31 kls Exp $ */ #ifndef __CONFIG_H @@ -22,7 +22,7 @@ // VDR's own version number: -#define VDRVERSION "1.6.0-2" +#define VDRVERSION "1.6.0-3" #define VDRVERSNUM 10600 // Version * 10000 + Major * 100 + Minor // The plugin API's version number: diff --git a/dvbdevice.c b/dvbdevice.c index c7408d35..a66486de 100644 --- a/dvbdevice.c +++ b/dvbdevice.c @@ -4,13 +4,13 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: dvbdevice.c 1.170 2008/02/09 16:11:44 kls Exp $ + * $Id: dvbdevice.c 1.170.1.1 2012/02/14 12:36:30 kls Exp $ */ #include "dvbdevice.h" #include #include -#include +#include #include #include #include @@ -521,69 +521,103 @@ uchar *cDvbDevice::GrabImage(int &Size, bool Jpeg, int Quality, int SizeX, int S int videoDev = open(buffer, O_RDWR); if (videoDev >= 0) { uchar *result = NULL; - struct video_mbuf mbuf; - if (ioctl(videoDev, VIDIOCGMBUF, &mbuf) == 0) { - int msize = mbuf.size; - unsigned char *mem = (unsigned char *)mmap(0, msize, PROT_READ | PROT_WRITE, MAP_SHARED, videoDev, 0); - if (mem && mem != (unsigned char *)-1) { - // set up the size and RGB - struct video_capability vc; - if (ioctl(videoDev, VIDIOCGCAP, &vc) == 0) { - struct video_mmap vm; - vm.frame = 0; - if ((SizeX > 0) && (SizeX <= vc.maxwidth) && - (SizeY > 0) && (SizeY <= vc.maxheight)) { - vm.width = SizeX; - vm.height = SizeY; - } - else { - vm.width = vc.maxwidth; - vm.height = vc.maxheight; - } - vm.format = VIDEO_PALETTE_RGB24; - if (ioctl(videoDev, VIDIOCMCAPTURE, &vm) == 0 && ioctl(videoDev, VIDIOCSYNC, &vm.frame) == 0) { - // make RGB out of BGR: - int memsize = vm.width * vm.height; - unsigned char *mem1 = mem; - for (int i = 0; i < memsize; i++) { - unsigned char tmp = mem1[2]; - mem1[2] = mem1[0]; - mem1[0] = tmp; - mem1 += 3; - } - - if (Quality < 0) - Quality = 100; - - dsyslog("grabbing to %s %d %d %d", Jpeg ? "JPEG" : "PNM", Quality, vm.width, vm.height); - if (Jpeg) { - // convert to JPEG: - result = RgbToJpeg(mem, vm.width, vm.height, Size, Quality); - if (!result) - esyslog("ERROR: failed to convert image to JPEG"); - } - else { - // convert to PNM: - char buf[32]; - snprintf(buf, sizeof(buf), "P6\n%d\n%d\n255\n", vm.width, vm.height); - int l = strlen(buf); - int bytes = memsize * 3; - Size = l + bytes; - result = MALLOC(uchar, Size); - if (result) { - memcpy(result, buf, l); - memcpy(result + l, mem, bytes); + // set up the size and RGB + v4l2_format fmt; + memset(&fmt, 0, sizeof(fmt)); + fmt.type = V4L2_BUF_TYPE_VIDEO_CAPTURE; + fmt.fmt.pix.width = SizeX; + fmt.fmt.pix.height = SizeY; + fmt.fmt.pix.pixelformat = V4L2_PIX_FMT_BGR24; + fmt.fmt.pix.field = V4L2_FIELD_ANY; + if (ioctl(videoDev, VIDIOC_S_FMT, &fmt) == 0) { + v4l2_requestbuffers reqBuf; + memset(&reqBuf, 0, sizeof(reqBuf)); + reqBuf.count = 2; + reqBuf.type = V4L2_BUF_TYPE_VIDEO_CAPTURE; + reqBuf.memory = V4L2_MEMORY_MMAP; + if (ioctl(videoDev, VIDIOC_REQBUFS, &reqBuf) >= 0) { + v4l2_buffer mbuf; + memset(&mbuf, 0, sizeof(mbuf)); + mbuf.type = V4L2_BUF_TYPE_VIDEO_CAPTURE; + mbuf.memory = V4L2_MEMORY_MMAP; + if (ioctl(videoDev, VIDIOC_QUERYBUF, &mbuf) == 0) { + int msize = mbuf.length; + unsigned char *mem = (unsigned char *)mmap(0, msize, PROT_READ | PROT_WRITE, MAP_SHARED, videoDev, 0); + if (mem && mem != (unsigned char *)-1) { + v4l2_buffer buf; + memset(&buf, 0, sizeof(buf)); + buf.type = V4L2_BUF_TYPE_VIDEO_CAPTURE; + buf.memory = V4L2_MEMORY_MMAP; + buf.index = 0; + if (ioctl(videoDev, VIDIOC_QBUF, &buf) == 0) { + v4l2_buf_type type = V4L2_BUF_TYPE_VIDEO_CAPTURE; + if (ioctl (videoDev, VIDIOC_STREAMON, &type) == 0) { + memset(&buf, 0, sizeof(buf)); + buf.type = V4L2_BUF_TYPE_VIDEO_CAPTURE; + buf.memory = V4L2_MEMORY_MMAP; + buf.index = 0; + if (ioctl(videoDev, VIDIOC_DQBUF, &buf) == 0) { + if (ioctl(videoDev, VIDIOC_STREAMOFF, &type) == 0) { + // make RGB out of BGR: + int memsize = fmt.fmt.pix.width * fmt.fmt.pix.height; + unsigned char *mem1 = mem; + for (int i = 0; i < memsize; i++) { + unsigned char tmp = mem1[2]; + mem1[2] = mem1[0]; + mem1[0] = tmp; + mem1 += 3; + } + + if (Quality < 0) + Quality = 100; + + dsyslog("grabbing to %s %d %d %d", Jpeg ? "JPEG" : "PNM", Quality, fmt.fmt.pix.width, fmt.fmt.pix.height); + if (Jpeg) { + // convert to JPEG: + result = RgbToJpeg(mem, fmt.fmt.pix.width, fmt.fmt.pix.height, Size, Quality); + if (!result) + esyslog("ERROR: failed to convert image to JPEG"); + } + else { + // convert to PNM: + char buf[32]; + snprintf(buf, sizeof(buf), "P6\n%d\n%d\n255\n", fmt.fmt.pix.width, fmt.fmt.pix.height); + int l = strlen(buf); + int bytes = memsize * 3; + Size = l + bytes; + result = MALLOC(uchar, Size); + if (result) { + memcpy(result, buf, l); + memcpy(result + l, mem, bytes); + } + else + esyslog("ERROR: failed to convert image to PNM"); + } + } + else + esyslog("ERROR: video device VIDIOC_STREAMOFF failed"); + } + else + esyslog("ERROR: video device VIDIOC_DQBUF failed"); } else - esyslog("ERROR: failed to convert image to PNM"); + esyslog("ERROR: video device VIDIOC_STREAMON failed"); } + else + esyslog("ERROR: video device VIDIOC_QBUF failed"); + munmap(mem, msize); } + else + esyslog("ERROR: failed to memmap video device"); } - munmap(mem, msize); + else + esyslog("ERROR: video device VIDIOC_QUERYBUF failed"); } else - esyslog("ERROR: failed to memmap video device"); + esyslog("ERROR: video device VIDIOC_REQBUFS failed"); } + else + esyslog("ERROR: video device VIDIOC_S_FMT failed"); close(videoDev); return result; } diff --git a/dvbdevice.h b/dvbdevice.h index 7bd3e545..127e02d7 100644 --- a/dvbdevice.h +++ b/dvbdevice.h @@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: dvbdevice.h 1.47 2008/02/08 13:48:31 kls Exp $ + * $Id: dvbdevice.h 1.47.1.1 2012/02/14 12:46:35 kls Exp $ */ #ifndef __DVBDEVICE_H @@ -15,8 +15,8 @@ #include "device.h" #include "dvbspu.h" -#if DVB_API_VERSION != 3 -#error VDR requires Linux DVB driver API version 3! +#if (DVB_API_VERSION << 8 | DVB_API_VERSION_MINOR) < 0x0300 +#error VDR requires Linux DVB driver API version 3.0 or higher! #endif #define MAXDVBDEVICES 8 -- cgit v1.2.3