Nikolay Sivov : mf/evr: Return sink flags.
Alexandre Julliard
julliard at winehq.org
Mon Jul 6 16:20:46 CDT 2020
Module: wine
Branch: master
Commit: 1f2cf87def23b2298df2531f9842c5fba3723596
URL: https://source.winehq.org/git/wine.git/?a=commit;h=1f2cf87def23b2298df2531f9842c5fba3723596
Author: Nikolay Sivov <nsivov at codeweavers.com>
Date: Mon Jul 6 18:08:28 2020 +0300
mf/evr: Return sink flags.
Signed-off-by: Nikolay Sivov <nsivov at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/mf/evr.c | 6 ++++--
dlls/mf/tests/mf.c | 4 +---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/dlls/mf/evr.c b/dlls/mf/evr.c
index 2ac85fab79..a5a39fe778 100644
--- a/dlls/mf/evr.c
+++ b/dlls/mf/evr.c
@@ -91,9 +91,11 @@ static ULONG WINAPI video_renderer_sink_Release(IMFMediaSink *iface)
static HRESULT WINAPI video_renderer_sink_GetCharacteristics(IMFMediaSink *iface, DWORD *flags)
{
- FIXME("%p, %p.\n", iface, flags);
+ TRACE("%p, %p.\n", iface, flags);
- return E_NOTIMPL;
+ *flags = MEDIASINK_CLOCK_REQUIRED | MEDIASINK_CAN_PREROLL;
+
+ return S_OK;
}
static HRESULT WINAPI video_renderer_sink_AddStreamSink(IMFMediaSink *iface, DWORD stream_sink_id,
diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c
index 44d69a7a8c..c274c3263d 100644
--- a/dlls/mf/tests/mf.c
+++ b/dlls/mf/tests/mf.c
@@ -3253,12 +3253,10 @@ static void test_evr(void)
hr = IMFActivate_ActivateObject(activate, &IID_IMFMediaSink, (void **)&sink);
ok(hr == S_OK, "Failed to activate, hr %#x.\n", hr);
- flags = 0;
hr = IMFMediaSink_GetCharacteristics(sink, &flags);
-todo_wine {
ok(hr == S_OK, "Unexpected hr %#x.\n", hr);
ok(flags == (MEDIASINK_CAN_PREROLL | MEDIASINK_CLOCK_REQUIRED), "Unexpected flags %#x.\n", flags);
-}
+
hr = IMFMediaSink_QueryInterface(sink, &IID_IMFMediaSinkPreroll, (void **)&preroll);
ok(hr == S_OK, "Unexpected hr %#x.\n", hr);
IMFMediaSinkPreroll_Release(preroll);
More information about the wine-cvs
mailing list