v4l1 has been deprecated and removed from the kernel for almost a decade.
Signed-off-by: Zebediah Figura z.figura12@gmail.com --- This patch, notably, does not port the support for mmap(). Devices that do not support read(), and only support mmap(), can be emulated with libv4l2. Accordingly this patch requires libv4l2 to read from those devices.
configure.ac | 9 +++++++++ 1 file changed, 9 insertions(+)
diff --git a/configure.ac b/configure.ac index ef0a2612ff..31dd472533 100644 --- a/configure.ac +++ b/configure.ac @@ -82,6 +82,7 @@ AC_ARG_WITH(sdl, AS_HELP_STRING([--without-sdl],[do not use SDL])) AC_ARG_WITH(tiff, AS_HELP_STRING([--without-tiff],[do not use TIFF])) AC_ARG_WITH(udev, AS_HELP_STRING([--without-udev],[do not use udev (plug and play support)])) AC_ARG_WITH(v4l, AS_HELP_STRING([--without-v4l],[do not use v4l1 (v4l support)])) +AC_ARG_WITH(v4l2, AS_HELP_STRING([--without-v4l2],[do not use v4l2 (video capture)])) AC_ARG_WITH(vkd3d, AS_HELP_STRING([--without-vkd3d],[do not use vkd3d (Direct3D 12 support)])) AC_ARG_WITH(vulkan, AS_HELP_STRING([--without-vulkan],[do not use Vulkan])) AC_ARG_WITH(xcomposite,AS_HELP_STRING([--without-xcomposite],[do not use the Xcomposite extension]), @@ -1425,6 +1426,14 @@ fi WINE_NOTICE_WITH(v4l,[test "x$ac_cv_lib_soname_v4l1" = "x"], [libv4l ${notice_platform}development files not found.])
+dnl **** Check for libv4l2 **** +if test "x$with_v4l2" != "xno" +then + WINE_CHECK_SONAME(v4l2,v4l2_open,,,) +fi +WINE_NOTICE_WITH(v4l2,[test "x$ac_cv_lib_soname_v4l2" = "x"], + [libv4l2 ${notice_platform}development files not found.]) + dnl **** Check for libgphoto2 **** if test "x$with_gphoto" != "xno" then
Signed-off-by: Zebediah Figura z.figura12@gmail.com --- dlls/qcap/qcap_main.h | 1 + dlls/qcap/v4l.c | 611 +++++++++++++++++------------------------- dlls/qcap/yuv.c | 2 +- 3 files changed, 242 insertions(+), 372 deletions(-)
diff --git a/dlls/qcap/qcap_main.h b/dlls/qcap/qcap_main.h index 69d94bfff6..733772ee73 100644 --- a/dlls/qcap/qcap_main.h +++ b/dlls/qcap/qcap_main.h @@ -20,6 +20,7 @@ #ifndef _QCAP_MAIN_H_DEFINED #define _QCAP_MAIN_H_DEFINED
+#include "wine/heap.h" #include "wine/strmbase.h"
extern DWORD ObjectRefCount(BOOL increment) DECLSPEC_HIDDEN; diff --git a/dlls/qcap/v4l.c b/dlls/qcap/v4l.c index 80b0fe82d8..1b10e503c9 100644 --- a/dlls/qcap/v4l.c +++ b/dlls/qcap/v4l.c @@ -1,11 +1,8 @@ /* - * DirectShow capture services (QCAP.DLL) + * v4l2 backend to the VFW Capture filter * * Copyright 2005 Maarten Lankhorst - * - * This file contains the part of the vfw capture interface that - * does the actual Video4Linux(1/2) stuff required for capturing - * and setting/getting media format.. + * Copyright 2019 Zebediah Figura * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -43,11 +40,8 @@ #ifdef HAVE_ASM_TYPES_H #include <asm/types.h> #endif -#ifdef HAVE_LIBV4L1_H -#include <libv4l1.h> -#endif -#ifdef HAVE_LINUX_VIDEODEV_H -#include <linux/videodev.h> +#ifdef HAVE_LINUX_VIDEODEV2_H +#include <linux/videodev2.h> #endif #ifdef HAVE_UNISTD_H #include <unistd.h> @@ -67,33 +61,33 @@ #include "capture.h" #include "qcap_main.h"
-WINE_DEFAULT_DEBUG_CHANNEL(qcap_v4l); +WINE_DEFAULT_DEBUG_CHANNEL(qcap); +WINE_DECLARE_DEBUG_CHANNEL(winediag);
-#ifdef VIDIOCMCAPTURE +#ifdef HAVE_LINUX_VIDEODEV2_H
static typeof(open) *video_open = open; static typeof(close) *video_close = close; static typeof(ioctl) *video_ioctl = ioctl; static typeof(read) *video_read = read; -static typeof(mmap) *video_mmap = mmap; -static typeof(munmap) *video_munmap = munmap;
-static void video_init(void) +static BOOL video_init(void) { -#ifdef SONAME_LIBV4L1 +#ifdef SONAME_LIBV4L2 static void *video_lib;
if (video_lib) - return; - video_lib = wine_dlopen(SONAME_LIBV4L1, RTLD_NOW, NULL, 0); - if (!video_lib) - return; - video_open = wine_dlsym(video_lib, "v4l1_open", NULL, 0); - video_close = wine_dlsym(video_lib, "v4l1_close", NULL, 0); - video_ioctl = wine_dlsym(video_lib, "v4l1_ioctl", NULL, 0); - video_read = wine_dlsym(video_lib, "v4l1_read", NULL, 0); - video_mmap = wine_dlsym(video_lib, "v4l1_mmap", NULL, 0); - video_munmap = wine_dlsym(video_lib, "v4l1_munmap", NULL, 0); + return TRUE; + if (!(video_lib = wine_dlopen(SONAME_LIBV4L2, RTLD_NOW, NULL, 0))) + return FALSE; + video_open = wine_dlsym(video_lib, "v4l2_open", NULL, 0); + video_close = wine_dlsym(video_lib, "v4l2_close", NULL, 0); + video_ioctl = wine_dlsym(video_lib, "v4l2_ioctl", NULL, 0); + video_read = wine_dlsym(video_lib, "v4l2_read", NULL, 0); + + return TRUE; +#else + return FALSE; #endif }
@@ -109,62 +103,39 @@ struct _Capture IPin *pOut; int fd, mmap; BOOL iscommitted, stopped; - struct video_picture pict; - int dbrightness, dhue, dcolour, dcontrast;
- /* mmap (V4l1) */ - struct video_mmap *grab_buf; - struct video_mbuf gb_buffers; - unsigned char *pmap; - int buffers; - - /* read (V4l1) */ - int imagesize; - char * grab_data; + __u32 pixelformat; + int depth;
- int curframe; + int image_size; + unsigned char *image_data;
HANDLE thread; Renderer renderer; };
-struct renderlist -{ - int depth; - const char* name; - Renderer renderer; -}; - static void renderer_RGB(const Capture *capBox, LPBYTE bufferin, const BYTE *stream); static void renderer_YUV(const Capture *capBox, LPBYTE bufferin, const BYTE *stream);
-static const struct renderlist renderlist_V4l[] = { - { 0, "NULL renderer", NULL }, - { 8, "Gray scales", NULL }, /* 1, Don't support */ - { 0, "High 240 cube (BT848)", NULL }, /* 2, Don't support */ - { 16, "16 bit RGB (565)", NULL }, /* 3, Don't support */ - { 24, "24 bit RGB values", renderer_RGB }, /* 4, Supported, */ - { 32, "32 bit RGB values", renderer_RGB }, /* 5, Supported */ - { 16, "15 bit RGB (555)", NULL }, /* 6, Don't support */ - { 16, "YUV 422 (Not P)", renderer_YUV }, /* 7, Supported */ - { 16, "YUYV (Not P)", renderer_YUV }, /* 8, Supported */ - { 16, "UYVY (Not P)", renderer_YUV }, /* 9, Supported */ - { 16, "YUV 420 (Not P)", NULL }, /* 10, Not supported, if I had to guess it's YYUYYV */ - { 12, "YUV 411 (Not P)", renderer_YUV }, /* 11, Supported */ - { 0, "Raw capturing (BT848)", NULL }, /* 12, Don't support */ - { 16, "YUV 422 (Planar)", renderer_YUV }, /* 13, Supported */ - { 12, "YUV 411 (Planar)", renderer_YUV }, /* 14, Supported */ - { 12, "YUV 420 (Planar)", renderer_YUV }, /* 15, Supported */ - { 10, "YUV 410 (Planar)", renderer_YUV }, /* 16, Supported */ - /* FIXME: add YUV420 support */ - { 0, NULL, NULL }, +static const struct +{ + int depth; + __u32 pixelformat; + Renderer renderer; +} +renderlist_V4l[] = +{ + {24, V4L2_PIX_FMT_BGR24, renderer_RGB}, + {32, V4L2_PIX_FMT_BGR32, renderer_RGB}, + {16, V4L2_PIX_FMT_YUYV, renderer_YUV}, + {16, V4L2_PIX_FMT_UYVY, renderer_YUV}, + {12, V4L2_PIX_FMT_Y41P, renderer_YUV}, + {16, V4L2_PIX_FMT_YUV422P, renderer_YUV}, + {12, V4L2_PIX_FMT_YUV411P, renderer_YUV}, + {12, V4L2_PIX_FMT_YUV420, renderer_YUV}, + {10, V4L2_PIX_FMT_YUV410, renderer_YUV}, };
-static const int fallback_V4l[] = { 4, 5, 7, 8, 9, 13, 15, 14, 16, 11, -1 }; -/* Fallback: First try raw formats (Should try yuv first perhaps?), then yuv */ - -/* static const Capture defbox; */ - static int xioctl(int fd, int request, void * arg) { int r; @@ -177,69 +148,17 @@ static int xioctl(int fd, int request, void * arg) }
/* Prepare the capture buffers */ -static HRESULT V4l_Prepare(Capture *capBox) +static HRESULT V4l_Prepare(Capture *device) { - TRACE("%p: Preparing for %dx%d resolution\n", capBox, capBox->width, capBox->height); - - /* Try mmap */ - capBox->mmap = 0; - if (xioctl(capBox->fd, VIDIOCGMBUF, &capBox->gb_buffers) != -1 && - capBox->gb_buffers.frames) - { - capBox->buffers = capBox->gb_buffers.frames; - if (capBox->gb_buffers.frames > 1) - capBox->buffers = 1; - TRACE("%p: Using %d/%d buffers\n", capBox, - capBox->buffers, capBox->gb_buffers.frames); - - capBox->pmap = video_mmap( 0, capBox->gb_buffers.size, PROT_READ|PROT_WRITE, - MAP_SHARED, capBox->fd, 0 ); - if (capBox->pmap != MAP_FAILED) - { - int i; - - capBox->grab_buf = CoTaskMemAlloc(sizeof(struct video_mmap) * capBox->buffers); - if (!capBox->grab_buf) - { - video_munmap(capBox->pmap, capBox->gb_buffers.size); - return E_OUTOFMEMORY; - } - - /* Setup mmap capture buffers. */ - for (i = 0; i < capBox->buffers; i++) - { - capBox->grab_buf[i].format = capBox->pict.palette; - capBox->grab_buf[i].frame = i; - capBox->grab_buf[i].width = capBox->width; - capBox->grab_buf[i].height = capBox->height; - } - capBox->mmap = 1; - } - } - if (!capBox->mmap) - { - capBox->buffers = 1; - capBox->imagesize = renderlist_V4l[capBox->pict.palette].depth * - capBox->height * capBox->width / 8; - capBox->grab_data = CoTaskMemAlloc(capBox->imagesize); - if (!capBox->grab_data) - return E_OUTOFMEMORY; - } - TRACE("Using mmap: %d\n", capBox->mmap); + device->image_size = device->depth * device->height * device->width / 8; + if (!(device->image_data = heap_alloc(device->image_size))) + return E_OUTOFMEMORY; return S_OK; }
-static void V4l_Unprepare(Capture *capBox) +static void V4l_Unprepare(Capture *device) { - if (capBox->mmap) - { - for (capBox->curframe = 0; capBox->curframe < capBox->buffers; capBox->curframe++) - xioctl(capBox->fd, VIDIOCSYNC, &capBox->grab_buf[capBox->curframe]); - video_munmap(capBox->pmap, capBox->gb_buffers.size); - CoTaskMemFree(capBox->grab_buf); - } - else - CoTaskMemFree(capBox->grab_data); + heap_free(device->image_data); }
HRESULT qcap_driver_destroy(Capture *capBox) @@ -254,52 +173,53 @@ HRESULT qcap_driver_destroy(Capture *capBox) return S_OK; }
-HRESULT qcap_driver_set_format(Capture *capBox, AM_MEDIA_TYPE * mT) +HRESULT qcap_driver_set_format(Capture *device, AM_MEDIA_TYPE *mt) { + struct v4l2_format format = {0}; int newheight, newwidth; - struct video_window window; - VIDEOINFOHEADER *format; - - TRACE("%p\n", capBox); + VIDEOINFOHEADER *vih; + int fd = device->fd;
- format = (VIDEOINFOHEADER *) mT->pbFormat; - if (format->bmiHeader.biBitCount != 24 || - format->bmiHeader.biCompression != BI_RGB) + vih = (VIDEOINFOHEADER *)mt->pbFormat; + if (vih->bmiHeader.biBitCount != 24 || vih->bmiHeader.biCompression != BI_RGB) { - FIXME("unsupported media type %d %d\n", format->bmiHeader.biBitCount, - format->bmiHeader.biCompression ); + FIXME("Unsupported compression %#x, bpp %u.\n", vih->bmiHeader.biCompression, + vih->bmiHeader.biBitCount); return VFW_E_INVALIDMEDIATYPE; }
- newwidth = format->bmiHeader.biWidth; - newheight = format->bmiHeader.biHeight; + newwidth = vih->bmiHeader.biWidth; + newheight = vih->bmiHeader.biHeight;
- TRACE("%p -> (%p) - %d %d\n", capBox, mT, newwidth, newheight); - - if (capBox->height == newheight && capBox->width == newwidth) + if (device->height == newheight && device->width == newwidth) return S_OK;
- if(-1 == xioctl(capBox->fd, VIDIOCGWIN, &window)) + format.type = V4L2_BUF_TYPE_VIDEO_CAPTURE; + if (xioctl(fd, VIDIOC_G_FMT, &format) == -1) { - ERR("ioctl(VIDIOCGWIN) failed (%d)\n", errno); - return E_FAIL; + ERR("Failed to get current format: %s\n", strerror(errno)); + return VFW_E_TYPE_NOT_ACCEPTED; } - window.width = newwidth; - window.height = newheight; - if (xioctl(capBox->fd, VIDIOCSWIN, &window) == -1) + + format.fmt.pix.width = newwidth; + format.fmt.pix.height = newheight; + + if (!xioctl(fd, VIDIOC_S_FMT, &format) + && format.fmt.pix.width == newwidth + && format.fmt.pix.height == newheight) { - TRACE("using software resize: %dx%d -> %dx%d\n", - window.width, window.height, capBox->width, capBox->height); - capBox->swresize = TRUE; + device->width = newwidth; + device->height = newheight; + device->swresize = FALSE; } else { - capBox->height = window.height; - capBox->width = window.width; - capBox->swresize = FALSE; + TRACE("Using software resize: %dx%d -> %dx%d.\n", + format.fmt.pix.width, format.fmt.pix.height, device->width, device->height); + device->swresize = TRUE; } - capBox->outputwidth = window.width; - capBox->outputheight = window.height; + device->outputwidth = format.fmt.pix.width; + device->outputheight = format.fmt.pix.height; return S_OK; }
@@ -349,109 +269,92 @@ HRESULT qcap_driver_get_format(const Capture *capBox, AM_MEDIA_TYPE ** mT) return S_OK; }
-HRESULT qcap_driver_get_prop_range( Capture *capBox, - VideoProcAmpProperty Property, LONG *pMin, LONG *pMax, - LONG *pSteppingDelta, LONG *pDefault, LONG *pCapsFlags ) +static __u32 v4l2_cid_from_qcap_property(VideoProcAmpProperty property) { - TRACE("%p -> %d %p %p %p %p %p\n", capBox, Property, - pMin, pMax, pSteppingDelta, pDefault, pCapsFlags); - - switch (Property) + switch (property) { case VideoProcAmp_Brightness: - *pDefault = capBox->dbrightness; - break; + return V4L2_CID_BRIGHTNESS; case VideoProcAmp_Contrast: - *pDefault = capBox->dcontrast; - break; + return V4L2_CID_CONTRAST; case VideoProcAmp_Hue: - *pDefault = capBox->dhue; - break; + return V4L2_CID_HUE; case VideoProcAmp_Saturation: - *pDefault = capBox->dcolour; - break; + return V4L2_CID_SATURATION; default: - FIXME("Not implemented %d\n", Property); - return E_NOTIMPL; + FIXME("Unhandled property %d.\n", property); + return 0; } - *pMin = 0; - *pMax = 65535; - *pSteppingDelta = 65536/256; - *pCapsFlags = VideoProcAmp_Flags_Manual; - return S_OK; }
-HRESULT qcap_driver_get_prop( Capture *capBox, - VideoProcAmpProperty Property, LONG *lValue, LONG *Flags ) +HRESULT qcap_driver_get_prop_range(Capture *device, VideoProcAmpProperty property, + LONG *min, LONG *max, LONG *step, LONG *default_value, LONG *flags) { - TRACE("%p -> %d %p %p\n", capBox, Property, lValue, Flags); + struct v4l2_queryctrl ctrl; + + ctrl.id = v4l2_cid_from_qcap_property(property);
- switch (Property) + if (xioctl(device->fd, VIDIOC_QUERYCTRL, &ctrl) == -1) { - case VideoProcAmp_Brightness: - *lValue = capBox->pict.brightness; - break; - case VideoProcAmp_Contrast: - *lValue = capBox->pict.contrast; - break; - case VideoProcAmp_Hue: - *lValue = capBox->pict.hue; - break; - case VideoProcAmp_Saturation: - *lValue = capBox->pict.colour; - break; - default: - FIXME("Not implemented %d\n", Property); - return E_NOTIMPL; + WARN("Failed to query control: %s\n", strerror(errno)); + return E_PROP_ID_UNSUPPORTED; } - *Flags = VideoProcAmp_Flags_Manual; + + *min = ctrl.minimum; + *max = ctrl.maximum; + *step = ctrl.step; + *default_value = ctrl.default_value; + *flags = VideoProcAmp_Flags_Manual; return S_OK; }
-HRESULT qcap_driver_set_prop(Capture *capBox, VideoProcAmpProperty Property, - LONG lValue, LONG Flags) +HRESULT qcap_driver_get_prop(Capture *device, VideoProcAmpProperty property, + LONG *value, LONG *flags) { - TRACE("%p -> %d %d %d\n", capBox, Property, lValue, Flags); + struct v4l2_control ctrl; + + ctrl.id = v4l2_cid_from_qcap_property(property);
- switch (Property) + if (xioctl(device->fd, VIDIOC_G_CTRL, &ctrl) == -1) { - case VideoProcAmp_Brightness: - capBox->pict.brightness = lValue; - break; - case VideoProcAmp_Contrast: - capBox->pict.contrast = lValue; - break; - case VideoProcAmp_Hue: - capBox->pict.hue = lValue; - break; - case VideoProcAmp_Saturation: - capBox->pict.colour = lValue; - break; - default: - FIXME("Not implemented %d\n", Property); - return E_NOTIMPL; + WARN("Failed to get property: %s\n", strerror(errno)); + return E_FAIL; }
- if (xioctl(capBox->fd, VIDIOCSPICT, &capBox->pict) == -1) + *value = ctrl.value; + *flags = VideoProcAmp_Flags_Manual; + + return S_OK; +} + +HRESULT qcap_driver_set_prop(Capture *device, VideoProcAmpProperty property, + LONG value, LONG flags) +{ + struct v4l2_control ctrl; + + ctrl.id = v4l2_cid_from_qcap_property(property); + ctrl.value = value; + + if (xioctl(device->fd, VIDIOC_S_CTRL, &ctrl) == -1) { - ERR("ioctl(VIDIOCSPICT) failed (%d)\n",errno); + WARN("Failed to set property: %s\n", strerror(errno)); return E_FAIL; } + return S_OK; }
-static void renderer_RGB(const Capture *capBox, LPBYTE bufferin, const BYTE *stream) +static void renderer_RGB(const Capture *device, BYTE *bufferin, const BYTE *stream) { - int depth = renderlist_V4l[capBox->pict.palette].depth; - int size = capBox->height * capBox->width * depth / 8; + int size = device->height * device->width * device->depth / 8; int pointer, offset;
- switch (depth) + switch (device->pixelformat) { - case 24: + case V4L2_PIX_FMT_BGR24: memcpy(bufferin, stream, size); break; - case 32: + case V4L2_PIX_FMT_BGR32: pointer = 0; offset = 1; while (pointer + offset <= size) @@ -466,44 +369,43 @@ static void renderer_RGB(const Capture *capBox, LPBYTE bufferin, const BYTE *str } break; default: - ERR("Unknown bit depth %d\n", depth); + FIXME("Unhandled pixel format %#x.\n", device->pixelformat); return; } }
-static void renderer_YUV(const Capture *capBox, LPBYTE bufferin, const BYTE *stream) +static void renderer_YUV(const Capture *device, BYTE *bufferin, const BYTE *stream) { enum YUV_Format format;
- switch (capBox->pict.palette) + switch (device->pixelformat) { - case 7: /* YUV422 - same as YUYV */ - case 8: /* YUYV */ + case V4L2_PIX_FMT_YUYV: format = YUYV; break; - case 9: /* UYVY */ + case V4L2_PIX_FMT_UYVY: format = UYVY; break; - case 11: /* YUV411 */ + case V4L2_PIX_FMT_Y41P: format = UYYVYY; break; - case 13: /* YUV422P */ + case V4L2_PIX_FMT_YUV422P: format = YUVP_421; break; - case 14: /* YUV411P */ + case V4L2_PIX_FMT_YUV411P: format = YUVP_441; break; - case 15: /* YUV420P */ + case V4L2_PIX_FMT_YUV420: format = YUVP_422; break; - case 16: /* YUV410P */ + case V4L2_PIX_FMT_YUV410: format = YUVP_444; break; default: - ERR("Unknown palette %d\n", capBox->pict.palette); + FIXME("Unhandled pixel format %#x.\n", device->pixelformat); return; } - YUV_To_RGB24(format, bufferin, stream, capBox->width, capBox->height); + YUV_To_RGB24(format, bufferin, stream, device->width, device->height); }
static void Resize(const Capture * capBox, LPBYTE output, const BYTE *input) @@ -562,36 +464,18 @@ static void Resize(const Capture * capBox, LPBYTE output, const BYTE *input) } }
-static void V4l_GetFrame(Capture * capBox, unsigned char ** pInput) +static void V4l_GetFrame(Capture *device, unsigned char **buffer) { - if (capBox->mmap) - { - if (xioctl(capBox->fd, VIDIOCSYNC, &capBox->grab_buf[capBox->curframe]) == -1) - WARN("Syncing ioctl failed: %d\n", errno); - - *pInput = capBox->pmap + capBox->gb_buffers.offsets[capBox->curframe]; - } - else + while (video_read(device->fd, device->image_data, device->image_size) == -1) { - int retval; - while ((retval = video_read(capBox->fd, capBox->grab_data, capBox->imagesize)) == -1) - if (errno != EAGAIN) break; - if (retval == -1) - WARN("Error occurred while reading from device: %s\n", strerror(errno)); - *pInput = (unsigned char*) capBox->grab_data; - } -} - -static void V4l_FreeFrame(Capture * capBox) -{ - TRACE("\n"); - if (capBox->mmap) - { - if (xioctl(capBox->fd, VIDIOCMCAPTURE, &capBox->grab_buf[capBox->curframe]) == -1) - ERR("Freeing frame for capture failed: %s\n", strerror(errno)); + if (errno != EAGAIN) + { + ERR("Failed to read frame: %s\n", strerror(errno)); + break; + } } - if (++capBox->curframe == capBox->buffers) - capBox->curframe = 0; + TRACE("Successfully read a frame.\n"); + *buffer = device->image_data; }
static DWORD WINAPI ReadThread(LPVOID lParam) @@ -612,10 +496,6 @@ static DWORD WINAPI ReadThread(LPVOID lParam) }
pOutput = CoTaskMemAlloc(capBox->width * capBox->height * capBox->bitDepth / 8); - capBox->curframe = 0; - do { - V4l_FreeFrame(capBox); - } while (capBox->curframe != 0);
while (1) { @@ -644,7 +524,6 @@ static DWORD WINAPI ReadThread(LPVOID lParam) hr = BaseOutputPinImpl_Deliver((BaseOutputPin *)capBox->pOut, pSample); TRACE("%p -> Frame %u: %x\n", capBox, ++framecount, hr); IMediaSample_Release(pSample); - V4l_FreeFrame(capBox); } if (FAILED(hr) && hr != VFW_E_NOT_CONNECTED) { @@ -777,137 +656,127 @@ HRESULT qcap_driver_stop(Capture *capBox, FILTER_STATE *state) return S_OK; }
+static int negotiate_format(Capture *device) +{ + struct v4l2_format format = {0}; + int fd = device->fd; + unsigned int i; + + format.type = V4L2_BUF_TYPE_VIDEO_CAPTURE; + + if (xioctl(fd, VIDIOC_G_FMT, &format) == -1) + { + ERR("Failed to get device format: %s\n", strerror(errno)); + return -1; + } + + for (i = 0; i < ARRAY_SIZE(renderlist_V4l); ++i) + { + if (renderlist_V4l[i].pixelformat == format.fmt.pix.pixelformat) + { + TRACE("Using device-reported format %#x.\n", format.fmt.pix.pixelformat); + device->depth = renderlist_V4l[i].depth; + device->renderer = renderlist_V4l[i].renderer; + device->pixelformat = format.fmt.pix.pixelformat; + device->width = format.fmt.pix.width; + device->height = format.fmt.pix.height; + return 0; + } + } + + for (i = 0; i < ARRAY_SIZE(renderlist_V4l); ++i) + { + format.fmt.pix.pixelformat = renderlist_V4l[i].pixelformat; + if (!xioctl(fd, VIDIOC_S_FMT, &format) + && format.fmt.pix.pixelformat == renderlist_V4l[i].pixelformat) + { + TRACE("Using format %#x.\n", format.fmt.pix.pixelformat); + device->depth = renderlist_V4l[i].depth; + device->renderer = renderlist_V4l[i].renderer; + device->pixelformat = format.fmt.pix.pixelformat; + device->width = format.fmt.pix.width; + device->height = format.fmt.pix.height; + return 0; + } + } + + FIXME("Could not negotiate an acceptable format.\n"); + return -1; +} + Capture * qcap_driver_init( IPin *pOut, USHORT card ) { - Capture * capBox = NULL; - char device[20]; - struct video_capability capa; - struct video_picture pict; - struct video_window window; + struct v4l2_capability caps = {0}; + Capture *device = NULL; + BOOL have_libv4l2; + char path[20]; + int fd;
YUV_Init(); - video_init(); + have_libv4l2 = video_init();
- capBox = CoTaskMemAlloc(sizeof(Capture)); - if (!capBox) - goto error; + if (!(device = CoTaskMemAlloc(sizeof(*device)))) + return NULL;
- /* capBox->vtbl = &defboxVtbl; */ + InitializeCriticalSection(&device->CritSect); + device->CritSect.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": Capture.CritSect");
- InitializeCriticalSection( &capBox->CritSect ); - capBox->CritSect.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": Capture.CritSect"); - - sprintf(device, "/dev/video%i", card); - TRACE("opening %s\n", device); + sprintf(path, "/dev/video%i", card); + TRACE("Opening device %s.\n", path); #ifdef O_CLOEXEC - if ((capBox->fd = video_open(device, O_RDWR | O_NONBLOCK | O_CLOEXEC)) == -1 && errno == EINVAL) + if ((fd = video_open(path, O_RDWR | O_NONBLOCK | O_CLOEXEC)) == -1 && errno == EINVAL) #endif - capBox->fd = video_open(device, O_RDWR | O_NONBLOCK); - if (capBox->fd == -1) + fd = video_open(path, O_RDWR | O_NONBLOCK); + if (fd == -1) { - WARN("open failed (%d)\n", errno); + WARN("Failed to open video device: %s\n", strerror(errno)); goto error; } - fcntl( capBox->fd, F_SETFD, FD_CLOEXEC ); /* in case O_CLOEXEC isn't supported */ - - memset(&capa, 0, sizeof(capa)); + fcntl(fd, F_SETFD, FD_CLOEXEC); /* in case O_CLOEXEC isn't supported */ + device->fd = fd;
- if (xioctl(capBox->fd, VIDIOCGCAP, &capa) == -1) + if (xioctl(fd, VIDIOC_QUERYCAP, &caps) == -1) { - WARN("ioctl(VIDIOCGCAP) failed (%d)\n", errno); + WARN("Failed to query device capabilities: %s\n", strerror(errno)); goto error; }
- if (!(capa.type & VID_TYPE_CAPTURE)) + if (!(caps.capabilities & V4L2_CAP_VIDEO_CAPTURE)) { - WARN("not a video capture device\n"); + WARN("Device does not support single-planar video capture.\n"); goto error; }
- TRACE("%d inputs on %s\n", capa.channels, capa.name ); - - if (xioctl(capBox->fd, VIDIOCGPICT, &pict) == -1) + if (!(caps.capabilities & V4L2_CAP_READWRITE)) { - ERR("ioctl(VIDIOCGPICT) failed (%d)\n", errno ); + WARN("Device does not support read().\n"); + if (!have_libv4l2) +#ifdef SONAME_LIBV4L2 + ERR_(winediag)("Reading from %s requires libv4l2, but it could not be loaded.\n", path); +#else + ERR_(winediag)("Reading from %s requires libv4l2, but Wine was compiled without libv4l2 support.\n", path); +#endif goto error; }
- TRACE("depth %d palette %d (%s) hue %d color %d contrast %d\n", - pict.depth, pict.palette, renderlist_V4l[pict.palette].name, - pict.hue, pict.colour, pict.contrast ); - - capBox->dbrightness = pict.brightness; - capBox->dcolour = pict.colour; - capBox->dhue = pict.hue; - capBox->dcontrast = pict.contrast; - - if (!renderlist_V4l[pict.palette].renderer) - { - int palet = pict.palette, i; - - TRACE("No renderer available for %s, falling back to defaults\n", - renderlist_V4l[pict.palette].name); - capBox->renderer = NULL; - for (i = 0; fallback_V4l[i] >=0 ; i++) - { - int n = fallback_V4l[i]; - - if (renderlist_V4l[n].renderer == NULL) - continue; - - pict.depth = renderlist_V4l[n].depth; - pict.palette = n; - if (xioctl(capBox->fd, VIDIOCSPICT, &pict) == -1) - { - TRACE("Could not render with %s (%d)\n", - renderlist_V4l[n].name, n); - continue; - } - TRACE("using renderer %s (%d)\n", - renderlist_V4l[n].name, n); - capBox->renderer = renderlist_V4l[n].renderer; - break; - } - - if (!capBox->renderer) - { - ERR("video format %s isn't available\n", - renderlist_V4l[palet].name); - goto error; - } - } - else - { - TRACE("Using the suggested format\n"); - capBox->renderer = renderlist_V4l[pict.palette].renderer; - } - memcpy(&capBox->pict, &pict, sizeof(struct video_picture)); - - memset(&window, 0, sizeof(window)); - if (xioctl(capBox->fd, VIDIOCGWIN, &window) == -1) - { - WARN("VIDIOCGWIN failed (%d)\n", errno); + if (negotiate_format(device) == -1) goto error; - }
- capBox->height = capBox->outputheight = window.height; - capBox->width = capBox->outputwidth = window.width; - capBox->swresize = FALSE; - capBox->bitDepth = 24; - capBox->pOut = pOut; - capBox->fps = 3; - capBox->stopped = FALSE; - capBox->curframe = 0; - capBox->iscommitted = FALSE; + device->outputwidth = device->width; + device->outputheight = device->height; + device->swresize = FALSE; + device->bitDepth = 24; + device->pOut = pOut; + device->fps = 3; + device->stopped = FALSE; + device->iscommitted = FALSE;
- TRACE("format: %d bits - %d x %d\n", capBox->bitDepth, capBox->width, capBox->height); + TRACE("Format: %d bpp - %dx%d.\n", device->bitDepth, device->width, device->height);
- return capBox; + return device;
error: - if (capBox) - qcap_driver_destroy( capBox ); - + qcap_driver_destroy(device); return NULL; }
diff --git a/dlls/qcap/yuv.c b/dlls/qcap/yuv.c index 7e17add949..0ba78d053d 100644 --- a/dlls/qcap/yuv.c +++ b/dlls/qcap/yuv.c @@ -32,7 +32,7 @@ #include "wine/debug.h"
/* This is not used if V4L support is missing */ -#if defined(HAVE_LINUX_VIDEODEV_H) || defined(HAVE_LIBV4L1_H) +#ifdef HAVE_LINUX_VIDEODEV2_H
WINE_DEFAULT_DEBUG_CHANNEL(qcap);
Signed-off-by: Zebediah Figura z.figura12@gmail.com --- configure.ac | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-)
diff --git a/configure.ac b/configure.ac index 31dd472533..91e27b7c1a 100644 --- a/configure.ac +++ b/configure.ac @@ -81,7 +81,6 @@ AC_ARG_WITH(sane, AS_HELP_STRING([--without-sane],[do not use SANE (scanner AC_ARG_WITH(sdl, AS_HELP_STRING([--without-sdl],[do not use SDL])) AC_ARG_WITH(tiff, AS_HELP_STRING([--without-tiff],[do not use TIFF])) AC_ARG_WITH(udev, AS_HELP_STRING([--without-udev],[do not use udev (plug and play support)])) -AC_ARG_WITH(v4l, AS_HELP_STRING([--without-v4l],[do not use v4l1 (v4l support)])) AC_ARG_WITH(v4l2, AS_HELP_STRING([--without-v4l2],[do not use v4l2 (video capture)])) AC_ARG_WITH(vkd3d, AS_HELP_STRING([--without-vkd3d],[do not use vkd3d (Direct3D 12 support)])) AC_ARG_WITH(vulkan, AS_HELP_STRING([--without-vulkan],[do not use Vulkan])) @@ -675,7 +674,7 @@ AC_CHECK_HEADERS([pthread_np.h],,, #include <pthread.h> #endif])
-AC_CHECK_HEADERS([linux/videodev.h linux/videodev2.h libv4l1.h],,, +AC_CHECK_HEADERS([linux/videodev2.h],,, [#ifdef HAVE_SYS_TIME_H #include <sys/time.h> #endif @@ -1418,14 +1417,6 @@ fi WINE_NOTICE_WITH(sane,[test "x$ac_cv_lib_soname_sane" = "x"], [libsane ${notice_platform}development files not found, scanners won't be supported.])
-dnl **** Check for libv4l1 **** -if test "x$with_v4l" != "xno" -then - WINE_CHECK_SONAME(v4l1,v4l1_open,,,) -fi -WINE_NOTICE_WITH(v4l,[test "x$ac_cv_lib_soname_v4l1" = "x"], - [libv4l ${notice_platform}development files not found.]) - dnl **** Check for libv4l2 **** if test "x$with_v4l2" != "xno" then
Signed-off-by: Zebediah Figura z.figura12@gmail.com --- dlls/qcap/v4l.c | 165 ++++++------------------------------------------ 1 file changed, 20 insertions(+), 145 deletions(-)
diff --git a/dlls/qcap/v4l.c b/dlls/qcap/v4l.c index 1b10e503c9..5f199f4af9 100644 --- a/dlls/qcap/v4l.c +++ b/dlls/qcap/v4l.c @@ -91,8 +91,6 @@ static BOOL video_init(void) #endif }
-typedef void (* Renderer)(const Capture *, LPBYTE bufferin, const BYTE *stream); - struct _Capture { UINT width, height, bitDepth, fps, outputwidth, outputheight; @@ -104,36 +102,10 @@ struct _Capture int fd, mmap; BOOL iscommitted, stopped;
- __u32 pixelformat; - int depth; - int image_size; unsigned char *image_data;
HANDLE thread; - Renderer renderer; -}; - -static void renderer_RGB(const Capture *capBox, LPBYTE bufferin, const BYTE *stream); -static void renderer_YUV(const Capture *capBox, LPBYTE bufferin, const BYTE *stream); - -static const struct -{ - int depth; - __u32 pixelformat; - Renderer renderer; -} -renderlist_V4l[] = -{ - {24, V4L2_PIX_FMT_BGR24, renderer_RGB}, - {32, V4L2_PIX_FMT_BGR32, renderer_RGB}, - {16, V4L2_PIX_FMT_YUYV, renderer_YUV}, - {16, V4L2_PIX_FMT_UYVY, renderer_YUV}, - {12, V4L2_PIX_FMT_Y41P, renderer_YUV}, - {16, V4L2_PIX_FMT_YUV422P, renderer_YUV}, - {12, V4L2_PIX_FMT_YUV411P, renderer_YUV}, - {12, V4L2_PIX_FMT_YUV420, renderer_YUV}, - {10, V4L2_PIX_FMT_YUV410, renderer_YUV}, };
static int xioctl(int fd, int request, void * arg) @@ -150,7 +122,7 @@ static int xioctl(int fd, int request, void * arg) /* Prepare the capture buffers */ static HRESULT V4l_Prepare(Capture *device) { - device->image_size = device->depth * device->height * device->width / 8; + device->image_size = device->height * device->width * 3; if (!(device->image_data = heap_alloc(device->image_size))) return E_OUTOFMEMORY; return S_OK; @@ -344,70 +316,6 @@ HRESULT qcap_driver_set_prop(Capture *device, VideoProcAmpProperty property, return S_OK; }
-static void renderer_RGB(const Capture *device, BYTE *bufferin, const BYTE *stream) -{ - int size = device->height * device->width * device->depth / 8; - int pointer, offset; - - switch (device->pixelformat) - { - case V4L2_PIX_FMT_BGR24: - memcpy(bufferin, stream, size); - break; - case V4L2_PIX_FMT_BGR32: - pointer = 0; - offset = 1; - while (pointer + offset <= size) - { - bufferin[pointer] = stream[pointer + offset]; - pointer++; - bufferin[pointer] = stream[pointer + offset]; - pointer++; - bufferin[pointer] = stream[pointer + offset]; - pointer++; - offset++; - } - break; - default: - FIXME("Unhandled pixel format %#x.\n", device->pixelformat); - return; - } -} - -static void renderer_YUV(const Capture *device, BYTE *bufferin, const BYTE *stream) -{ - enum YUV_Format format; - - switch (device->pixelformat) - { - case V4L2_PIX_FMT_YUYV: - format = YUYV; - break; - case V4L2_PIX_FMT_UYVY: - format = UYVY; - break; - case V4L2_PIX_FMT_Y41P: - format = UYYVYY; - break; - case V4L2_PIX_FMT_YUV422P: - format = YUVP_421; - break; - case V4L2_PIX_FMT_YUV411P: - format = YUVP_441; - break; - case V4L2_PIX_FMT_YUV420: - format = YUVP_422; - break; - case V4L2_PIX_FMT_YUV410: - format = YUVP_444; - break; - default: - FIXME("Unhandled pixel format %#x.\n", device->pixelformat); - return; - } - YUV_To_RGB24(format, bufferin, stream, device->width, device->height); -} - static void Resize(const Capture * capBox, LPBYTE output, const BYTE *input) { /* the whole image needs to be reversed, @@ -519,7 +427,7 @@ static DWORD WINAPI ReadThread(LPVOID lParam) IMediaSample_GetPointer(pSample, &pTarget); /* FIXME: Check return values.. */ V4l_GetFrame(capBox, &pInput); - capBox->renderer(capBox, pOutput, pInput); + memcpy(pOutput, pInput, len); Resize(capBox, pTarget, pOutput); hr = BaseOutputPinImpl_Deliver((BaseOutputPin *)capBox->pOut, pSample); TRACE("%p -> Frame %u: %x\n", capBox, ++framecount, hr); @@ -656,57 +564,10 @@ HRESULT qcap_driver_stop(Capture *capBox, FILTER_STATE *state) return S_OK; }
-static int negotiate_format(Capture *device) -{ - struct v4l2_format format = {0}; - int fd = device->fd; - unsigned int i; - - format.type = V4L2_BUF_TYPE_VIDEO_CAPTURE; - - if (xioctl(fd, VIDIOC_G_FMT, &format) == -1) - { - ERR("Failed to get device format: %s\n", strerror(errno)); - return -1; - } - - for (i = 0; i < ARRAY_SIZE(renderlist_V4l); ++i) - { - if (renderlist_V4l[i].pixelformat == format.fmt.pix.pixelformat) - { - TRACE("Using device-reported format %#x.\n", format.fmt.pix.pixelformat); - device->depth = renderlist_V4l[i].depth; - device->renderer = renderlist_V4l[i].renderer; - device->pixelformat = format.fmt.pix.pixelformat; - device->width = format.fmt.pix.width; - device->height = format.fmt.pix.height; - return 0; - } - } - - for (i = 0; i < ARRAY_SIZE(renderlist_V4l); ++i) - { - format.fmt.pix.pixelformat = renderlist_V4l[i].pixelformat; - if (!xioctl(fd, VIDIOC_S_FMT, &format) - && format.fmt.pix.pixelformat == renderlist_V4l[i].pixelformat) - { - TRACE("Using format %#x.\n", format.fmt.pix.pixelformat); - device->depth = renderlist_V4l[i].depth; - device->renderer = renderlist_V4l[i].renderer; - device->pixelformat = format.fmt.pix.pixelformat; - device->width = format.fmt.pix.width; - device->height = format.fmt.pix.height; - return 0; - } - } - - FIXME("Could not negotiate an acceptable format.\n"); - return -1; -} - Capture * qcap_driver_init( IPin *pOut, USHORT card ) { struct v4l2_capability caps = {0}; + struct v4l2_format format = {0}; Capture *device = NULL; BOOL have_libv4l2; char path[20]; @@ -759,11 +620,25 @@ Capture * qcap_driver_init( IPin *pOut, USHORT card ) goto error; }
- if (negotiate_format(device) == -1) + format.type = V4L2_BUF_TYPE_VIDEO_CAPTURE; + if (xioctl(fd, VIDIOC_G_FMT, &format) == -1) + { + ERR("Failed to get device format: %s\n", strerror(errno)); + goto error; + } + + format.fmt.pix.pixelformat = V4L2_PIX_FMT_BGR24; + if (xioctl(fd, VIDIOC_S_FMT, &format) == -1 + || format.fmt.pix.pixelformat != V4L2_PIX_FMT_BGR24) + { + ERR("Failed to set pixel format: %s\n", strerror(errno)); + if (!have_libv4l2) + ERR_(winediag)("You may need libv4l2 to use this device.\n"); goto error; + }
- device->outputwidth = device->width; - device->outputheight = device->height; + device->outputwidth = device->width = format.fmt.pix.width; + device->outputheight = device->height = format.fmt.pix.height; device->swresize = FALSE; device->bitDepth = 24; device->pOut = pOut;
Signed-off-by: Zebediah Figura z.figura12@gmail.com --- dlls/qcap/Makefile.in | 3 +- dlls/qcap/qcap_main.h | 19 ---- dlls/qcap/v4l.c | 1 - dlls/qcap/yuv.c | 200 ------------------------------------------ 4 files changed, 1 insertion(+), 222 deletions(-) delete mode 100644 dlls/qcap/yuv.c
diff --git a/dlls/qcap/Makefile.in b/dlls/qcap/Makefile.in index 71a785bc96..e161e066bd 100644 --- a/dlls/qcap/Makefile.in +++ b/dlls/qcap/Makefile.in @@ -11,7 +11,6 @@ C_SRCS = \ qcap_main.c \ smartteefilter.c \ v4l.c \ - vfwcapture.c \ - yuv.c + vfwcapture.c
RC_SRCS = version.rc diff --git a/dlls/qcap/qcap_main.h b/dlls/qcap/qcap_main.h index 733772ee73..0e767bd08c 100644 --- a/dlls/qcap/qcap_main.h +++ b/dlls/qcap/qcap_main.h @@ -41,23 +41,4 @@ extern IUnknown * WINAPI QCAP_createAudioInputMixerPropertyPage(IUnknown *pUnkOu
void dump_AM_MEDIA_TYPE(const AM_MEDIA_TYPE * pmt) DECLSPEC_HIDDEN;
-enum YUV_Format { - /* Last 2 numbers give the skip info, the smaller they are the better - * Planar: - * HSKIP : VSKIP */ - YUVP_421, /* 2 : 1 */ - YUVP_422, /* 2 : 2 */ - YUVP_441, /* 4 : 1 */ - YUVP_444, /* 4 : 4 */ - ENDPLANAR, /* No format, just last planar item so we can check on it */ - - /* Non-planar */ - YUYV, /* Order: YUYV (Guess why it's named like that) */ - UYVY, /* Order: UYVY (Looks like someone got bored and swapped the Y's) */ - UYYVYY, /* YUV411 linux style, perhaps YUV420 is YYUYYV? */ -}; - -void YUV_Init(void) DECLSPEC_HIDDEN; -void YUV_To_RGB24(enum YUV_Format format, unsigned char *target, const unsigned char *source, int width, int height) DECLSPEC_HIDDEN; - #endif /* _QCAP_MAIN_H_DEFINED */ diff --git a/dlls/qcap/v4l.c b/dlls/qcap/v4l.c index 5f199f4af9..f64e99ba6d 100644 --- a/dlls/qcap/v4l.c +++ b/dlls/qcap/v4l.c @@ -573,7 +573,6 @@ Capture * qcap_driver_init( IPin *pOut, USHORT card ) char path[20]; int fd;
- YUV_Init(); have_libv4l2 = video_init();
if (!(device = CoTaskMemAlloc(sizeof(*device)))) diff --git a/dlls/qcap/yuv.c b/dlls/qcap/yuv.c deleted file mode 100644 index 0ba78d053d..0000000000 --- a/dlls/qcap/yuv.c +++ /dev/null @@ -1,200 +0,0 @@ -/* DirectShow capture services (QCAP.DLL) - * - * Copyright 2005 Maarten Lankhorst - * - * This file contains the part of the vfw capture interface that - * does the actual Video4Linux(1/2) stuff required for capturing - * and setting/getting media format.. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#include "config.h" -#include <stdarg.h> - -#include "windef.h" -#include "wingdi.h" -#include "objbase.h" -#include "strmif.h" -#include "qcap_main.h" -#include "wine/debug.h" - -/* This is not used if V4L support is missing */ -#ifdef HAVE_LINUX_VIDEODEV2_H - -WINE_DEFAULT_DEBUG_CHANNEL(qcap); - -static int yuv_xy[256]; /* Gray value */ -static int yuv_gu[256]; /* Green U */ -static int yuv_bu[256]; /* Blue U */ -static int yuv_rv[256]; /* Red V */ -static int yuv_gv[256]; /* Green V */ -static BOOL initialised = FALSE; - -static inline int ValidRange(int in) { - if (in > 255) in = 255; - if (in < 0) in = 0; - return in; -} - -typedef struct RGB { -#if 0 /* For some reason I have to revert R and B, not sure why */ - unsigned char r, g, b; -#else - unsigned char b, g, r; -#endif -} RGB; - -static inline void YUV2RGB(const unsigned char y_, const unsigned char cb, const unsigned char cr, RGB* retval) { - retval->r = ValidRange(yuv_xy[y_] + yuv_rv[cr]); - retval->g = ValidRange(yuv_xy[y_] + yuv_gu[cb] + yuv_gv[cr]); - retval->b = ValidRange(yuv_xy[y_] + yuv_bu[cb]); -} - -void YUV_Init(void) { - float y, u, v; - int y_, cb, cr; - - if (initialised) return; - initialised = TRUE; - - for (y_ = 0; y_ <= 255; y_++) - { - y = ((float) 255 / 219) * (y_ - 16); - yuv_xy[y_] = y; - } - - for (cb = 0; cb <= 255; cb++) - { - u = ((float) 255 / 224) * (cb - 128); - yuv_gu[cb] = -0.344 * u; - yuv_bu[cb] = 1.772 * u; - } - - for (cr = 0; cr <= 255; cr++) - { - v = ((float) 255 / 224) * (cr - 128); - yuv_rv[cr] = 1.402 * v; - yuv_gv[cr] = -0.714 * v; - } - TRACE("Filled hash table\n"); -} - -static void Parse_YUYV(unsigned char *destbuffer, const unsigned char *input, int width, int height) -{ - const unsigned char *pY, *pCb, *pCr; - int togo = width * height / 2; - pY = input; - pCb = input+1; - pCr = input+3; - while (--togo) { - YUV2RGB(*pY, *pCb, *pCr, (RGB *)destbuffer); - pY += 2; destbuffer += 3; - YUV2RGB(*pY, *pCb, *pCr, (RGB *)destbuffer); - pY += 2; pCb += 4; pCr += 4; destbuffer += 3; - } -} - -static void Parse_UYVY(unsigned char *destbuffer, const unsigned char *input, int width, int height) -{ - const unsigned char *pY, *pCb, *pCr; - int togo = width * height / 2; - pY = input+1; - pCb = input; - pCr = input+2; - while (--togo) { - YUV2RGB(*pY, *pCb, *pCr, (RGB *)destbuffer); - pY += 2; destbuffer += 3; - YUV2RGB(*pY, *pCb, *pCr, (RGB *)destbuffer); - pY += 2; pCb += 4; pCr += 4; destbuffer += 3; - } -} - -static void Parse_UYYVYY(unsigned char *destbuffer, const unsigned char *input, int width, int height) -{ - const unsigned char *pY, *pCb, *pCr; - int togo = width * height / 4; - pY = input+1; - pCb = input; - pCr = input+4; - while (--togo) { - YUV2RGB(*pY, *pCb, *pCr, (RGB *)destbuffer); - destbuffer += 3; pY++; - YUV2RGB(*pY, *pCb, *pCr, (RGB *)destbuffer); - pY += 2; destbuffer += 3; - YUV2RGB(*pY, *pCb, *pCr, (RGB *)destbuffer); - destbuffer += 3; pY++; - YUV2RGB(*pY, *pCb, *pCr, (RGB *)destbuffer); - pY += 2; pCb += 6; pCr += 6; destbuffer += 3; - } -} - -static void Parse_PYUV(unsigned char *destbuffer, const unsigned char *input, int width, int height, int wstep, int hstep) -{ - /* We have 3 pointers, One to Y, one to Cb and 1 to Cr */ - -/* C19 *89* declaration block (Grr julliard for not allowing C99) */ - int ysize, uvsize; - const unsigned char *pY, *pCb, *pCr; - int swstep = 0, shstep = 0; - int ypos = 0, xpos = 0; - int indexUV = 0, cUv; -/* End of Grr */ - - ysize = width * height; - uvsize = (width / wstep) * (height / hstep); - pY = input; - pCb = pY + ysize; - pCr = pCb + uvsize; - /* Bottom down DIB */ - do { - swstep = 0; - cUv = indexUV; - for (xpos = 0; xpos < width; xpos++) { - YUV2RGB(*(pY++), pCb[cUv], pCr[cUv], (RGB *)destbuffer); - destbuffer += 3; - if (++swstep == wstep) { - cUv++; - swstep = 0; - } - } - if (++shstep == hstep) { - shstep = 0; - indexUV = cUv; - } - } while (++ypos < height); -} - -void YUV_To_RGB24(enum YUV_Format format, unsigned char *target, const unsigned char *source, int width, int height) { - int wstep, hstep; - if (format < ENDPLANAR) { - switch (format) { - case YUVP_421: wstep = 2; hstep = 1; break; - case YUVP_422: wstep = 2; hstep = 2; break; - case YUVP_441: wstep = 4; hstep = 1; break; - case YUVP_444: wstep = 4; hstep = 4; break; - default: ERR("Unhandled format "%d"\n", format); return; - } - Parse_PYUV(target, source, width, height, wstep, hstep); - } else { - switch (format) { - case YUYV: Parse_YUYV(target, source, width, height); return; - case UYVY: Parse_UYVY(target, source, width, height); return; - case UYYVYY: Parse_UYYVYY(target, source, width, height); return; - default: ERR("Unhandled format "%d"\n", format); return; - } - } -} -#endif
-
Zebediah Figura