Signed-off-by: Zebediah Figura zfigura@codeweavers.com --- dlls/qedit/samplegrabber.c | 64 ++++++++++++-------------------- dlls/qedit/tests/samplegrabber.c | 12 +++--- 2 files changed, 30 insertions(+), 46 deletions(-)
diff --git a/dlls/qedit/samplegrabber.c b/dlls/qedit/samplegrabber.c index 10e85dfc37f..ad458cbaa14 100644 --- a/dlls/qedit/samplegrabber.c +++ b/dlls/qedit/samplegrabber.c @@ -480,9 +480,31 @@ static HRESULT sample_grabber_sink_query_interface(struct strmbase_pin *iface, R return S_OK; }
+static BOOL check_filter_mt(SG_Impl *filter, const AM_MEDIA_TYPE *mt) +{ + if (IsEqualGUID(&filter->filter_mt.majortype, &GUID_NULL)) + return TRUE; + if (!IsEqualGUID(&filter->filter_mt.majortype, &mt->majortype)) + return FALSE; + + if (IsEqualGUID(&filter->filter_mt.subtype, &GUID_NULL)) + return TRUE; + if (!IsEqualGUID(&filter->filter_mt.subtype, &mt->subtype)) + return FALSE; + + if (IsEqualGUID(&filter->filter_mt.formattype, &GUID_NULL)) + return TRUE; + if (!IsEqualGUID(&filter->filter_mt.formattype, &mt->formattype)) + return FALSE; + + return TRUE; +} + static HRESULT sample_grabber_sink_query_accept(struct strmbase_pin *iface, const AM_MEDIA_TYPE *mt) { - return S_OK; + SG_Impl *filter = impl_from_sink_pin(iface); + + return check_filter_mt(filter, mt) ? S_OK : S_FALSE; }
static HRESULT sample_grabber_sink_get_media_type(struct strmbase_pin *iface, @@ -498,32 +520,11 @@ static HRESULT sample_grabber_sink_get_media_type(struct strmbase_pin *iface, return VFW_S_NO_MORE_ITEMS; }
-static HRESULT sample_grabber_sink_connect(struct strmbase_sink *iface, - IPin *peer, const AM_MEDIA_TYPE *mt) -{ - SG_Impl *filter = impl_from_sink_pin(&iface->pin); - - if (!IsEqualGUID(&filter->filter_mt.majortype, &GUID_NULL) - && !IsEqualGUID(&filter->filter_mt.majortype, &mt->majortype)) - return VFW_E_TYPE_NOT_ACCEPTED; - - if (!IsEqualGUID(&filter->filter_mt.subtype, &GUID_NULL) - && !IsEqualGUID(&filter->filter_mt.subtype, &mt->subtype)) - return VFW_E_TYPE_NOT_ACCEPTED; - - if (!IsEqualGUID(&filter->filter_mt.formattype, &GUID_NULL) - && !IsEqualGUID(&filter->filter_mt.formattype, &mt->formattype)) - return VFW_E_TYPE_NOT_ACCEPTED; - - return S_OK; -} - static const struct strmbase_sink_ops sink_ops = { .base.pin_query_interface = sample_grabber_sink_query_interface, .base.pin_query_accept = sample_grabber_sink_query_accept, .base.pin_get_media_type = sample_grabber_sink_get_media_type, - .sink_connect = sample_grabber_sink_connect, };
static inline SG_Impl *impl_from_source_pin(struct strmbase_pin *iface) @@ -548,24 +549,7 @@ static HRESULT sample_grabber_source_query_accept(struct strmbase_pin *iface, co if (filter->sink.pin.peer && IPin_QueryAccept(filter->sink.pin.peer, mt) != S_OK) return S_FALSE;
- strmbase_dump_media_type(&filter->filter_mt); - - if (IsEqualGUID(&filter->filter_mt.majortype, &GUID_NULL)) - return S_OK; - if (!IsEqualGUID(&filter->filter_mt.majortype, &mt->majortype)) - return S_FALSE; - - if (IsEqualGUID(&filter->filter_mt.subtype, &GUID_NULL)) - return S_OK; - if (!IsEqualGUID(&filter->filter_mt.subtype, &mt->subtype)) - return S_FALSE; - - if (IsEqualGUID(&filter->filter_mt.formattype, &GUID_NULL)) - return S_OK; - if (!IsEqualGUID(&filter->filter_mt.formattype, &mt->formattype)) - return S_FALSE; - - return S_OK; + return check_filter_mt(filter, mt) ? S_OK : S_FALSE; }
static HRESULT sample_grabber_source_get_media_type(struct strmbase_pin *iface, diff --git a/dlls/qedit/tests/samplegrabber.c b/dlls/qedit/tests/samplegrabber.c index 06db9d740e6..5436700d17d 100644 --- a/dlls/qedit/tests/samplegrabber.c +++ b/dlls/qedit/tests/samplegrabber.c @@ -513,13 +513,13 @@ static void test_media_types(void) hr = ISampleGrabber_SetMediaType(grabber, &match_mt); ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IPin_QueryAccept(sink, &mt); - todo_wine ok(hr == S_FALSE, "Got hr %#x.\n", hr); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); hr = IPin_QueryAccept(source, &mt); ok(hr == S_FALSE, "Got hr %#x.\n", hr);
mt.majortype = GUID_NULL; hr = IPin_QueryAccept(sink, &mt); - todo_wine ok(hr == S_FALSE, "Got hr %#x.\n", hr); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); hr = IPin_QueryAccept(source, &mt); ok(hr == S_FALSE, "Got hr %#x.\n", hr); mt.majortype = match_mt.majortype; @@ -533,13 +533,13 @@ static void test_media_types(void) hr = ISampleGrabber_SetMediaType(grabber, &match_mt); ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IPin_QueryAccept(sink, &mt); - todo_wine ok(hr == S_FALSE, "Got hr %#x.\n", hr); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); hr = IPin_QueryAccept(source, &mt); ok(hr == S_FALSE, "Got hr %#x.\n", hr);
mt.subtype = GUID_NULL; hr = IPin_QueryAccept(sink, &mt); - todo_wine ok(hr == S_FALSE, "Got hr %#x.\n", hr); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); hr = IPin_QueryAccept(source, &mt); ok(hr == S_FALSE, "Got hr %#x.\n", hr); mt.subtype = match_mt.subtype; @@ -552,13 +552,13 @@ static void test_media_types(void) hr = ISampleGrabber_SetMediaType(grabber, &match_mt); ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IPin_QueryAccept(sink, &mt); - todo_wine ok(hr == S_FALSE, "Got hr %#x.\n", hr); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); hr = IPin_QueryAccept(source, &mt); ok(hr == S_FALSE, "Got hr %#x.\n", hr);
mt.formattype = GUID_NULL; hr = IPin_QueryAccept(sink, &mt); - todo_wine ok(hr == S_FALSE, "Got hr %#x.\n", hr); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); hr = IPin_QueryAccept(source, &mt); ok(hr == S_FALSE, "Got hr %#x.\n", hr); mt.formattype = match_mt.formattype;