winegstreamer: Implement IPin::QueryAccept() for the AVI splitter source.

Signed-off-by: Zebediah Figura <z.figura12@gmail.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

winegstreamer: Implement IPin::QueryAccept() for the AVI splitter source.
04012137 · Zebediah Figura · Alexandre Julliard · 533acfb1 · 04012137 · 04012137
Commit 04012137 authored Jan 24, 2020 by Zebediah Figura Committed by Alexandre Julliard Jan 27, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 9 deletions

avisplit.c dlls/quartz/tests/avisplit.c +8 -8

gstdemux.c dlls/winegstreamer/gstdemux.c +1 -1

No files found.
--- 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);

--- 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)