[PATCH 0/2] MR10269: qcap: Fix Smart Tee negotiation and V4L WoW64 media type marshaling.
## Summary This work started from a real-world regression: in VRChat, the camera could not be used. After investigation, VRChat was found to use DirectShow for camera capture/preview. The issue was then narrowed down to qcap behavior differences, and fixes were implemented in source code to align with native behavior. This MR includes: 1. Smart Tee preview RGB32 negotiation fix. 2. V4L wow64 media type marshaling fix. These changes are expected to resolve this class of DirectShow camera compatibility issues. ## Root cause and approach - Application symptom: VRChat camera path failed. - API path: DirectShow camera pipeline. - Scope narrowed to qcap Smart Tee preview negotiation and wow64 media-type marshaling in V4L backend. - Implemented behavior-aligned fixes and corresponding conformance tests. ## Validation - Native Windows behavior was probed and used as baseline during test alignment. - `qcap_test.exe smartteefilter`: **488 tests, 0 failures** (i386/x86_64) - `qcap_test.exe videocapture`: **754 tests, 0 failures** (i386/x86_64) - Functional app check: `AMCap.exe` preview opens camera successfully and image display is normal. ## Expected impact This MR is expected to fix/mitigate similar cases where DirectShow-based applications fail to initialize or preview camera streams under Wine. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/10269
From: zhineng cao <czn0601@qq.com> --- dlls/qcap/smartteefilter.c | 197 +++++++++++++++++++++- dlls/qcap/tests/smartteefilter.c | 270 ++++++++++++++++++++++++++++++- 2 files changed, 459 insertions(+), 8 deletions(-) diff --git a/dlls/qcap/smartteefilter.c b/dlls/qcap/smartteefilter.c index 9c736a40626..6995d9deef3 100644 --- a/dlls/qcap/smartteefilter.c +++ b/dlls/qcap/smartteefilter.c @@ -20,6 +20,8 @@ #include "qcap_private.h" +#include <limits.h> + WINE_DEFAULT_DEBUG_CHANNEL(quartz); typedef struct { @@ -139,6 +141,14 @@ static HRESULT copy_sample(IMediaSample *inputSample, IMemAllocator *allocator, hr = IMemAllocator_GetBuffer(allocator, &outputSample, haveStartTime ? &startTime : NULL, haveEndTime ? &endTime : NULL, 0); + if (hr == VFW_E_NOT_COMMITTED) + { + HRESULT commit_hr; + commit_hr = IMemAllocator_Commit(allocator); + if (SUCCEEDED(commit_hr)) + hr = IMemAllocator_GetBuffer(allocator, &outputSample, + haveStartTime ? &startTime : NULL, haveEndTime ? &endTime : NULL, 0); + } if (FAILED(hr)) goto end; if (IMediaSample_GetSize(outputSample) < IMediaSample_GetActualDataLength(inputSample)) { ERR("insufficient space in sample\n"); @@ -196,6 +206,95 @@ end: return hr; } +static BOOL mt_is_rgb24_video(const AM_MEDIA_TYPE *mt) +{ + return IsEqualGUID(&mt->majortype, &MEDIATYPE_Video) + && IsEqualGUID(&mt->subtype, &MEDIASUBTYPE_RGB24) + && IsEqualGUID(&mt->formattype, &FORMAT_VideoInfo) + && mt->cbFormat >= sizeof(VIDEOINFOHEADER) + && mt->pbFormat; +} + +static BOOL mt_is_rgb32_video(const AM_MEDIA_TYPE *mt) +{ + return IsEqualGUID(&mt->majortype, &MEDIATYPE_Video) + && IsEqualGUID(&mt->subtype, &MEDIASUBTYPE_RGB32) + && IsEqualGUID(&mt->formattype, &FORMAT_VideoInfo) + && mt->cbFormat >= sizeof(VIDEOINFOHEADER) + && mt->pbFormat; +} + +static HRESULT convert_sample_rgb24_to_rgb32(IMediaSample *sample, const AM_MEDIA_TYPE *src_mt, + const AM_MEDIA_TYPE *dst_mt) +{ + const VIDEOINFOHEADER *src_vih = (const VIDEOINFOHEADER *)src_mt->pbFormat; + const VIDEOINFOHEADER *dst_vih = (const VIDEOINFOHEADER *)dst_mt->pbFormat; + BYTE *data; + LONG input_len, output_len, sample_size; + LONG src_row, dst_row, width, height, row; + LONG src_offset, dst_offset; + HRESULT hr; + + if (!src_mt->pbFormat || src_mt->cbFormat < sizeof(*src_vih) + || !dst_mt->pbFormat || dst_mt->cbFormat < sizeof(*dst_vih)) + return VFW_E_INVALIDMEDIATYPE; + + width = src_vih->bmiHeader.biWidth; + if (width < 0) + width = -width; + height = src_vih->bmiHeader.biHeight; + if (height < 0) + height = -height; + + if (!width || !height) + return VFW_E_INVALIDMEDIATYPE; + + if (width > LONG_MAX / 32) + return VFW_E_INVALIDMEDIATYPE; + + src_row = ((width * 24 + 31) / 32) * 4; + dst_row = ((width * 32 + 31) / 32) * 4; + + if (height > LONG_MAX / src_row || height > LONG_MAX / dst_row) + return VFW_E_BUFFER_OVERFLOW; + + input_len = src_row * height; + output_len = dst_row * height; + + sample_size = IMediaSample_GetActualDataLength(sample); + if (sample_size < input_len) + return VFW_E_TYPE_NOT_ACCEPTED; + + sample_size = IMediaSample_GetSize(sample); + if (output_len > sample_size) + return VFW_E_BUFFER_OVERFLOW; + + if (FAILED(hr = IMediaSample_GetPointer(sample, &data))) + return hr; + + for (row = height - 1; row >= 0; --row) + { + LONG x; + + src_offset = row * src_row; + dst_offset = row * dst_row; + + for (x = width - 1; x >= 0; --x) + { + BYTE b = data[src_offset + x * 3 + 0]; + BYTE g = data[src_offset + x * 3 + 1]; + BYTE r = data[src_offset + x * 3 + 2]; + + data[dst_offset + x * 4 + 0] = b; + data[dst_offset + x * 4 + 1] = g; + data[dst_offset + x * 4 + 2] = r; + data[dst_offset + x * 4 + 3] = 0xff; + } + } + + return IMediaSample_SetActualDataLength(sample, output_len); +} + static HRESULT WINAPI SmartTeeFilterInput_Receive(struct strmbase_sink *base, IMediaSample *inputSample) { SmartTeeFilter *This = impl_from_strmbase_pin(&base->pin); @@ -224,6 +323,11 @@ static HRESULT WINAPI SmartTeeFilterInput_Receive(struct strmbase_sink *base, IM if (This->preview.pin.peer) hrPreview = copy_sample(inputSample, This->preview.pAllocator, &previewSample); LeaveCriticalSection(&This->filter.filter_cs); + + if (SUCCEEDED(hrPreview) && mt_is_rgb24_video(&This->sink.pin.mt) + && mt_is_rgb32_video(&This->preview.pin.mt)) + hrPreview = convert_sample_rgb24_to_rgb32(previewSample, &This->sink.pin.mt, &This->preview.pin.mt); + /* No timestamps on preview stream: */ if (SUCCEEDED(hrPreview)) hrPreview = IMediaSample_SetTime(previewSample, NULL, NULL); @@ -258,11 +362,49 @@ static HRESULT source_get_media_type(struct strmbase_pin *iface, { SmartTeeFilter *filter = impl_from_strmbase_pin(iface); HRESULT hr = S_OK; + BOOL is_preview = iface == &filter->preview.pin; + BOOL rgb24_video; EnterCriticalSection(&filter->filter.filter_cs); if (!filter->sink.pin.peer) hr = VFW_E_NOT_CONNECTED; + else if (is_preview) + { + rgb24_video = mt_is_rgb24_video(&filter->sink.pin.mt); + + if (!index) + { + CopyMediaType(mt, &filter->sink.pin.mt); + if (rgb24_video) + { + VIDEOINFOHEADER *vih = (VIDEOINFOHEADER *)mt->pbFormat; + LONG width = vih->bmiHeader.biWidth; + LONG height = vih->bmiHeader.biHeight < 0 ? -vih->bmiHeader.biHeight : vih->bmiHeader.biHeight; + LONG row_size; + + if (width < 0) + width = -width; + + if (!width || !height || width > LONG_MAX / 4 || height > LONG_MAX / (width * 4)) + hr = VFW_E_INVALIDMEDIATYPE; + else + { + row_size = ((width * 32 + 31) / 32) * 4; + + mt->subtype = MEDIASUBTYPE_RGB32; + mt->lSampleSize = row_size * height; + vih->bmiHeader.biBitCount = 32; + vih->bmiHeader.biCompression = BI_RGB; + vih->bmiHeader.biSizeImage = mt->lSampleSize; + } + } + } + else if (index == 1 && rgb24_video) + CopyMediaType(mt, &filter->sink.pin.mt); + else + hr = VFW_S_NO_MORE_ITEMS; + } else if (!index) CopyMediaType(mt, &filter->sink.pin.mt); else @@ -301,9 +443,57 @@ static HRESULT WINAPI SmartTeeFilterPreview_DecideAllocator(struct strmbase_sour { SmartTeeFilter *This = impl_from_strmbase_pin(&base->pin); TRACE("(%p, %p, %p)\n", This, pPin, pAlloc); - *pAlloc = This->sink.pAllocator; - IMemAllocator_AddRef(This->sink.pAllocator); - return IMemInputPin_NotifyAllocator(pPin, This->sink.pAllocator, TRUE); + return BaseOutputPinImpl_DecideAllocator(base, pPin, pAlloc); +} + +static HRESULT WINAPI SmartTeeFilterPreview_DecideBufferSize(struct strmbase_source *base, + IMemAllocator *allocator, ALLOCATOR_PROPERTIES *props) +{ + SmartTeeFilter *filter = impl_from_strmbase_pin(&base->pin); + ALLOCATOR_PROPERTIES input_props = {0}, ret_props; + BOOL have_input_props = FALSE; + HRESULT hr; + + if (!props) + return E_POINTER; + + if (filter->sink.pAllocator + && SUCCEEDED(IMemAllocator_GetProperties(filter->sink.pAllocator, &input_props))) + have_input_props = TRUE; + + if (!props->cBuffers) + props->cBuffers = have_input_props && input_props.cBuffers ? input_props.cBuffers : 3; + + if (!props->cbBuffer) + { + if (base->pin.mt.lSampleSize) + { + props->cbBuffer = base->pin.mt.lSampleSize; + } + else if (IsEqualGUID(&base->pin.mt.formattype, &FORMAT_VideoInfo) + && base->pin.mt.cbFormat >= sizeof(VIDEOINFOHEADER) + && base->pin.mt.pbFormat) + { + VIDEOINFOHEADER *format = (VIDEOINFOHEADER *)base->pin.mt.pbFormat; + props->cbBuffer = format->bmiHeader.biSizeImage; + } + else if (have_input_props && input_props.cbBuffer) + { + props->cbBuffer = input_props.cbBuffer; + } + + if (!props->cbBuffer) + props->cbBuffer = 65536; + } + + if (!props->cbAlign) + props->cbAlign = have_input_props && input_props.cbAlign ? input_props.cbAlign : 1; + + if (!props->cbPrefix && have_input_props && input_props.cbPrefix) + props->cbPrefix = input_props.cbPrefix; + + hr = IMemAllocator_SetProperties(allocator, props, &ret_props); + return SUCCEEDED(hr) ? S_OK : hr; } static const struct strmbase_source_ops preview_ops = @@ -312,6 +502,7 @@ static const struct strmbase_source_ops preview_ops = .base.pin_get_media_type = source_get_media_type, .pfnAttemptConnection = BaseOutputPinImpl_AttemptConnection, .pfnDecideAllocator = SmartTeeFilterPreview_DecideAllocator, + .pfnDecideBufferSize = SmartTeeFilterPreview_DecideBufferSize, }; HRESULT smart_tee_create(IUnknown *outer, IUnknown **out) diff --git a/dlls/qcap/tests/smartteefilter.c b/dlls/qcap/tests/smartteefilter.c index a25889d2a4d..f25da371f4b 100644 --- a/dlls/qcap/tests/smartteefilter.c +++ b/dlls/qcap/tests/smartteefilter.c @@ -625,6 +625,11 @@ struct testfilter AM_MEDIA_TYPE source_mt; HANDLE sample_event, eos_event, segment_event; BOOL preview; + LONG expected_sample_size; + LONG expected_actual_length; + const BYTE *expected_data; + LONG expected_data_length; + BOOL ignore_alpha; unsigned int got_begin_flush, got_end_flush; }; @@ -781,19 +786,44 @@ static HRESULT WINAPI testsink_Receive(struct strmbase_sink *iface, IMediaSample struct testfilter *filter = impl_from_strmbase_filter(iface->pin.filter); REFERENCE_TIME start, stop; BYTE *data, expect[200]; + LONG expected_actual_length, expected_data_length, expected_sample_size; LONG size, i; HRESULT hr; + expected_sample_size = filter->expected_sample_size ? filter->expected_sample_size : 256; + expected_actual_length = filter->expected_actual_length ? filter->expected_actual_length : 200; + expected_data_length = filter->expected_data_length ? filter->expected_data_length : expected_actual_length; + size = IMediaSample_GetSize(sample); - ok(size == 256, "Got size %lu.\n", size); + ok(size == expected_sample_size, "Got size %lu, expected %ld.\n", size, expected_sample_size); size = IMediaSample_GetActualDataLength(sample); - ok(size == 200, "Got valid size %lu.\n", size); + ok(size == expected_actual_length, "Got valid size %lu, expected %ld.\n", size, expected_actual_length); hr = IMediaSample_GetPointer(sample, &data); ok(hr == S_OK, "Got hr %#lx.\n", hr); - for (i = 0; i < size; ++i) - expect[i] = i; - ok(!memcmp(data, expect, size), "Data didn't match.\n"); + if (filter->expected_data) + { + if (filter->ignore_alpha) + { + for (i = 0; i < expected_data_length; i += 4) + { + ok(!memcmp(data + i, filter->expected_data + i, 3), + "Data didn't match at pixel %ld, got {%02x,%02x,%02x}, expected {%02x,%02x,%02x}.\n", + i / 4, data[i], data[i + 1], data[i + 2], + filter->expected_data[i], filter->expected_data[i + 1], filter->expected_data[i + 2]); + } + } + else + { + ok(!memcmp(data, filter->expected_data, expected_data_length), "Data didn't match.\n"); + } + } + else + { + for (i = 0; i < size; ++i) + expect[i] = i; + ok(!memcmp(data, expect, size), "Data didn't match.\n"); + } hr = IMediaSample_GetTime(sample, &start, &stop); if (filter->preview) @@ -887,6 +917,33 @@ static void testfilter_init(struct testfilter *filter) filter->eos_event = CreateEventW(NULL, FALSE, FALSE, NULL); } +static void init_video_media_type(AM_MEDIA_TYPE *mt, VIDEOINFOHEADER *vih, + const GUID *subtype, LONG width, LONG height, WORD bit_count) +{ + LONG row_size; + + memset(mt, 0, sizeof(*mt)); + memset(vih, 0, sizeof(*vih)); + + row_size = ((width * bit_count + 31) / 32) * 4; + + mt->majortype = MEDIATYPE_Video; + mt->subtype = *subtype; + mt->bFixedSizeSamples = TRUE; + mt->lSampleSize = row_size * height; + mt->formattype = FORMAT_VideoInfo; + mt->cbFormat = sizeof(*vih); + mt->pbFormat = (BYTE *)vih; + + vih->bmiHeader.biSize = sizeof(vih->bmiHeader); + vih->bmiHeader.biWidth = width; + vih->bmiHeader.biHeight = height; + vih->bmiHeader.biPlanes = 1; + vih->bmiHeader.biBitCount = bit_count; + vih->bmiHeader.biCompression = BI_RGB; + vih->bmiHeader.biSizeImage = mt->lSampleSize; +} + static void test_source_media_types(AM_MEDIA_TYPE req_mt, const AM_MEDIA_TYPE *source_mt, IPin *source) { IEnumMediaTypes *enummt; @@ -1396,6 +1453,208 @@ static void test_streaming(void) ok(!ref, "Got outstanding refcount %ld.\n", ref); } +static void test_preview_rgb32_connection(void) +{ + static const BYTE input_data[] = + { + 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, + 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, + }; + static const BYTE output_data[] = + { + 0x01, 0x02, 0x03, 0xff, 0x04, 0x05, 0x06, 0xff, + 0x07, 0x08, 0x09, 0xff, 0x0a, 0x0b, 0x0c, 0xff, + }; + IBaseFilter *filter; + struct testfilter testsource, testsink; + VIDEOINFOHEADER source_vih, req_vih, preview_vih; + ALLOCATOR_PROPERTIES props; + IMemAllocator *allocator = NULL; + IEnumMediaTypes *enummt = NULL; + IMediaControl *control = NULL; + IFilterGraph2 *graph = NULL; + IMediaSample *sample = NULL; + IMemInputPin *input = NULL; + AM_MEDIA_TYPE req_mt, preview_mt, *pmt = NULL; + IPin *sink = NULL, *preview = NULL; + BYTE *data; + REFERENCE_TIME start, stop; + HRESULT hr; + ULONG ref; + + filter = create_smart_tee(); + testfilter_init(&testsource); + testfilter_init(&testsink); + testsink.preview = TRUE; + testsink.expected_sample_size = sizeof(output_data); + testsink.expected_actual_length = sizeof(output_data); + testsink.expected_data = output_data; + testsink.expected_data_length = sizeof(output_data); + testsink.ignore_alpha = TRUE; + + init_video_media_type(&testsource.source_mt, &source_vih, &MEDIASUBTYPE_RGB24, 4, 1, 24); + init_video_media_type(&req_mt, &req_vih, &MEDIASUBTYPE_RGB24, 4, 1, 24); + init_video_media_type(&preview_mt, &preview_vih, &MEDIASUBTYPE_RGB32, 4, 1, 32); + testsink.sink_mt = &preview_mt; + + hr = CoCreateInstance(&CLSID_FilterGraph, NULL, CLSCTX_INPROC_SERVER, + &IID_IFilterGraph2, (void **)&graph); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + if (FAILED(hr)) + goto done; + hr = IFilterGraph2_QueryInterface(graph, &IID_IMediaControl, (void **)&control); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + if (FAILED(hr)) + goto done; + + hr = IFilterGraph2_AddFilter(graph, &testsource.filter.IBaseFilter_iface, L"source"); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + if (FAILED(hr)) + goto done; + hr = IFilterGraph2_AddFilter(graph, &testsink.filter.IBaseFilter_iface, L"sink"); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + if (FAILED(hr)) + goto done; + hr = IFilterGraph2_AddFilter(graph, filter, L"smarttee"); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + if (FAILED(hr)) + goto done; + + hr = IBaseFilter_FindPin(filter, L"Input", &sink); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + if (FAILED(hr)) + goto done; + hr = IBaseFilter_FindPin(filter, L"Preview", &preview); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + if (FAILED(hr)) + goto done; + hr = IPin_QueryInterface(sink, &IID_IMemInputPin, (void **)&input); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + if (FAILED(hr)) + goto done; + + hr = IFilterGraph2_ConnectDirect(graph, &testsource.source.pin.IPin_iface, sink, &req_mt); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + if (FAILED(hr)) + goto done; + + hr = IPin_EnumMediaTypes(preview, &enummt); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + if (FAILED(hr)) + goto done; + hr = IEnumMediaTypes_Next(enummt, 1, &pmt, NULL); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + if (FAILED(hr)) + goto done; + todo_wine ok(compare_media_types(pmt, &req_mt), "Media types didn't match.\n"); + DeleteMediaType(pmt); + pmt = NULL; + hr = IEnumMediaTypes_Next(enummt, 1, &pmt, NULL); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + if (FAILED(hr)) + goto done; + ok(compare_media_types(pmt, &req_mt), "Media types didn't match.\n"); + DeleteMediaType(pmt); + pmt = NULL; + hr = IEnumMediaTypes_Next(enummt, 1, &pmt, NULL); + ok(hr == S_FALSE, "Got hr %#lx.\n", hr); + IEnumMediaTypes_Release(enummt); + enummt = NULL; + + hr = IPin_QueryAccept(preview, &preview_mt); + todo_wine ok(hr == S_FALSE, "Got hr %#lx.\n", hr); + + hr = IFilterGraph2_ConnectDirect(graph, preview, &testsink.sink.pin.IPin_iface, &preview_mt); + todo_wine ok(hr == VFW_E_TYPE_NOT_ACCEPTED, "Got hr %#lx.\n", hr); + if (hr != S_OK) + goto done; + + ok(!!testsink.sink.pAllocator, "Expected preview allocator.\n"); + if (!testsink.sink.pAllocator) + goto done; + hr = IMemAllocator_GetProperties(testsink.sink.pAllocator, &props); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + if (FAILED(hr)) + goto done; + ok(props.cbBuffer == sizeof(output_data), "Got cbBuffer %ld.\n", props.cbBuffer); + + hr = IMediaControl_Pause(control); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + if (FAILED(hr)) + goto done; + + hr = IMemInputPin_GetAllocator(input, &allocator); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + if (FAILED(hr)) + goto done; + hr = IMemAllocator_GetBuffer(allocator, &sample, NULL, NULL, 0); + if (hr == VFW_E_NOT_COMMITTED) + { + hr = IMemAllocator_Commit(allocator); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + hr = IMemAllocator_GetBuffer(allocator, &sample, NULL, NULL, 0); + } + ok(hr == S_OK, "Got hr %#lx.\n", hr); + if (FAILED(hr)) + goto done; + + hr = IMediaSample_GetPointer(sample, &data); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + if (FAILED(hr)) + goto done; + memcpy(data, input_data, sizeof(input_data)); + hr = IMediaSample_SetActualDataLength(sample, sizeof(input_data)); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + + start = 10000; + stop = 20000; + hr = IMediaSample_SetMediaTime(sample, &start, &stop); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + + hr = IMediaSample_SetDiscontinuity(sample, TRUE); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + hr = IMediaSample_SetPreroll(sample, TRUE); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + hr = IMediaSample_SetSyncPoint(sample, TRUE); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + + hr = IMemInputPin_Receive(input, sample); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + ok(!WaitForSingleObject(testsink.sample_event, 1000), "Wait timed out.\n"); + +done: + if (pmt) + DeleteMediaType(pmt); + if (enummt) + IEnumMediaTypes_Release(enummt); + if (sample) + IMediaSample_Release(sample); + if (allocator) + IMemAllocator_Release(allocator); + if (input) + IMemInputPin_Release(input); + if (preview) + IPin_Release(preview); + if (sink) + IPin_Release(sink); + if (control) + IMediaControl_Release(control); + if (graph) + { + ref = IFilterGraph2_Release(graph); + ok(!ref, "Got outstanding refcount %ld.\n", ref); + } + if (filter) + { + ref = IBaseFilter_Release(filter); + ok(!ref, "Got outstanding refcount %ld.\n", ref); + } + ref = IBaseFilter_Release(&testsource.filter.IBaseFilter_iface); + ok(!ref, "Got outstanding refcount %ld.\n", ref); + ref = IBaseFilter_Release(&testsink.filter.IBaseFilter_iface); + ok(!ref, "Got outstanding refcount %ld.\n", ref); +} + START_TEST(smartteefilter) { CoInitialize(NULL); @@ -1411,6 +1670,7 @@ START_TEST(smartteefilter) test_unconnected_filter_state(); test_connect_pin(); test_streaming(); + test_preview_rgb32_connection(); CloseHandle(event); CoUninitialize(); -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/10269
From: zhineng cao <czn0601@qq.com> --- dlls/qcap/tests/videocapture.c | 22 ++++++++++++++++++++++ dlls/qcap/v4l.c | 2 ++ 2 files changed, 24 insertions(+) diff --git a/dlls/qcap/tests/videocapture.c b/dlls/qcap/tests/videocapture.c index 13fd45b618c..7902d406e46 100644 --- a/dlls/qcap/tests/videocapture.c +++ b/dlls/qcap/tests/videocapture.c @@ -23,6 +23,7 @@ #include "dshow.h" #include "wine/test.h" #include "wine/strmbase.h" +#include <dvdmedia.h> static BOOL compare_media_types(const AM_MEDIA_TYPE *a, const AM_MEDIA_TYPE *b) { @@ -30,6 +31,22 @@ static BOOL compare_media_types(const AM_MEDIA_TYPE *a, const AM_MEDIA_TYPE *b) && !memcmp(a->pbFormat, b->pbFormat, a->cbFormat); } +static void check_stream_media_type(const AM_MEDIA_TYPE *format) +{ + ok(!format->pUnk, "Expected NULL pUnk, got %p.\n", format->pUnk); + + if (IsEqualGUID(&format->formattype, &FORMAT_VideoInfo)) + { + ok(format->cbFormat >= sizeof(VIDEOINFOHEADER), "Got cbFormat %lu.\n", format->cbFormat); + ok(!!format->pbFormat, "Expected format block.\n"); + } + else if (IsEqualGUID(&format->formattype, &FORMAT_VideoInfo2)) + { + ok(format->cbFormat == sizeof(VIDEOINFOHEADER2), "Got cbFormat %lu.\n", format->cbFormat); + ok(!!format->pbFormat, "Expected format block.\n"); + } +} + #define check_interface(a, b, c) check_interface_(__LINE__, a, b, c) static void check_interface_(unsigned int line, void *iface_ptr, REFIID iid, BOOL supported) { @@ -117,6 +134,7 @@ static void test_stream_config(IPin *pin) hr = IAMStreamConfig_GetFormat(stream_config, &format); ok(hr == S_OK, "Got hr %#lx.\n", hr); + check_stream_media_type(format); ok(IsEqualGUID(&format->majortype, &MEDIATYPE_Video), "Got wrong majortype: %s.\n", debugstr_guid(&format->majortype)); @@ -155,6 +173,7 @@ static void test_stream_config(IPin *pin) hr = IAMStreamConfig_GetFormat(stream_config, &format2); ok(hr == S_OK, "Got hr %#lx.\n", hr); + check_stream_media_type(format2); ok(IsEqualGUID(&format2->majortype, &MEDIATYPE_Video), "Got wrong majortype: %s.\n", debugstr_guid(&format2->majortype)); video_info2 = (VIDEOINFOHEADER *)format2->pbFormat; @@ -203,6 +222,7 @@ static void test_stream_config(IPin *pin) { hr = IAMStreamConfig_GetStreamCaps(stream_config, i, &format, (BYTE *)&vscc); ok(hr == S_OK, "Got hr %#lx.\n", hr); + check_stream_media_type(format); for (unsigned int j = 0; j < ARRAY_SIZE(formats); ++j) { @@ -217,6 +237,7 @@ static void test_stream_config(IPin *pin) { hr = IAMStreamConfig_GetStreamCaps(stream_config, i, &format, (BYTE *)&vscc); ok(hr == S_OK, "Got hr %#lx.\n", hr); + check_stream_media_type(format); ok(IsEqualGUID(&format->majortype, &MEDIATYPE_Video), "Got wrong majortype: %s.\n", debugstr_guid(&MEDIATYPE_Video)); ok(IsEqualGUID(&vscc.guid, &FORMAT_VideoInfo) @@ -228,6 +249,7 @@ static void test_stream_config(IPin *pin) hr = IAMStreamConfig_GetFormat(stream_config, &format2); ok(hr == S_OK, "Got hr %#lx.\n", hr); + check_stream_media_type(format2); ok(compare_media_types(format, format2), "Media types didn't match.\n"); DeleteMediaType(format2); diff --git a/dlls/qcap/v4l.c b/dlls/qcap/v4l.c index a963372b7bf..04f61b8babb 100644 --- a/dlls/qcap/v4l.c +++ b/dlls/qcap/v4l.c @@ -698,6 +698,8 @@ static void put_media_type( const AM_MEDIA_TYPE *mt, struct am_media_type32 *mt3 mt32->bTemporalCompression = mt->bTemporalCompression; mt32->lSampleSize = mt->lSampleSize; mt32->formattype = mt->formattype; + mt32->pUnk = 0; + mt32->cbFormat = mt->cbFormat; } static NTSTATUS wow64_v4l_device_create( void *args ) -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/10269
This merge request was closed by zhineng cao. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/10269
It seems there are still some issues to fix, and the merge request will be reinitiated after the subsequent modifications are completed -- https://gitlab.winehq.org/wine/wine/-/merge_requests/10269#note_131594
participants (2)
-
zhineng cao -
zhineng cao (＠LilFishyChan)