Zebediah Figura : winegstreamer: Implement IPin::QueryAccept() for the AVI splitter source.
Alexandre Julliard
julliard at winehq.org
Mon Jan 27 15:00:16 CST 2020
Module: wine
Branch: master
Commit: 0401213770ee6efa6ac522c6d64867d930d66a57
URL: https://source.winehq.org/git/wine.git/?a=commit;h=0401213770ee6efa6ac522c6d64867d930d66a57
Author: Zebediah Figura <z.figura12 at gmail.com>
Date: Fri Jan 24 19:55:06 2020 -0600
winegstreamer: Implement IPin::QueryAccept() for the AVI splitter source.
Signed-off-by: Zebediah Figura <z.figura12 at gmail.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/quartz/tests/avisplit.c | 16 ++++++++--------
dlls/winegstreamer/gstdemux.c | 2 +-
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/dlls/quartz/tests/avisplit.c b/dlls/quartz/tests/avisplit.c
index befcac404c..31cb767b60 100644
--- a/dlls/quartz/tests/avisplit.c
+++ b/dlls/quartz/tests/avisplit.c
@@ -621,42 +621,42 @@ static void test_media_types(void)
pmt->majortype = GUID_NULL;
hr = IPin_QueryAccept(pin, pmt);
- todo_wine ok(hr == S_FALSE, "Got hr %#x.\n", hr);
+ ok(hr == S_FALSE, "Got hr %#x.\n", hr);
pmt->majortype = MEDIATYPE_Video;
pmt->subtype = GUID_NULL;
hr = IPin_QueryAccept(pin, pmt);
- todo_wine ok(hr == S_FALSE, "Got hr %#x.\n", hr);
+ ok(hr == S_FALSE, "Got hr %#x.\n", hr);
pmt->subtype = MEDIASUBTYPE_I420;
pmt->formattype = GUID_NULL;
hr = IPin_QueryAccept(pin, pmt);
- todo_wine ok(hr == S_FALSE, "Got hr %#x.\n", hr);
+ ok(hr == S_FALSE, "Got hr %#x.\n", hr);
pmt->formattype = FORMAT_None;
hr = IPin_QueryAccept(pin, pmt);
- todo_wine ok(hr == S_FALSE, "Got hr %#x.\n", hr);
+ ok(hr == S_FALSE, "Got hr %#x.\n", hr);
pmt->formattype = FORMAT_VideoInfo;
vih = (VIDEOINFOHEADER *)pmt->pbFormat;
vih->AvgTimePerFrame = 10000;
hr = IPin_QueryAccept(pin, pmt);
- todo_wine ok(hr == S_FALSE, "Got hr %#x.\n", hr);
+ ok(hr == S_FALSE, "Got hr %#x.\n", hr);
vih->AvgTimePerFrame = 1000 * 10000;
vih->dwBitRate = 1000000;
hr = IPin_QueryAccept(pin, pmt);
- todo_wine ok(hr == S_FALSE, "Got hr %#x.\n", hr);
+ ok(hr == S_FALSE, "Got hr %#x.\n", hr);
vih->dwBitRate = 0;
SetRect(&vih->rcSource, 0, 0, 32, 24);
hr = IPin_QueryAccept(pin, pmt);
- todo_wine ok(hr == S_FALSE, "Got hr %#x.\n", hr);
+ ok(hr == S_FALSE, "Got hr %#x.\n", hr);
SetRect(&vih->rcSource, 0, 0, 0, 0);
vih->bmiHeader.biCompression = BI_RGB;
hr = IPin_QueryAccept(pin, pmt);
- todo_wine ok(hr == S_FALSE, "Got hr %#x.\n", hr);
+ ok(hr == S_FALSE, "Got hr %#x.\n", hr);
vih->bmiHeader.biCompression = mmioFOURCC('I','4','2','0');
CoTaskMemFree(pmt->pbFormat);
diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c
index dadad69beb..81a0617e56 100644
--- a/dlls/winegstreamer/gstdemux.c
+++ b/dlls/winegstreamer/gstdemux.c
@@ -2377,7 +2377,7 @@ static BOOL avi_splitter_init_gst(struct gstdemux *filter)
static HRESULT avi_splitter_source_query_accept(struct gstdemux_source *pin, const AM_MEDIA_TYPE *mt)
{
- return S_OK;
+ return compare_media_types(mt, &pin->mt) ? S_OK : S_FALSE;
}
IUnknown * CALLBACK avi_splitter_create(IUnknown *outer, HRESULT *phr)
More information about the wine-cvs
mailing list