Zebediah Figura : qedit/samplegrabber: Correctly implement sample_grabber_source_get_media_type().
Alexandre Julliard
julliard at winehq.org
Mon Feb 10 16:32:44 CST 2020
Module: wine
Branch: master
Commit: 114b99fba9c915b135562acb89c58d675d1fa0ee
URL: https://source.winehq.org/git/wine.git/?a=commit;h=114b99fba9c915b135562acb89c58d675d1fa0ee
Author: Zebediah Figura <z.figura12 at gmail.com>
Date: Fri Feb 7 23:51:54 2020 -0600
qedit/samplegrabber: Correctly implement sample_grabber_source_get_media_type().
Signed-off-by: Zebediah Figura <z.figura12 at gmail.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/qedit/samplegrabber.c | 18 ++++++++-
dlls/qedit/tests/samplegrabber.c | 81 +++++++++++++++++++++-------------------
2 files changed, 58 insertions(+), 41 deletions(-)
diff --git a/dlls/qedit/samplegrabber.c b/dlls/qedit/samplegrabber.c
index 696053b1d5..4e9d5157cf 100644
--- a/dlls/qedit/samplegrabber.c
+++ b/dlls/qedit/samplegrabber.c
@@ -576,12 +576,26 @@ static HRESULT sample_grabber_source_get_media_type(struct strmbase_pin *iface,
unsigned int index, AM_MEDIA_TYPE *mt)
{
SG_Impl *filter = impl_from_source_pin(iface);
+ IEnumMediaTypes *enummt;
+ AM_MEDIA_TYPE *pmt;
+ HRESULT hr;
- if (!index)
+ if (!filter->sink.pin.peer)
+ return VFW_E_NOT_CONNECTED;
+
+ if (FAILED(hr = IPin_EnumMediaTypes(filter->sink.pin.peer, &enummt)))
+ return hr;
+
+ if ((!index || IEnumMediaTypes_Skip(enummt, index) == S_OK)
+ && IEnumMediaTypes_Next(enummt, 1, &pmt, NULL) == S_OK)
{
- CopyMediaType(mt, &filter->filter_mt);
+ CopyMediaType(mt, pmt);
+ DeleteMediaType(pmt);
+ IEnumMediaTypes_Release(enummt);
return S_OK;
}
+
+ IEnumMediaTypes_Release(enummt);
return VFW_S_NO_MORE_ITEMS;
}
diff --git a/dlls/qedit/tests/samplegrabber.c b/dlls/qedit/tests/samplegrabber.c
index e8ab1073fb..6c084d3a49 100644
--- a/dlls/qedit/tests/samplegrabber.c
+++ b/dlls/qedit/tests/samplegrabber.c
@@ -486,8 +486,7 @@ static void test_media_types(void)
if (hr == S_OK) IEnumMediaTypes_Release(enummt);
hr = IPin_EnumMediaTypes(source, &enummt);
- todo_wine ok(hr == VFW_E_NOT_CONNECTED, "Got hr %#x.\n", hr);
- if (hr == S_OK) IEnumMediaTypes_Release(enummt);
+ ok(hr == VFW_E_NOT_CONNECTED, "Got hr %#x.\n", hr);
hr = IPin_QueryAccept(sink, &mt);
ok(hr == S_OK, "Got hr %#x.\n", hr);
@@ -502,8 +501,7 @@ static void test_media_types(void)
if (hr == S_OK) IEnumMediaTypes_Release(enummt);
hr = IPin_EnumMediaTypes(source, &enummt);
- todo_wine ok(hr == VFW_E_NOT_CONNECTED, "Got hr %#x.\n", hr);
- if (hr == S_OK) IEnumMediaTypes_Release(enummt);
+ ok(hr == VFW_E_NOT_CONNECTED, "Got hr %#x.\n", hr);
hr = IPin_QueryAccept(sink, &mt);
ok(hr == S_OK, "Got hr %#x.\n", hr);
@@ -832,7 +830,7 @@ static void test_connect_pin(void)
ok(hr == S_OK, "Got hr %#x.\n", hr);
hr = IEnumMediaTypes_Next(enummt, 1, &pmt, NULL);
ok(hr == S_OK, "Got hr %#x.\n", hr);
- todo_wine ok(compare_media_types(pmt, &testsource.source_mt), "Media types didn't match.\n");
+ ok(compare_media_types(pmt, &testsource.source_mt), "Media types didn't match.\n");
IEnumMediaTypes_Release(enummt);
req_mt.majortype = MEDIATYPE_Video;
@@ -912,24 +910,18 @@ static void test_connect_pin(void)
testsource.source_mt.bTemporalCompression = TRUE;
hr = IFilterGraph2_ConnectDirect(graph, source, &testsink.sink.pin.IPin_iface, NULL);
- todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr);
- if (hr == S_OK)
- {
- ok(compare_media_types(&testsink.sink.pin.mt, &testsource.source_mt), "Media types didn't match.\n");
- ok(compare_media_types(&testsource.source.pin.mt, &testsink.sink.pin.mt), "Media types didn't match.\n");
- }
+ ok(hr == S_OK, "Got hr %#x.\n", hr);
+ ok(compare_media_types(&testsink.sink.pin.mt, &testsource.source_mt), "Media types didn't match.\n");
+ todo_wine ok(compare_media_types(&testsource.source.pin.mt, &testsink.sink.pin.mt), "Media types didn't match.\n");
IFilterGraph2_Disconnect(graph, source);
IFilterGraph2_Disconnect(graph, &testsink.sink.pin.IPin_iface);
req_mt.majortype = GUID_NULL;
req_mt.bTemporalCompression = FALSE;
hr = IFilterGraph2_ConnectDirect(graph, source, &testsink.sink.pin.IPin_iface, &req_mt);
- todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr);
- if (hr == S_OK)
- {
- ok(compare_media_types(&testsink.sink.pin.mt, &testsource.source_mt), "Media types didn't match.\n");
- ok(compare_media_types(&testsource.source.pin.mt, &testsink.sink.pin.mt), "Media types didn't match.\n");
- }
+ ok(hr == S_OK, "Got hr %#x.\n", hr);
+ ok(compare_media_types(&testsink.sink.pin.mt, &testsource.source_mt), "Media types didn't match.\n");
+ todo_wine ok(compare_media_types(&testsource.source.pin.mt, &testsink.sink.pin.mt), "Media types didn't match.\n");
IFilterGraph2_Disconnect(graph, source);
IFilterGraph2_Disconnect(graph, &testsink.sink.pin.IPin_iface);
@@ -939,18 +931,20 @@ static void test_connect_pin(void)
req_mt.subtype = GUID_NULL;
hr = IFilterGraph2_ConnectDirect(graph, source, &testsink.sink.pin.IPin_iface, &req_mt);
- todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr);
- if (hr == S_OK)
- {
- ok(compare_media_types(&testsink.sink.pin.mt, &testsource.source_mt), "Media types didn't match.\n");
- ok(compare_media_types(&testsource.source.pin.mt, &testsink.sink.pin.mt), "Media types didn't match.\n");
- }
+ ok(hr == S_OK, "Got hr %#x.\n", hr);
+ ok(compare_media_types(&testsink.sink.pin.mt, &testsource.source_mt), "Media types didn't match.\n");
+ todo_wine ok(compare_media_types(&testsource.source.pin.mt, &testsink.sink.pin.mt), "Media types didn't match.\n");
IFilterGraph2_Disconnect(graph, source);
IFilterGraph2_Disconnect(graph, &testsink.sink.pin.IPin_iface);
req_mt.formattype = FORMAT_None;
hr = IFilterGraph2_ConnectDirect(graph, source, &testsink.sink.pin.IPin_iface, &req_mt);
- ok(hr == VFW_E_NO_ACCEPTABLE_TYPES, "Got hr %#x.\n", hr);
+ todo_wine ok(hr == VFW_E_NO_ACCEPTABLE_TYPES, "Got hr %#x.\n", hr);
+ if (hr == S_OK)
+ {
+ IFilterGraph2_Disconnect(graph, source);
+ IFilterGraph2_Disconnect(graph, &testsink.sink.pin.IPin_iface);
+ }
req_mt.majortype = MEDIATYPE_Video;
req_mt.subtype = MEDIASUBTYPE_RGB8;
@@ -971,12 +965,9 @@ static void test_connect_pin(void)
req_mt.subtype = GUID_NULL;
hr = IFilterGraph2_ConnectDirect(graph, source, &testsink.sink.pin.IPin_iface, &req_mt);
- todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr);
- if (hr == S_OK)
- {
- ok(compare_media_types(&testsink.sink.pin.mt, &testsource.source_mt), "Media types didn't match.\n");
- ok(compare_media_types(&testsource.source.pin.mt, &testsink.sink.pin.mt), "Media types didn't match.\n");
- }
+ ok(hr == S_OK, "Got hr %#x.\n", hr);
+ ok(compare_media_types(&testsink.sink.pin.mt, &testsource.source_mt), "Media types didn't match.\n");
+ todo_wine ok(compare_media_types(&testsource.source.pin.mt, &testsink.sink.pin.mt), "Media types didn't match.\n");
IFilterGraph2_Disconnect(graph, source);
IFilterGraph2_Disconnect(graph, &testsink.sink.pin.IPin_iface);
@@ -987,28 +978,40 @@ static void test_connect_pin(void)
testsource.source_mt.majortype = testsource.source_mt.subtype = testsource.source_mt.formattype = GUID_NULL;
req_mt.majortype = req_mt.subtype = req_mt.formattype = GUID_NULL;
hr = IFilterGraph2_ConnectDirect(graph, source, &testsink.sink.pin.IPin_iface, &req_mt);
- todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr);
- if (hr == S_OK)
- {
- ok(compare_media_types(&testsink.sink.pin.mt, &testsource.source_mt), "Media types didn't match.\n");
- ok(compare_media_types(&testsource.source.pin.mt, &testsink.sink.pin.mt), "Media types didn't match.\n");
- }
+ ok(hr == S_OK, "Got hr %#x.\n", hr);
+ ok(compare_media_types(&testsink.sink.pin.mt, &testsource.source_mt), "Media types didn't match.\n");
+ todo_wine ok(compare_media_types(&testsource.source.pin.mt, &testsink.sink.pin.mt), "Media types didn't match.\n");
IFilterGraph2_Disconnect(graph, source);
IFilterGraph2_Disconnect(graph, &testsink.sink.pin.IPin_iface);
req_mt.majortype = MEDIATYPE_Video;
hr = IFilterGraph2_ConnectDirect(graph, source, &testsink.sink.pin.IPin_iface, &req_mt);
- ok(hr == VFW_E_NO_ACCEPTABLE_TYPES, "Got hr %#x.\n", hr);
+ todo_wine ok(hr == VFW_E_NO_ACCEPTABLE_TYPES, "Got hr %#x.\n", hr);
+ if (hr == S_OK)
+ {
+ IFilterGraph2_Disconnect(graph, source);
+ IFilterGraph2_Disconnect(graph, &testsink.sink.pin.IPin_iface);
+ }
req_mt.majortype = GUID_NULL;
req_mt.subtype = MEDIASUBTYPE_RGB8;
hr = IFilterGraph2_ConnectDirect(graph, source, &testsink.sink.pin.IPin_iface, &req_mt);
- ok(hr == VFW_E_NO_ACCEPTABLE_TYPES, "Got hr %#x.\n", hr);
+ todo_wine ok(hr == VFW_E_NO_ACCEPTABLE_TYPES, "Got hr %#x.\n", hr);
+ if (hr == S_OK)
+ {
+ IFilterGraph2_Disconnect(graph, source);
+ IFilterGraph2_Disconnect(graph, &testsink.sink.pin.IPin_iface);
+ }
req_mt.subtype = GUID_NULL;
req_mt.formattype = FORMAT_None;
hr = IFilterGraph2_ConnectDirect(graph, source, &testsink.sink.pin.IPin_iface, &req_mt);
- ok(hr == VFW_E_NO_ACCEPTABLE_TYPES, "Got hr %#x.\n", hr);
+ todo_wine ok(hr == VFW_E_NO_ACCEPTABLE_TYPES, "Got hr %#x.\n", hr);
+ if (hr == S_OK)
+ {
+ IFilterGraph2_Disconnect(graph, source);
+ IFilterGraph2_Disconnect(graph, &testsink.sink.pin.IPin_iface);
+ }
req_mt.formattype = GUID_NULL;
testsink.sink_mt = &req_mt;
More information about the wine-cvs
mailing list