April 2020 - Wine-devel - list.winehq.org

[PATCH v2 3/6] qcap/videocapture: Remove code for resizing.
by Jactry Zeng 28 Apr '20

28 Apr '20

Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/qcap/v4l.c | 84 +++++++++++-------------------------------------- 1 file changed, 18 insertions(+), 66 deletions(-) diff --git a/dlls/qcap/v4l.c b/dlls/qcap/v4l.c index 42637d3af8..b065478d3a 100644 --- a/dlls/qcap/v4l.c +++ b/dlls/qcap/v4l.c @@ -103,11 +103,9 @@ struct caps struct _Capture { - UINT outputwidth, outputheight; const struct caps *current_caps; struct caps *caps; LONG caps_count; - BOOL swresize; struct strmbase_source *pin; int fd, mmap; @@ -199,9 +197,6 @@ static BOOL set_caps(Capture *device, const struct caps *caps) } device->current_caps = caps; - device->outputwidth = width; - device->outputheight = height; - device->swresize = FALSE; return TRUE; } @@ -307,63 +302,26 @@ HRESULT qcap_driver_set_prop(Capture *device, VideoProcAmpProperty property, return S_OK; } -static void Resize(const Capture * capBox, LPBYTE output, const BYTE *input) +static void reverse_image(const Capture *device, LPBYTE output, const BYTE *input) { - UINT width, height, bitdepth, depth; + int inoffset, outoffset, ow; + UINT width, height, depth; - width = capBox->current_caps->video_info.bmiHeader.biWidth; - height = capBox->current_caps->video_info.bmiHeader.biHeight; - bitdepth = capBox->current_caps->video_info.bmiHeader.biBitCount; - depth = bitdepth / 8; + width = device->current_caps->video_info.bmiHeader.biWidth; + height = device->current_caps->video_info.bmiHeader.biHeight; + depth = device->current_caps->video_info.bmiHeader.biBitCount / 8; /* the whole image needs to be reversed, because the dibs are messed up in windows */ - if (!capBox->swresize) + outoffset = width * height * depth; + ow = width * depth; + inoffset = 0; + while (outoffset > 0) { - int inoffset = 0, outoffset = width * height * depth; - int ow = width * depth; - while (outoffset > 0) - { - int x; - outoffset -= ow; - for (x = 0; x < ow; x++) - output[outoffset + x] = input[inoffset + x]; - inoffset += ow; - } - } - else - { - HDC dc_s, dc_d; - HBITMAP bmp_s, bmp_d; - int inoffset = 0, outoffset = (capBox->outputheight) * capBox->outputwidth * depth; - int ow = capBox->outputwidth * depth; - LPBYTE myarray; - - /* FIXME: Improve software resizing: add error checks and optimize */ - - myarray = CoTaskMemAlloc(capBox->outputwidth * capBox->outputheight * depth); - dc_s = CreateCompatibleDC(NULL); - dc_d = CreateCompatibleDC(NULL); - bmp_s = CreateBitmap(width, height, 1, bitdepth, input); - bmp_d = CreateBitmap(capBox->outputwidth, capBox->outputheight, 1, bitdepth, NULL); - SelectObject(dc_s, bmp_s); - SelectObject(dc_d, bmp_d); - StretchBlt(dc_d, 0, 0, capBox->outputwidth, capBox->outputheight, - dc_s, 0, 0, width, height, SRCCOPY); - GetBitmapBits(bmp_d, capBox->outputwidth * capBox->outputheight * depth, myarray); - while (outoffset > 0) - { - int i; - - outoffset -= ow; - for (i = 0; i < ow; i++) - output[outoffset + i] = myarray[inoffset + i]; - inoffset += ow; - } - CoTaskMemFree(myarray); - DeleteObject(dc_s); - DeleteObject(dc_d); - DeleteObject(bmp_s); - DeleteObject(bmp_d); + int x; + outoffset -= ow; + for (x = 0; x < ow; x++) + output[outoffset + x] = input[inoffset + x]; + inoffset += ow; } } @@ -397,10 +355,7 @@ static DWORD WINAPI ReadThread(LPVOID lParam) { int len; - if (!capBox->swresize) - len = width * height * depth; - else - len = capBox->outputheight * capBox->outputwidth * depth; + len = width * height * depth; IMediaSample_SetActualDataLength(pSample, len); len = IMediaSample_GetActualDataLength(pSample); @@ -417,7 +372,7 @@ static DWORD WINAPI ReadThread(LPVOID lParam) } } - Resize(capBox, pTarget, image_data); + reverse_image(capBox, pTarget, image_data); hr = IMemInputPin_Receive(capBox->pin->pMemInputPin, pSample); TRACE("%p -> Frame %u: %x\n", capBox, ++framecount, hr); IMediaSample_Release(pSample); @@ -439,10 +394,7 @@ void qcap_driver_init_stream(Capture *device) HRESULT hr; req_props.cBuffers = 3; - if (!device->swresize) - req_props.cbBuffer = device->current_caps->video_info.bmiHeader.biWidth * device->current_caps->video_info.bmiHeader.biHeight; - else - req_props.cbBuffer = device->outputwidth * device->outputheight; + req_props.cbBuffer = device->current_caps->video_info.bmiHeader.biWidth * device->current_caps->video_info.bmiHeader.biHeight; req_props.cbBuffer = (req_props.cbBuffer * device->current_caps->video_info.bmiHeader.biBitCount) / 8; req_props.cbAlign = 1; req_props.cbPrefix = 0; -- 2.26.2

1 0

[PATCH v2 2/6] qcap/videocapture: Use formats from capabilities instead of hard coding.
by Jactry Zeng 28 Apr '20

28 Apr '20

Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/qcap/tests/videocapture.c | 63 ++++++++++ dlls/qcap/v4l.c | 204 ++++++++++++++------------------- dlls/qcap/vfwcapture.c | 3 + 3 files changed, 155 insertions(+), 115 deletions(-) diff --git a/dlls/qcap/tests/videocapture.c b/dlls/qcap/tests/videocapture.c index 5532654650..39535adece 100644 --- a/dlls/qcap/tests/videocapture.c +++ b/dlls/qcap/tests/videocapture.c @@ -21,6 +21,7 @@ #define COBJMACROS #include "dshow.h" #include "wine/test.h" +#include "wine/strmbase.h" static void test_media_types(IPin *pin) { @@ -59,6 +60,65 @@ static void test_media_types(IPin *pin) ok(hr != S_OK, "Got hr %#x.\n", hr); } +static void test_stream_config(IPin *pin) +{ + VIDEOINFOHEADER *video_info, *video_info2; + AM_MEDIA_TYPE *format, *format2; + IAMStreamConfig *stream_config; + LONG depth, compression; + HRESULT hr; + + hr = IPin_QueryInterface(pin, &IID_IAMStreamConfig, (void **)&stream_config); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IAMStreamConfig_GetFormat(stream_config, &format); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(IsEqualGUID(&format->majortype, &MEDIATYPE_Video), "Got wrong majortype: %s.\n", + debugstr_guid(&format->majortype)); + + hr = IAMStreamConfig_SetFormat(stream_config, format); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + format->majortype = MEDIATYPE_Audio; + hr = IAMStreamConfig_SetFormat(stream_config, format); + ok(hr == E_FAIL, "Got hr %#x.\n", hr); + + format->majortype = MEDIATYPE_Video; + video_info = (VIDEOINFOHEADER *)format->pbFormat; + video_info->bmiHeader.biWidth--; + video_info->bmiHeader.biHeight--; + hr = IAMStreamConfig_SetFormat(stream_config, format); + ok(hr == E_FAIL, "Got hr %#x.\n", hr); + + depth = video_info->bmiHeader.biBitCount; + compression = video_info->bmiHeader.biCompression; + video_info->bmiHeader.biWidth++; + video_info->bmiHeader.biHeight++; + video_info->bmiHeader.biBitCount = 0; + video_info->bmiHeader.biCompression = 0; + hr = IAMStreamConfig_SetFormat(stream_config, format); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IAMStreamConfig_GetFormat(stream_config, &format2); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(IsEqualGUID(&format2->majortype, &MEDIATYPE_Video), "Got wrong majortype: %s.\n", + debugstr_guid(&format2->majortype)); + video_info2 = (VIDEOINFOHEADER *)format2->pbFormat; + ok(video_info2->bmiHeader.biBitCount == depth, "Got wrong depth: %d.\n", + video_info2->bmiHeader.biBitCount); + ok(video_info2->bmiHeader.biCompression == compression, + "Got wrong compression: %d.\n", video_info2->bmiHeader.biCompression); + FreeMediaType(format2); + + video_info->bmiHeader.biWidth = 10000000; + video_info->bmiHeader.biHeight = 10000000; + hr = IAMStreamConfig_SetFormat(stream_config, format); + ok(hr == E_FAIL, "Got hr %#x.\n", hr); + FreeMediaType(format); + + IAMStreamConfig_Release(stream_config); +} + static void test_capture(IBaseFilter *filter) { IEnumPins *enum_pins; @@ -73,7 +133,10 @@ static void test_capture(IBaseFilter *filter) PIN_DIRECTION pin_direction; IPin_QueryDirection(pin, &pin_direction); if (pin_direction == PINDIR_OUTPUT) + { test_media_types(pin); + test_stream_config(pin); + } IPin_Release(pin); } diff --git a/dlls/qcap/v4l.c b/dlls/qcap/v4l.c index a370c7583a..42637d3af8 100644 --- a/dlls/qcap/v4l.c +++ b/dlls/qcap/v4l.c @@ -103,7 +103,8 @@ struct caps struct _Capture { - UINT width, height, bitDepth, fps, outputwidth, outputheight; + UINT outputwidth, outputheight; + const struct caps *current_caps; struct caps *caps; LONG caps_count; BOOL swresize; @@ -139,126 +140,96 @@ HRESULT qcap_driver_destroy(Capture *capBox) return S_OK; } +static const struct caps *find_caps(Capture *device, const AM_MEDIA_TYPE *mt) +{ + VIDEOINFOHEADER *video_info = (VIDEOINFOHEADER *)mt->pbFormat; + LONG index; + + if (mt->cbFormat < sizeof(VIDEOINFOHEADER) + || !video_info) + return NULL; + + for (index = 0; index < device->caps_count; index++) + { + struct caps *caps = &device->caps[index]; + + if (IsEqualIID(&mt->formattype, &caps->media_type.formattype) + && video_info->bmiHeader.biWidth == caps->video_info.bmiHeader.biWidth + && video_info->bmiHeader.biHeight == caps->video_info.bmiHeader.biHeight) + return caps; + } + return NULL; +} + HRESULT qcap_driver_check_format(Capture *device, const AM_MEDIA_TYPE *mt) { - HRESULT hr; TRACE("device %p, mt %p.\n", device, mt); if (!mt) return E_POINTER; if (!IsEqualGUID(&mt->majortype, &MEDIATYPE_Video)) - return S_FALSE; + return E_FAIL; + + if (find_caps(device, mt)) + return S_OK; + + return E_FAIL; +} + +static BOOL set_caps(Capture *device, const struct caps *caps) +{ + struct v4l2_format format = {0}; + LONG width, height; + + width = caps->video_info.bmiHeader.biWidth; + height = caps->video_info.bmiHeader.biHeight; - if (IsEqualGUID(&mt->formattype, &FORMAT_VideoInfo) && mt->pbFormat - && mt->cbFormat >= sizeof(VIDEOINFOHEADER)) + format.type = V4L2_BUF_TYPE_VIDEO_CAPTURE; + format.fmt.pix.pixelformat = caps->pixelformat; + format.fmt.pix.width = width; + format.fmt.pix.height = height; + if (xioctl(device->fd, VIDIOC_S_FMT, &format) == -1 + || format.fmt.pix.pixelformat != caps->pixelformat + || format.fmt.pix.width != width + || format.fmt.pix.height != height) { - VIDEOINFOHEADER *vih = (VIDEOINFOHEADER *)mt->pbFormat; - if (vih->bmiHeader.biBitCount == 24 && vih->bmiHeader.biCompression == BI_RGB) - hr = S_OK; - else - { - FIXME("Unsupported compression %#x, bpp %u.\n", vih->bmiHeader.biCompression, - vih->bmiHeader.biBitCount); - hr = S_FALSE; - } + ERR("Failed to set pixel format: %s.\n", strerror(errno)); + return FALSE; } - else - hr = VFW_E_INVALIDMEDIATYPE; - return hr; + device->current_caps = caps; + device->outputwidth = width; + device->outputheight = height; + device->swresize = FALSE; + + return TRUE; } HRESULT qcap_driver_set_format(Capture *device, AM_MEDIA_TYPE *mt) { - struct v4l2_format format = {0}; - int newheight, newwidth; - VIDEOINFOHEADER *vih; - int fd = device->fd; - HRESULT hr; + const struct caps *caps; - if (FAILED(hr = qcap_driver_check_format(device, mt))) - return hr; - vih = (VIDEOINFOHEADER *)mt->pbFormat; - - newwidth = vih->bmiHeader.biWidth; - newheight = vih->bmiHeader.biHeight; + caps = find_caps(device, mt); + if (!caps) + return E_FAIL; - if (device->height == newheight && device->width == newwidth) + if (device->current_caps == caps) return S_OK; - format.type = V4L2_BUF_TYPE_VIDEO_CAPTURE; - if (xioctl(fd, VIDIOC_G_FMT, &format) == -1) - { - ERR("Failed to get current format: %s\n", strerror(errno)); + if (!set_caps(device, caps)) return VFW_E_TYPE_NOT_ACCEPTED; - } - 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) - { - device->width = newwidth; - device->height = newheight; - device->swresize = FALSE; - } - else - { - TRACE("Using software resize: %dx%d -> %dx%d.\n", - format.fmt.pix.width, format.fmt.pix.height, device->width, device->height); - device->swresize = TRUE; - } - device->outputwidth = format.fmt.pix.width; - device->outputheight = format.fmt.pix.height; return S_OK; } -HRESULT qcap_driver_get_format(const Capture *capBox, AM_MEDIA_TYPE ** mT) +HRESULT qcap_driver_get_format(const Capture *device, AM_MEDIA_TYPE **mt) { - VIDEOINFOHEADER *vi; - - mT[0] = CoTaskMemAlloc(sizeof(AM_MEDIA_TYPE)); - if (!mT[0]) - return E_OUTOFMEMORY; - vi = CoTaskMemAlloc(sizeof(VIDEOINFOHEADER)); - mT[0]->cbFormat = sizeof(VIDEOINFOHEADER); - if (!vi) - { - CoTaskMemFree(mT[0]); - mT[0] = NULL; + *mt = CoTaskMemAlloc(sizeof(AM_MEDIA_TYPE)); + if (!*mt) return E_OUTOFMEMORY; - } - mT[0]->majortype = MEDIATYPE_Video; - mT[0]->subtype = MEDIASUBTYPE_RGB24; - mT[0]->formattype = FORMAT_VideoInfo; - mT[0]->bFixedSizeSamples = TRUE; - mT[0]->bTemporalCompression = FALSE; - mT[0]->pUnk = NULL; - mT[0]->lSampleSize = capBox->outputwidth * capBox->outputheight * capBox->bitDepth / 8; - TRACE("Output format: %dx%d - %d bits = %u KB\n", capBox->outputwidth, - capBox->outputheight, capBox->bitDepth, mT[0]->lSampleSize/1024); - vi->rcSource.left = 0; vi->rcSource.top = 0; - vi->rcTarget.left = 0; vi->rcTarget.top = 0; - vi->rcSource.right = capBox->width; vi->rcSource.bottom = capBox->height; - vi->rcTarget.right = capBox->outputwidth; vi->rcTarget.bottom = capBox->outputheight; - vi->dwBitRate = capBox->fps * mT[0]->lSampleSize; - vi->dwBitErrorRate = 0; - vi->AvgTimePerFrame = (LONGLONG)10000000.0 / (LONGLONG)capBox->fps; - vi->bmiHeader.biSize = 40; - vi->bmiHeader.biWidth = capBox->outputwidth; - vi->bmiHeader.biHeight = capBox->outputheight; - vi->bmiHeader.biPlanes = 1; - vi->bmiHeader.biBitCount = 24; - vi->bmiHeader.biCompression = BI_RGB; - vi->bmiHeader.biSizeImage = mT[0]->lSampleSize; - vi->bmiHeader.biClrUsed = vi->bmiHeader.biClrImportant = 0; - vi->bmiHeader.biXPelsPerMeter = 100; - vi->bmiHeader.biYPelsPerMeter = 100; - mT[0]->pbFormat = (void *)vi; - return S_OK; + + return CopyMediaType(*mt, &device->current_caps->media_type); } static __u32 v4l2_cid_from_qcap_property(VideoProcAmpProperty property) @@ -338,13 +309,18 @@ HRESULT qcap_driver_set_prop(Capture *device, VideoProcAmpProperty property, static void Resize(const Capture * capBox, LPBYTE output, const BYTE *input) { + UINT width, height, bitdepth, depth; + + width = capBox->current_caps->video_info.bmiHeader.biWidth; + height = capBox->current_caps->video_info.bmiHeader.biHeight; + bitdepth = capBox->current_caps->video_info.bmiHeader.biBitCount; + depth = bitdepth / 8; /* the whole image needs to be reversed, because the dibs are messed up in windows */ if (!capBox->swresize) { - int depth = capBox->bitDepth / 8; - int inoffset = 0, outoffset = capBox->height * capBox->width * depth; - int ow = capBox->width * depth; + int inoffset = 0, outoffset = width * height * depth; + int ow = width * depth; while (outoffset > 0) { int x; @@ -358,7 +334,6 @@ static void Resize(const Capture * capBox, LPBYTE output, const BYTE *input) { HDC dc_s, dc_d; HBITMAP bmp_s, bmp_d; - int depth = capBox->bitDepth / 8; int inoffset = 0, outoffset = (capBox->outputheight) * capBox->outputwidth * depth; int ow = capBox->outputwidth * depth; LPBYTE myarray; @@ -368,12 +343,12 @@ static void Resize(const Capture * capBox, LPBYTE output, const BYTE *input) myarray = CoTaskMemAlloc(capBox->outputwidth * capBox->outputheight * depth); dc_s = CreateCompatibleDC(NULL); dc_d = CreateCompatibleDC(NULL); - bmp_s = CreateBitmap(capBox->width, capBox->height, 1, capBox->bitDepth, input); - bmp_d = CreateBitmap(capBox->outputwidth, capBox->outputheight, 1, capBox->bitDepth, NULL); + bmp_s = CreateBitmap(width, height, 1, bitdepth, input); + bmp_d = CreateBitmap(capBox->outputwidth, capBox->outputheight, 1, bitdepth, NULL); SelectObject(dc_s, bmp_s); SelectObject(dc_d, bmp_d); StretchBlt(dc_d, 0, 0, capBox->outputwidth, capBox->outputheight, - dc_s, 0, 0, capBox->width, capBox->height, SRCCOPY); + dc_s, 0, 0, width, height, SRCCOPY); GetBitmapBits(bmp_d, capBox->outputwidth * capBox->outputheight * depth, myarray); while (outoffset > 0) { @@ -400,8 +375,12 @@ static DWORD WINAPI ReadThread(LPVOID lParam) ULONG framecount = 0; unsigned char *pTarget, *image_data; unsigned int image_size; + UINT width, height, depth; - image_size = capBox->height * capBox->width * 3; + width = capBox->current_caps->video_info.bmiHeader.biWidth; + height = capBox->current_caps->video_info.bmiHeader.biHeight; + depth = capBox->current_caps->video_info.bmiHeader.biBitCount / 8; + image_size = width * height * 3; if (!(image_data = heap_alloc(image_size))) { ERR("Failed to allocate memory.\n"); @@ -419,9 +398,9 @@ static DWORD WINAPI ReadThread(LPVOID lParam) int len; if (!capBox->swresize) - len = capBox->height * capBox->width * capBox->bitDepth / 8; + len = width * height * depth; else - len = capBox->outputheight * capBox->outputwidth * capBox->bitDepth / 8; + len = capBox->outputheight * capBox->outputwidth * depth; IMediaSample_SetActualDataLength(pSample, len); len = IMediaSample_GetActualDataLength(pSample); @@ -461,10 +440,10 @@ void qcap_driver_init_stream(Capture *device) req_props.cBuffers = 3; if (!device->swresize) - req_props.cbBuffer = device->width * device->height; + req_props.cbBuffer = device->current_caps->video_info.bmiHeader.biWidth * device->current_caps->video_info.bmiHeader.biHeight; else req_props.cbBuffer = device->outputwidth * device->outputheight; - req_props.cbBuffer = (req_props.cbBuffer * device->bitDepth) / 8; + req_props.cbBuffer = (req_props.cbBuffer * device->current_caps->video_info.bmiHeader.biBitCount) / 8; req_props.cbAlign = 1; req_props.cbPrefix = 0; @@ -671,9 +650,7 @@ Capture *qcap_driver_init(struct strmbase_source *pin, USHORT card) 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) + if (!set_caps(device, &device->caps[0])) { ERR("Failed to set pixel format: %s\n", strerror(errno)); if (!have_libv4l2) @@ -681,16 +658,13 @@ Capture *qcap_driver_init(struct strmbase_source *pin, USHORT card) goto error; } - device->outputwidth = device->width = format.fmt.pix.width; - device->outputheight = device->height = format.fmt.pix.height; - device->swresize = FALSE; - device->bitDepth = 24; device->pin = pin; - device->fps = 3; device->state = State_Stopped; device->run_event = CreateEventW(NULL, TRUE, FALSE, NULL); - TRACE("Format: %d bpp - %dx%d.\n", device->bitDepth, device->width, device->height); + TRACE("Format: %d bpp - %dx%d.\n", device->current_caps->video_info.bmiHeader.biBitCount, + device->current_caps->video_info.bmiHeader.biWidth, + device->current_caps->video_info.bmiHeader.biHeight); return device; diff --git a/dlls/qcap/vfwcapture.c b/dlls/qcap/vfwcapture.c index 4b1d14082a..6c9cc3ce51 100644 --- a/dlls/qcap/vfwcapture.c +++ b/dlls/qcap/vfwcapture.c @@ -207,6 +207,9 @@ AMStreamConfig_SetFormat(IAMStreamConfig *iface, AM_MEDIA_TYPE *pmt) return E_POINTER; } + if (!IsEqualGUID(&pmt->majortype, &MEDIATYPE_Video)) + return E_FAIL; + if (This->source.pin.peer) { hr = IPin_QueryAccept(This->source.pin.peer, pmt); -- 2.26.2

1 0

[PATCH v2 1/6] qcap/videocapture: Storage capabilities information.
by Jactry Zeng 28 Apr '20

28 Apr '20

Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/qcap/v4l.c | 118 ++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 115 insertions(+), 3 deletions(-) diff --git a/dlls/qcap/v4l.c b/dlls/qcap/v4l.c index 6fe92d2d0a..a370c7583a 100644 --- a/dlls/qcap/v4l.c +++ b/dlls/qcap/v4l.c @@ -93,9 +93,19 @@ static BOOL video_init(void) #endif } +struct caps +{ + __u32 pixelformat; + AM_MEDIA_TYPE media_type; + VIDEOINFOHEADER video_info; + VIDEO_STREAM_CONFIG_CAPS config; +}; + struct _Capture { UINT width, height, bitDepth, fps, outputwidth, outputheight; + struct caps *caps; + LONG caps_count; BOOL swresize; struct strmbase_source *pin; @@ -120,9 +130,12 @@ HRESULT qcap_driver_destroy(Capture *capBox) { TRACE("%p\n", capBox); - if( capBox->fd != -1 ) + if (capBox->fd != -1) video_close(capBox->fd); - CoTaskMemFree(capBox); + if (capBox->caps_count) + heap_free(capBox->caps); + heap_free(capBox); + return S_OK; } @@ -495,6 +508,41 @@ void qcap_driver_cleanup_stream(Capture *device) ERR("Failed to decommit allocator, hr %#x.\n", hr); } + +static void fill_caps(__u32 pixelformat, __u32 width, __u32 height, + __u32 max_fps, __u32 min_fps, struct caps *caps) +{ + LONG depth = 24; + + caps->video_info.dwBitRate = width * height * depth * max_fps; + caps->video_info.bmiHeader.biSize = sizeof(caps->video_info.bmiHeader); + caps->video_info.bmiHeader.biWidth = width; + caps->video_info.bmiHeader.biHeight = height; + caps->video_info.bmiHeader.biPlanes = 1; + caps->video_info.bmiHeader.biBitCount = depth; + caps->video_info.bmiHeader.biCompression = BI_RGB; + caps->video_info.bmiHeader.biSizeImage = width * height * depth / 8; + caps->media_type.majortype = MEDIATYPE_Video; + caps->media_type.subtype = MEDIASUBTYPE_RGB24; + caps->media_type.bFixedSizeSamples = TRUE; + caps->media_type.bTemporalCompression = FALSE; + caps->media_type.lSampleSize = width * height * depth / 8; + caps->media_type.formattype = FORMAT_VideoInfo; + caps->media_type.pUnk = NULL; + caps->media_type.cbFormat = sizeof(VIDEOINFOHEADER); + caps->media_type.pbFormat = (void *)&caps->video_info; + caps->config.MaxFrameInterval = 10000000 * max_fps; + caps->config.MinFrameInterval = 10000000 * min_fps;; + caps->config.MaxOutputSize.cx = width; + caps->config.MaxOutputSize.cy = height; + caps->config.MinOutputSize.cx = width; + caps->config.MinOutputSize.cy = height; + caps->config.guid = FORMAT_VideoInfo; + caps->config.MinBitsPerSecond = width * height * depth * min_fps; + caps->config.MaxBitsPerSecond = width * height * depth * max_fps; + caps->pixelformat = pixelformat; +} + Capture *qcap_driver_init(struct strmbase_source *pin, USHORT card) { struct v4l2_capability caps = {{0}}; @@ -506,7 +554,7 @@ Capture *qcap_driver_init(struct strmbase_source *pin, USHORT card) have_libv4l2 = video_init(); - if (!(device = CoTaskMemAlloc(sizeof(*device)))) + if (!(device = heap_alloc_zero(sizeof(*device)))) return NULL; sprintf(path, "/dev/video%i", card); @@ -559,6 +607,70 @@ Capture *qcap_driver_init(struct strmbase_source *pin, USHORT card) goto error; } + format.fmt.pix.pixelformat = V4L2_PIX_FMT_BGR24; + if (xioctl(fd, VIDIOC_TRY_FMT, &format) != -1 + && format.fmt.pix.pixelformat == V4L2_PIX_FMT_BGR24) + { + struct v4l2_frmsizeenum frmsize = {0}; + + frmsize.pixel_format = format.fmt.pix.pixelformat; + while(xioctl(fd, VIDIOC_ENUM_FRAMESIZES, &frmsize) != -1) + { + struct v4l2_frmivalenum frmival = {0}; + __u32 max_fps = 30, min_fps = 30; + struct caps *new_caps; + + frmival.pixel_format = format.fmt.pix.pixelformat; + if (frmsize.type == V4L2_FRMSIZE_TYPE_DISCRETE) + { + frmival.width = frmsize.discrete.width; + frmival.height = frmsize.discrete.height; + } + else if (frmsize.type == V4L2_FRMSIZE_TYPE_STEPWISE) + { + frmival.width = frmsize.stepwise.max_width; + frmival.height = frmsize.stepwise.min_height; + } + else + { + FIXME("Unhandled frame size type: %d.\n", frmsize.type); + continue; + } + + if (xioctl(fd, VIDIOC_ENUM_FRAMEINTERVALS, &frmival) != -1) + { + if (frmival.type == V4L2_FRMIVAL_TYPE_DISCRETE) + { + max_fps = frmival.discrete.denominator / frmival.discrete.numerator; + min_fps = max_fps; + } + else if (frmival.type == V4L2_FRMIVAL_TYPE_STEPWISE + || frmival.type == V4L2_FRMIVAL_TYPE_CONTINUOUS) + { + max_fps = frmival.stepwise.max.denominator / frmival.stepwise.max.numerator; + min_fps = frmival.stepwise.min.denominator / frmival.stepwise.min.numerator; + } + } + else + ERR("Failed to get fps: %s.\n", strerror(errno)); + + new_caps = heap_realloc(device->caps, (device->caps_count + 1) * sizeof(*device->caps)); + if (!new_caps) + goto error; + device->caps = new_caps; + fill_caps(format.fmt.pix.pixelformat, frmsize.discrete.width, frmsize.discrete.height, + max_fps, min_fps, &device->caps[device->caps_count]); + device->caps_count++; + + frmsize.index++; + } + } + else + { + ERR("This device doesn't support V4L2_PIX_FMT_BGR24 format.\n"); + 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) -- 2.26.2

1 0

[PATCH 2/2]winmm: Fix no sound or recording when use waveform-audio
by dead ash 28 Apr '20

28 Apr '20

from MSDN, the waveInGetDevCaps and waveOutGetDevCaps function of parameter uDeviceID can be either a device identifier or a handle of an open waveform-audio input or output device. now the function not support handle. also same as waveOutOpen and waveInOpen.

3 4

[PATCH 2/2] winmm-wave: fixed waveOutOpen and waveInOpen
by dead ash 28 Apr '20

28 Apr '20

1 0

[PATCH] rpcrt4: Use str/wstr parameters for A/W functions.
by Serge Gautherie 27 Apr '20

27 Apr '20

Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> --- dlls/rpcrt4/rpcrt4.spec | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/rpcrt4/rpcrt4.spec b/dlls/rpcrt4/rpcrt4.spec index 135beab..c1db5ba 100644 --- a/dlls/rpcrt4/rpcrt4.spec +++ b/dlls/rpcrt4/rpcrt4.spec @@ -9,8 +9,8 @@ @ stdcall CStdStubBuffer_Invoke(ptr ptr ptr) @ stdcall CStdStubBuffer_IsIIDSupported(ptr ptr) @ stdcall CStdStubBuffer_QueryInterface(ptr ptr ptr) -@ stdcall DceErrorInqTextA (long ptr) -@ stdcall DceErrorInqTextW (long ptr) +@ stdcall DceErrorInqTextA(long str) +@ stdcall DceErrorInqTextW(long wstr) @ stdcall -private DllRegisterServer() @ stub GlobalMutexClearExternal @ stub GlobalMutexRequestExternal @@ -196,7 +196,7 @@ @ stdcall NdrFullPointerQueryPointer(ptr ptr long ptr) @ stdcall NdrFullPointerQueryRefId(ptr long long ptr) @ stdcall NdrFullPointerXlatFree(ptr) -@ stdcall NdrFullPointerXlatInit(long long) +@ stdcall NdrFullPointerXlatInit(long long) @ stdcall NdrGetBuffer(ptr long ptr) @ stub NdrGetDcomProtocolVersion @ stub NdrGetPartialBuffer @@ -341,7 +341,7 @@ @ stub RpcAsyncRegisterInfo @ stdcall RpcBindingCopy(ptr ptr) @ stdcall RpcBindingFree(ptr) -@ stdcall RpcBindingFromStringBindingA(str ptr) +@ stdcall RpcBindingFromStringBindingA(str ptr) @ stdcall RpcBindingFromStringBindingW(wstr ptr) @ stdcall RpcBindingInqAuthClientA(ptr ptr ptr ptr ptr ptr) @ stdcall RpcBindingInqAuthClientExA(ptr ptr ptr ptr ptr ptr long) @@ -434,7 +434,7 @@ @ stdcall RpcServerInqDefaultPrincNameW(long ptr) @ stub RpcServerInqIf @ stdcall RpcServerListen(long long long) -@ stdcall RpcServerRegisterAuthInfoA(str long ptr ptr) +@ stdcall RpcServerRegisterAuthInfoA(str long ptr ptr) @ stdcall RpcServerRegisterAuthInfoW(wstr long ptr ptr) @ stdcall RpcServerRegisterIf2(ptr ptr ptr long long long ptr) @ stdcall RpcServerRegisterIf3(ptr ptr ptr long long long ptr ptr) @@ -448,8 +448,8 @@ @ stub RpcServerUseAllProtseqsIf @ stub RpcServerUseAllProtseqsIfEx @ stdcall RpcServerUseProtseqA(str long ptr) -@ stdcall RpcServerUseProtseqEpA(str long str ptr) -@ stdcall RpcServerUseProtseqEpExA(str long str ptr ptr) +@ stdcall RpcServerUseProtseqEpA(str long str ptr) +@ stdcall RpcServerUseProtseqEpExA(str long str ptr ptr) @ stdcall RpcServerUseProtseqEpExW(wstr long wstr ptr ptr) @ stdcall RpcServerUseProtseqEpW(wstr long wstr ptr) @ stub RpcServerUseProtseqExA @@ -483,9 +483,9 @@ @ stub RpcSsSetClientAllocFree @ stub RpcSsSetThreadHandle @ stub RpcSsSwapClientAllocFree -@ stdcall RpcStringBindingComposeA(str str str str str ptr) +@ stdcall RpcStringBindingComposeA(str str str str str ptr) @ stdcall RpcStringBindingComposeW(wstr wstr wstr wstr wstr ptr) -@ stdcall RpcStringBindingParseA(str ptr ptr ptr ptr ptr) +@ stdcall RpcStringBindingParseA(str ptr ptr ptr ptr ptr) @ stdcall RpcStringBindingParseW(wstr ptr ptr ptr ptr ptr) @ stdcall RpcStringFreeA(ptr) @ stdcall RpcStringFreeW(ptr) -- 2.10.0.windows.1

3 2

[PATCH 1/5] advapi32: Replace usage of internal SERV_ functions with exported functions.
by Zebediah Figura 27 Apr '20

27 Apr '20

From: Micah N Gorrell <mgorrell(a)codeweavers.com> Signed-off-by: Micah N Gorrell <mgorrell(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/advapi32/advapi32_misc.h | 3 -- dlls/advapi32/security.c | 70 ++++++++++++++++------------------- dlls/advapi32/service.c | 6 +-- 3 files changed, 35 insertions(+), 44 deletions(-) diff --git a/dlls/advapi32/advapi32_misc.h b/dlls/advapi32/advapi32_misc.h index 4ced1e8a648..77b56420ba3 100644 --- a/dlls/advapi32/advapi32_misc.h +++ b/dlls/advapi32/advapi32_misc.h @@ -32,9 +32,6 @@ BOOL ADVAPI_GetComputerSid(PSID sid) DECLSPEC_HIDDEN; BOOL lookup_local_wellknown_name(const LSA_UNICODE_STRING*, PSID, LPDWORD, LPWSTR, LPDWORD, PSID_NAME_USE, BOOL*) DECLSPEC_HIDDEN; BOOL lookup_local_user_name(const LSA_UNICODE_STRING*, PSID, LPDWORD, LPWSTR, LPDWORD, PSID_NAME_USE, BOOL*) DECLSPEC_HIDDEN; WCHAR *SERV_dup(const char *str) DECLSPEC_HIDDEN; -DWORD SERV_OpenSCManagerW(LPCWSTR, LPCWSTR, DWORD, SC_HANDLE*) DECLSPEC_HIDDEN; -DWORD SERV_OpenServiceW(SC_HANDLE, LPCWSTR, DWORD, SC_HANDLE*) DECLSPEC_HIDDEN; -NTSTATUS SERV_QueryServiceObjectSecurity(SC_HANDLE, SECURITY_INFORMATION, PSECURITY_DESCRIPTOR, DWORD, LPDWORD) DECLSPEC_HIDDEN; const WCHAR *get_wellknown_privilege_name(const LUID *) DECLSPEC_HIDDEN; /* memory allocation functions */ diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index 4bea26d1557..7315f9b51a9 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -415,16 +415,15 @@ static inline DWORD get_security_file( LPCWSTR full_file_name, DWORD access, HAN /* helper function for SE_SERVICE objects in [Get|Set]NamedSecurityInfo */ static inline DWORD get_security_service( LPWSTR full_service_name, DWORD access, HANDLE *service ) { - SC_HANDLE manager = 0; - DWORD err; - - err = SERV_OpenSCManagerW( NULL, NULL, access, (SC_HANDLE *)&manager ); - if (err == ERROR_SUCCESS) + SC_HANDLE manager = OpenSCManagerW( NULL, NULL, access ); + if (manager) { - err = SERV_OpenServiceW( manager, full_service_name, access, (SC_HANDLE *)service ); + *service = OpenServiceW( manager, full_service_name, access); CloseServiceHandle( manager ); + if (*service) + return ERROR_SUCCESS; } - return err; + return GetLastError(); } /* helper function for SE_REGISTRY_KEY objects in [Get|Set]NamedSecurityInfo */ @@ -1779,16 +1778,13 @@ BOOL WINAPI PrivilegedServiceAuditAlarmA( LPCSTR SubsystemName, LPCSTR ServiceNa * RETURNS * ERROR_SUCCESS if all's well, and a WIN32 error code otherwise. */ -DWORD WINAPI GetSecurityInfo( - HANDLE hObject, SE_OBJECT_TYPE ObjectType, - SECURITY_INFORMATION SecurityInfo, PSID *ppsidOwner, - PSID *ppsidGroup, PACL *ppDacl, PACL *ppSacl, - PSECURITY_DESCRIPTOR *ppSecurityDescriptor -) +DWORD WINAPI GetSecurityInfo( HANDLE handle, SE_OBJECT_TYPE type, SECURITY_INFORMATION SecurityInfo, + PSID *ppsidOwner, PSID *ppsidGroup, PACL *ppDacl, PACL *ppSacl, + PSECURITY_DESCRIPTOR *ppSecurityDescriptor ) { PSECURITY_DESCRIPTOR sd; NTSTATUS status; - ULONG n1, n2; + ULONG size; BOOL present, defaulted; /* A NULL descriptor is allowed if any one of the other pointers is not NULL */ @@ -1802,35 +1798,33 @@ DWORD WINAPI GetSecurityInfo( || ((SecurityInfo & SACL_SECURITY_INFORMATION) && !ppSacl) )) return ERROR_INVALID_PARAMETER; - switch (ObjectType) + if (type == SE_SERVICE) { - case SE_SERVICE: - status = SERV_QueryServiceObjectSecurity(hObject, SecurityInfo, NULL, 0, &n1); - break; - default: - status = NtQuerySecurityObject(hObject, SecurityInfo, NULL, 0, &n1); - break; - } - if (status != STATUS_BUFFER_TOO_SMALL && status != STATUS_SUCCESS) - return RtlNtStatusToDosError(status); + if (!QueryServiceObjectSecurity( handle, SecurityInfo, NULL, 0, &size ) + && GetLastError() != ERROR_INSUFFICIENT_BUFFER) + return GetLastError(); - sd = LocalAlloc(0, n1); - if (!sd) - return ERROR_NOT_ENOUGH_MEMORY; + if (!(sd = LocalAlloc( 0, size ))) return ERROR_NOT_ENOUGH_MEMORY; - switch (ObjectType) - { - case SE_SERVICE: - status = SERV_QueryServiceObjectSecurity(hObject, SecurityInfo, sd, n1, &n2); - break; - default: - status = NtQuerySecurityObject(hObject, SecurityInfo, sd, n1, &n2); - break; + if (!QueryServiceObjectSecurity( handle, SecurityInfo, sd, size, &size )) + { + LocalFree(sd); + return GetLastError(); + } } - if (status != STATUS_SUCCESS) + else { - LocalFree(sd); - return RtlNtStatusToDosError(status); + status = NtQuerySecurityObject( handle, SecurityInfo, NULL, 0, &size ); + if (status != STATUS_SUCCESS && status != STATUS_BUFFER_TOO_SMALL) + return RtlNtStatusToDosError( status ); + + if (!(sd = LocalAlloc( 0, size ))) return ERROR_NOT_ENOUGH_MEMORY; + + if ((status = NtQuerySecurityObject( handle, SecurityInfo, sd, size, &size ))) + { + LocalFree(sd); + return RtlNtStatusToDosError( status ); + } } if (ppsidOwner) diff --git a/dlls/advapi32/service.c b/dlls/advapi32/service.c index 231f0267e98..2781a128239 100644 --- a/dlls/advapi32/service.c +++ b/dlls/advapi32/service.c @@ -897,7 +897,7 @@ SC_HANDLE WINAPI OpenSCManagerA( LPCSTR lpMachineName, LPCSTR lpDatabaseName, * * See OpenSCManagerA. */ -DWORD SERV_OpenSCManagerW( LPCWSTR lpMachineName, LPCWSTR lpDatabaseName, +static DWORD SERV_OpenSCManagerW( LPCWSTR lpMachineName, LPCWSTR lpDatabaseName, DWORD dwDesiredAccess, SC_HANDLE *handle ) { DWORD r; @@ -1049,7 +1049,7 @@ SC_HANDLE WINAPI OpenServiceA( SC_HANDLE hSCManager, LPCSTR lpServiceName, * * See OpenServiceA. */ -DWORD SERV_OpenServiceW( SC_HANDLE hSCManager, LPCWSTR lpServiceName, +static DWORD SERV_OpenServiceW( SC_HANDLE hSCManager, LPCWSTR lpServiceName, DWORD dwDesiredAccess, SC_HANDLE *handle ) { DWORD err; @@ -2484,7 +2484,7 @@ BOOL WINAPI ChangeServiceConfig2W( SC_HANDLE hService, DWORD dwInfoLevel, return err == ERROR_SUCCESS; } -NTSTATUS SERV_QueryServiceObjectSecurity(SC_HANDLE hService, +static NTSTATUS SERV_QueryServiceObjectSecurity(SC_HANDLE hService, SECURITY_INFORMATION dwSecurityInformation, PSECURITY_DESCRIPTOR lpSecurityDescriptor, DWORD cbBufSize, LPDWORD pcbBytesNeeded) -- 2.26.2

2 5

[PATCH] quartz/tests: Relax a test for PresentImage().
by Zebediah Figura 27 Apr '20

27 Apr '20

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/quartz/tests/vmr9.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/quartz/tests/vmr9.c b/dlls/quartz/tests/vmr9.c index 35776e85ff7..e78d20a4118 100644 --- a/dlls/quartz/tests/vmr9.c +++ b/dlls/quartz/tests/vmr9.c @@ -2704,12 +2704,12 @@ static void test_renderless_present(IFilterGraph2 *graph, IMemInputPin *input) thread = send_frame(input); hr = IMediaControl_GetState(control, 1000, &state); ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(allocator_got_PresentImage == 1, "Got %u calls to PresentImage().\n", allocator_got_PresentImage); hr = IMediaControl_Run(control); ok(hr == S_OK, "Got hr %#x.\n", hr); hr = join_thread(thread); ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(allocator_got_PresentImage == 1, "Got %u calls to PresentImage().\n", allocator_got_PresentImage); hr = IMediaControl_Stop(control); ok(hr == S_OK, "Got hr %#x.\n", hr); -- 2.26.2

1 1

[PATCH] rpcrt4: Add NdrCreateServerInterfaceFromStub() stub.
by Serge Gautherie 27 Apr '20

27 Apr '20

Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> --- See https://testbot.winehq.org/JobDetails.pl?Key=70704. I confirm it is already on XP x86. Follow-up to 98eaef3ad945eae570f92184725115613f6a3951. Sorry. --- dlls/rpcrt4/rpcrt4.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/rpcrt4/rpcrt4.spec b/dlls/rpcrt4/rpcrt4.spec index 135beab..64b46d5 100644 --- a/dlls/rpcrt4/rpcrt4.spec +++ b/dlls/rpcrt4/rpcrt4.spec @@ -123,6 +123,7 @@ @ stdcall NdrByteCountPointerFree(ptr ptr ptr) @ stdcall NdrByteCountPointerMarshall(ptr ptr ptr) @ stdcall NdrByteCountPointerUnmarshall(ptr ptr ptr long) +@ stub NdrCreateServerInterfaceFromStub @ stdcall NdrCStdStubBuffer2_Release(ptr ptr) @ stdcall NdrCStdStubBuffer_Release(ptr ptr) @ stdcall NdrClearOutParameters(ptr ptr ptr) -- 2.10.0.windows.1

1 0

[PATCH 1/2] quartz: Don't register the DirectSound renderer as a filter for autoplugging.
by Zebediah Figura 27 Apr '20

27 Apr '20

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/quartz/regsvr.c | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/dlls/quartz/regsvr.c b/dlls/quartz/regsvr.c index 7196f79a54..a5b52425b0 100644 --- a/dlls/quartz/regsvr.c +++ b/dlls/quartz/regsvr.c @@ -222,19 +222,6 @@ static struct regsvr_filter const filter_list[] = { { 0xFFFFFFFF }, } }, - { &CLSID_DSoundRender, - &CLSID_LegacyAmFilterCategory, - L"Audio Renderer", - 0x800000, - { { REG_PINFLAG_B_RENDERER, - { { &MEDIATYPE_Audio, &MEDIASUBTYPE_PCM }, -/* { &MEDIATYPE_Audio, &MEDIASUBTYPE_IEEE_FLOAT }, */ - { NULL } - }, - }, - { 0xFFFFFFFF }, - } - }, { &CLSID_AudioRender, &CLSID_LegacyAmFilterCategory, L"Audio Renderer", -- 2.26.2

1 1