[PATCH 4/5] quartz/vmr9: Add a stub IOverlay interface to the sink pin.
Zebediah Figura
z.figura12 at gmail.com
Thu Oct 3 22:10:14 CDT 2019
Signed-off-by: Zebediah Figura <z.figura12 at gmail.com>
---
dlls/quartz/tests/vmr7.c | 6 +-
dlls/quartz/tests/vmr9.c | 6 +-
dlls/quartz/vmr9.c | 117 +++++++++++++++++++++++++++++++++++++++
3 files changed, 123 insertions(+), 6 deletions(-)
diff --git a/dlls/quartz/tests/vmr7.c b/dlls/quartz/tests/vmr7.c
index cbb4bb1dda8..eb38298036c 100644
--- a/dlls/quartz/tests/vmr7.c
+++ b/dlls/quartz/tests/vmr7.c
@@ -248,7 +248,7 @@ static void test_interfaces(void)
IBaseFilter_FindPin(filter, sink_id, &pin);
check_interface(pin, &IID_IMemInputPin, TRUE);
- todo_wine check_interface(pin, &IID_IOverlay, TRUE);
+ check_interface(pin, &IID_IOverlay, TRUE);
check_interface(pin, &IID_IPin, TRUE);
todo_wine check_interface(pin, &IID_IQualityControl, TRUE);
check_interface(pin, &IID_IUnknown, TRUE);
@@ -278,7 +278,7 @@ static void test_interfaces(void)
IBaseFilter_FindPin(filter, sink_id, &pin);
check_interface(pin, &IID_IMemInputPin, TRUE);
- todo_wine check_interface(pin, &IID_IOverlay, TRUE);
+ check_interface(pin, &IID_IOverlay, TRUE);
check_interface(pin, &IID_IPin, TRUE);
todo_wine check_interface(pin, &IID_IQualityControl, TRUE);
check_interface(pin, &IID_IUnknown, TRUE);
@@ -307,7 +307,7 @@ static void test_interfaces(void)
IBaseFilter_FindPin(filter, sink_id, &pin);
check_interface(pin, &IID_IMemInputPin, TRUE);
- todo_wine check_interface(pin, &IID_IOverlay, TRUE);
+ check_interface(pin, &IID_IOverlay, TRUE);
check_interface(pin, &IID_IPin, TRUE);
todo_wine check_interface(pin, &IID_IQualityControl, TRUE);
check_interface(pin, &IID_IUnknown, TRUE);
diff --git a/dlls/quartz/tests/vmr9.c b/dlls/quartz/tests/vmr9.c
index f65ddc2278e..d3001727d4d 100644
--- a/dlls/quartz/tests/vmr9.c
+++ b/dlls/quartz/tests/vmr9.c
@@ -241,7 +241,7 @@ static void test_interfaces(void)
IBaseFilter_FindPin(filter, sink_id, &pin);
check_interface(pin, &IID_IMemInputPin, TRUE);
- todo_wine check_interface(pin, &IID_IOverlay, TRUE);
+ check_interface(pin, &IID_IOverlay, TRUE);
check_interface(pin, &IID_IPin, TRUE);
todo_wine check_interface(pin, &IID_IQualityControl, TRUE);
check_interface(pin, &IID_IUnknown, TRUE);
@@ -271,7 +271,7 @@ static void test_interfaces(void)
IBaseFilter_FindPin(filter, sink_id, &pin);
check_interface(pin, &IID_IMemInputPin, TRUE);
- todo_wine check_interface(pin, &IID_IOverlay, TRUE);
+ check_interface(pin, &IID_IOverlay, TRUE);
check_interface(pin, &IID_IPin, TRUE);
todo_wine check_interface(pin, &IID_IQualityControl, TRUE);
check_interface(pin, &IID_IUnknown, TRUE);
@@ -300,7 +300,7 @@ static void test_interfaces(void)
IBaseFilter_FindPin(filter, sink_id, &pin);
check_interface(pin, &IID_IMemInputPin, TRUE);
- todo_wine check_interface(pin, &IID_IOverlay, TRUE);
+ check_interface(pin, &IID_IOverlay, TRUE);
check_interface(pin, &IID_IPin, TRUE);
todo_wine check_interface(pin, &IID_IQualityControl, TRUE);
check_interface(pin, &IID_IUnknown, TRUE);
diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c
index cc7ef69810c..5a1d248ddeb 100644
--- a/dlls/quartz/vmr9.c
+++ b/dlls/quartz/vmr9.c
@@ -56,6 +56,8 @@ struct quartz_vmr
IVMRWindowlessControl IVMRWindowlessControl_iface;
IVMRWindowlessControl9 IVMRWindowlessControl9_iface;
+ IOverlay IOverlay_iface;
+
IVMRSurfaceAllocatorEx9 *allocator;
IVMRImagePresenter9 *presenter;
BOOL allocator_is_ex;
@@ -550,6 +552,19 @@ static HRESULT vmr_query_interface(BaseRenderer *iface, REFIID iid, void **out)
return S_OK;
}
+static HRESULT vmr_pin_query_interface(BaseRenderer *iface, REFIID iid, void **out)
+{
+ struct quartz_vmr *filter = impl_from_IBaseFilter(&iface->filter.IBaseFilter_iface);
+
+ if (IsEqualGUID(iid, &IID_IOverlay))
+ *out = &filter->IOverlay_iface;
+ else
+ return E_NOINTERFACE;
+
+ IUnknown_AddRef((IUnknown *)*out);
+ return S_OK;
+}
+
static const BaseRendererFuncTable BaseFuncTable =
{
.pfnCheckMediaType = VMR9_CheckMediaType,
@@ -561,6 +576,7 @@ static const BaseRendererFuncTable BaseFuncTable =
.pfnBreakConnect = VMR9_BreakConnect,
.renderer_destroy = vmr_destroy,
.renderer_query_interface = vmr_query_interface,
+ .renderer_pin_query_interface = vmr_pin_query_interface,
};
static LPWSTR WINAPI VMR9_GetClassWindowStyles(BaseWindow *This, DWORD *pClassStyles, DWORD *pWindowStyles, DWORD *pWindowStylesEx)
@@ -2112,6 +2128,106 @@ static const IVMRSurfaceAllocatorNotify9Vtbl VMR9_SurfaceAllocatorNotify_Vtbl =
VMR9SurfaceAllocatorNotify_NotifyEvent
};
+static inline struct quartz_vmr *impl_from_IOverlay(IOverlay *iface)
+{
+ return CONTAINING_RECORD(iface, struct quartz_vmr, IOverlay_iface);
+}
+
+static HRESULT WINAPI overlay_QueryInterface(IOverlay *iface, REFIID iid, void **out)
+{
+ struct quartz_vmr *filter = impl_from_IOverlay(iface);
+ return IPin_QueryInterface(&filter->renderer.sink.pin.IPin_iface, iid, out);
+}
+
+static ULONG WINAPI overlay_AddRef(IOverlay *iface)
+{
+ struct quartz_vmr *filter = impl_from_IOverlay(iface);
+ return IPin_AddRef(&filter->renderer.sink.pin.IPin_iface);
+}
+
+static ULONG WINAPI overlay_Release(IOverlay *iface)
+{
+ struct quartz_vmr *filter = impl_from_IOverlay(iface);
+ return IPin_Release(&filter->renderer.sink.pin.IPin_iface);
+}
+
+static HRESULT WINAPI overlay_GetPalette(IOverlay *iface, DWORD *count, PALETTEENTRY **palette)
+{
+ FIXME("iface %p, count %p, palette %p, stub!\n", iface, count, palette);
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI overlay_SetPalette(IOverlay *iface, DWORD count, PALETTEENTRY *palette)
+{
+ FIXME("iface %p, count %u, palette %p, stub!\n", iface, count, palette);
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI overlay_GetDefaultColorKey(IOverlay *iface, COLORKEY *key)
+{
+ FIXME("iface %p, key %p, stub!\n", iface, key);
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI overlay_GetColorKey(IOverlay *iface, COLORKEY *key)
+{
+ FIXME("iface %p, key %p, stub!\n", iface, key);
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI overlay_SetColorKey(IOverlay *iface, COLORKEY *key)
+{
+ FIXME("iface %p, key %p, stub!\n", iface, key);
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI overlay_GetWindowHandle(IOverlay *iface, HWND *window)
+{
+ FIXME("iface %p, window %p, stub!\n", iface, window);
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI overlay_GetClipList(IOverlay *iface, RECT *source, RECT *dest, RGNDATA **region)
+{
+ FIXME("iface %p, source %p, dest %p, region %p, stub!\n", iface, source, dest, region);
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI overlay_GetVideoPosition(IOverlay *iface, RECT *source, RECT *dest)
+{
+ FIXME("iface %p, source %p, dest %p, stub!\n", iface, source, dest);
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI overlay_Advise(IOverlay *iface, IOverlayNotify *sink, DWORD flags)
+{
+ FIXME("iface %p, sink %p, flags %#x, stub!\n", iface, sink, flags);
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI overlay_Unadvise(IOverlay *iface)
+{
+ FIXME("iface %p, stub!\n", iface);
+ return E_NOTIMPL;
+}
+
+static const IOverlayVtbl overlay_vtbl =
+{
+ overlay_QueryInterface,
+ overlay_AddRef,
+ overlay_Release,
+ overlay_GetPalette,
+ overlay_SetPalette,
+ overlay_GetDefaultColorKey,
+ overlay_GetColorKey,
+ overlay_SetColorKey,
+ overlay_GetWindowHandle,
+ overlay_GetClipList,
+ overlay_GetVideoPosition,
+ overlay_Advise,
+ overlay_Unadvise,
+};
+
static HRESULT vmr_create(IUnknown *outer, void **out, const CLSID *clsid)
{
static const WCHAR sink_name[] = {'V','M','R',' ','I','n','p','u','t','0',0};
@@ -2149,6 +2265,7 @@ static HRESULT vmr_create(IUnknown *outer, void **out, const CLSID *clsid)
pVMR->IVMRSurfaceAllocatorNotify9_iface.lpVtbl = &VMR9_SurfaceAllocatorNotify_Vtbl;
pVMR->IVMRWindowlessControl_iface.lpVtbl = &VMR7_WindowlessControl_Vtbl;
pVMR->IVMRWindowlessControl9_iface.lpVtbl = &VMR9_WindowlessControl_Vtbl;
+ pVMR->IOverlay_iface.lpVtbl = &overlay_vtbl;
hr = strmbase_renderer_init(&pVMR->renderer, &VMR_Vtbl, outer, clsid, sink_name, &BaseFuncTable);
if (FAILED(hr))
--
2.23.0
More information about the wine-devel
mailing list