[PATCH 2/5] mf: Add a sink stub for EVR.
Nikolay Sivov
nsivov at codeweavers.com
Mon Jul 6 10:08:26 CDT 2020
Signed-off-by: Nikolay Sivov <nsivov at codeweavers.com>
---
dlls/mf/Makefile.in | 1 +
dlls/mf/evr.c | 218 ++++++++++++++++++++++++++++++++++++++++++++
dlls/mf/main.c | 38 --------
dlls/mf/tests/mf.c | 9 +-
4 files changed, 224 insertions(+), 42 deletions(-)
create mode 100644 dlls/mf/evr.c
diff --git a/dlls/mf/Makefile.in b/dlls/mf/Makefile.in
index fe156e43abf..1d2bfc8a782 100644
--- a/dlls/mf/Makefile.in
+++ b/dlls/mf/Makefile.in
@@ -5,6 +5,7 @@ IMPORTS = advapi32 mfplat ole32 uuid mfuuid
EXTRADLLFLAGS = -mno-cygwin
C_SRCS = \
+ evr.c \
main.c \
samplegrabber.c \
sar.c \
diff --git a/dlls/mf/evr.c b/dlls/mf/evr.c
new file mode 100644
index 00000000000..27238339031
--- /dev/null
+++ b/dlls/mf/evr.c
@@ -0,0 +1,218 @@
+/*
+ * Copyright 2020 Nikolay Sivov for CodeWeavers
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+#define COBJMACROS
+
+#include "mf_private.h"
+
+WINE_DEFAULT_DEBUG_CHANNEL(mfplat);
+
+struct video_renderer
+{
+ IMFMediaSink IMFMediaSink_iface;
+ LONG refcount;
+};
+
+static struct video_renderer *impl_from_IMFMediaSink(IMFMediaSink *iface)
+{
+ return CONTAINING_RECORD(iface, struct video_renderer, IMFMediaSink_iface);
+}
+
+static HRESULT WINAPI video_renderer_sink_QueryInterface(IMFMediaSink *iface, REFIID riid, void **obj)
+{
+ TRACE("%p, %s, %p.\n", iface, debugstr_guid(riid), obj);
+
+ if (IsEqualIID(riid, &IID_IMFMediaSink) ||
+ IsEqualIID(riid, &IID_IUnknown))
+ {
+ *obj = iface;
+ }
+ else
+ {
+ WARN("Unsupported interface %s.\n", debugstr_guid(riid));
+ *obj = NULL;
+ return E_NOINTERFACE;
+ }
+
+ IUnknown_AddRef((IUnknown *)*obj);
+
+ return S_OK;
+}
+
+static ULONG WINAPI video_renderer_sink_AddRef(IMFMediaSink *iface)
+{
+ struct video_renderer *renderer = impl_from_IMFMediaSink(iface);
+ ULONG refcount = InterlockedIncrement(&renderer->refcount);
+ TRACE("%p, refcount %u.\n", iface, refcount);
+ return refcount;
+}
+
+static ULONG WINAPI video_renderer_sink_Release(IMFMediaSink *iface)
+{
+ struct video_renderer *renderer = impl_from_IMFMediaSink(iface);
+ ULONG refcount = InterlockedDecrement(&renderer->refcount);
+
+ TRACE("%p, refcount %u.\n", iface, refcount);
+
+ if (!refcount)
+ {
+ heap_free(renderer);
+ }
+
+ return refcount;
+}
+
+static HRESULT WINAPI video_renderer_sink_GetCharacteristics(IMFMediaSink *iface, DWORD *flags)
+{
+ FIXME("%p, %p.\n", iface, flags);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI video_renderer_sink_AddStreamSink(IMFMediaSink *iface, DWORD stream_sink_id,
+ IMFMediaType *media_type, IMFStreamSink **stream_sink)
+{
+ FIXME("%p, %#x, %p, %p.\n", iface, stream_sink_id, media_type, stream_sink);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI video_renderer_sink_RemoveStreamSink(IMFMediaSink *iface, DWORD stream_sink_id)
+{
+ FIXME("%p, %#x.\n", iface, stream_sink_id);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI video_renderer_sink_GetStreamSinkCount(IMFMediaSink *iface, DWORD *count)
+{
+ FIXME("%p, %p.\n", iface, count);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI video_renderer_sink_GetStreamSinkByIndex(IMFMediaSink *iface, DWORD index,
+ IMFStreamSink **stream)
+{
+ FIXME("%p, %u, %p.\n", iface, index, stream);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI video_renderer_sink_GetStreamSinkById(IMFMediaSink *iface, DWORD stream_sink_id,
+ IMFStreamSink **stream)
+{
+ FIXME("%p, %#x, %p.\n", iface, stream_sink_id, stream);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI video_renderer_sink_SetPresentationClock(IMFMediaSink *iface, IMFPresentationClock *clock)
+{
+ FIXME("%p, %p.\n", iface, clock);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI video_renderer_sink_GetPresentationClock(IMFMediaSink *iface, IMFPresentationClock **clock)
+{
+ FIXME("%p, %p.\n", iface, clock);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI video_renderer_sink_Shutdown(IMFMediaSink *iface)
+{
+ FIXME("%p.\n", iface);
+
+ return E_NOTIMPL;
+}
+
+static const IMFMediaSinkVtbl video_renderer_sink_vtbl =
+{
+ video_renderer_sink_QueryInterface,
+ video_renderer_sink_AddRef,
+ video_renderer_sink_Release,
+ video_renderer_sink_GetCharacteristics,
+ video_renderer_sink_AddStreamSink,
+ video_renderer_sink_RemoveStreamSink,
+ video_renderer_sink_GetStreamSinkCount,
+ video_renderer_sink_GetStreamSinkByIndex,
+ video_renderer_sink_GetStreamSinkById,
+ video_renderer_sink_SetPresentationClock,
+ video_renderer_sink_GetPresentationClock,
+ video_renderer_sink_Shutdown,
+};
+
+static HRESULT evr_create_object(IMFAttributes *attributes, void *user_context, IUnknown **obj)
+{
+ struct video_renderer *object;
+
+ TRACE("%p, %p, %p.\n", attributes, user_context, obj);
+
+ if (!(object = heap_alloc_zero(sizeof(*object))))
+ return E_OUTOFMEMORY;
+
+ object->IMFMediaSink_iface.lpVtbl = &video_renderer_sink_vtbl;
+ object->refcount = 1;
+
+ *obj = (IUnknown *)&object->IMFMediaSink_iface;
+
+ return S_OK;
+}
+
+static void evr_shutdown_object(void *user_context, IUnknown *obj)
+{
+ IMFMediaSink *sink;
+
+ if (SUCCEEDED(IUnknown_QueryInterface(obj, &IID_IMFMediaSink, (void **)&sink)))
+ {
+ IMFMediaSink_Shutdown(sink);
+ IMFMediaSink_Release(sink);
+ }
+}
+
+static void evr_free_private(void *user_context)
+{
+}
+
+static const struct activate_funcs evr_activate_funcs =
+{
+ evr_create_object,
+ evr_shutdown_object,
+ evr_free_private,
+};
+
+/***********************************************************************
+ * MFCreateVideoRendererActivate (mf.@)
+ */
+HRESULT WINAPI MFCreateVideoRendererActivate(HWND hwnd, IMFActivate **activate)
+{
+ HRESULT hr;
+
+ TRACE("%p, %p.\n", hwnd, activate);
+
+ if (!activate)
+ return E_POINTER;
+
+ hr = create_activation_object(hwnd, &evr_activate_funcs, activate);
+ if (SUCCEEDED(hr))
+ IMFActivate_SetUINT64(*activate, &MF_ACTIVATE_VIDEO_WINDOW, (ULONG_PTR)hwnd);
+
+ return hr;
+}
diff --git a/dlls/mf/main.c b/dlls/mf/main.c
index 3546caa6912..4d9f5a7ea39 100644
--- a/dlls/mf/main.c
+++ b/dlls/mf/main.c
@@ -1267,44 +1267,6 @@ HRESULT WINAPI MFEnumDeviceSources(IMFAttributes *attributes, IMFActivate ***sou
return S_OK;
}
-static HRESULT evr_create_object(IMFAttributes *attributes, void *user_context, IUnknown **obj)
-{
- FIXME("%p, %p, %p.\n", attributes, user_context, obj);
-
- return E_NOTIMPL;
-}
-
-static void evr_shutdown_object(void *user_context, IUnknown *obj)
-{
-}
-
-static void evr_free_private(void *user_context)
-{
-}
-
-static const struct activate_funcs evr_activate_funcs =
-{
- evr_create_object,
- evr_shutdown_object,
- evr_free_private,
-};
-
-HRESULT WINAPI MFCreateVideoRendererActivate(HWND hwnd, IMFActivate **activate)
-{
- HRESULT hr;
-
- TRACE("%p, %p.\n", hwnd, activate);
-
- if (!activate)
- return E_POINTER;
-
- hr = create_activation_object(hwnd, &evr_activate_funcs, activate);
- if (SUCCEEDED(hr))
- IMFActivate_SetUINT64(*activate, &MF_ACTIVATE_VIDEO_WINDOW, (ULONG_PTR)hwnd);
-
- return hr;
-}
-
struct simple_type_handler
{
IMFMediaTypeHandler IMFMediaTypeHandler_iface;
diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c
index d252bab9b3b..72444dd2482 100644
--- a/dlls/mf/tests/mf.c
+++ b/dlls/mf/tests/mf.c
@@ -3250,23 +3250,23 @@ static void test_evr(void)
ok(!value, "Unexpected value.\n");
hr = IMFActivate_ActivateObject(activate, &IID_IMFMediaSink, (void **)&sink);
-todo_wine
ok(hr == S_OK, "Failed to activate, hr %#x.\n", hr);
-if (hr == S_OK)
-{
hr = IMFMediaSink_GetCharacteristics(sink, &flags);
+todo_wine
ok(hr == S_OK, "Unexpected hr %#x.\n", hr);
hr = IMFActivate_ShutdownObject(activate);
ok(hr == S_OK, "Failed to shut down, hr %#x.\n", hr);
hr = IMFMediaSink_GetCharacteristics(sink, &flags);
+todo_wine
ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr);
/* Activate again. */
hr = IMFActivate_ActivateObject(activate, &IID_IMFMediaSink, (void **)&sink2);
ok(hr == S_OK, "Failed to activate, hr %#x.\n", hr);
+todo_wine
ok(sink == sink2, "Unexpected instance.\n");
IMFMediaSink_Release(sink2);
@@ -3274,6 +3274,7 @@ if (hr == S_OK)
ok(hr == E_NOTIMPL, "Unexpected hr %#x.\n", hr);
hr = IMFMediaSink_GetCharacteristics(sink, &flags);
+todo_wine
ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr);
hr = IMFActivate_ActivateObject(activate, &IID_IMFMediaSink, (void **)&sink2);
@@ -3284,7 +3285,7 @@ if (hr == S_OK)
IMFMediaSink_Release(sink2);
IMFMediaSink_Release(sink);
-}
+
IMFActivate_Release(activate);
CoUninitialize();
--
2.27.0
More information about the wine-devel
mailing list