From: Elizabeth Figura zfigura@codeweavers.com
--- dlls/d3d11/d3d11_private.h | 14 +++ dlls/d3d11/device.c | 19 ++++- dlls/d3d11/view.c | 169 +++++++++++++++++++++++++++++++++++++ 3 files changed, 200 insertions(+), 2 deletions(-)
diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h index 57ed210a282..bd9e82efd9a 100644 --- a/dlls/d3d11/d3d11_private.h +++ b/dlls/d3d11/d3d11_private.h @@ -267,6 +267,20 @@ HRESULT d3d11_unordered_access_view_create(struct d3d_device *device, ID3D11Reso struct d3d11_unordered_access_view *unsafe_impl_from_ID3D11UnorderedAccessView( ID3D11UnorderedAccessView *iface);
+struct d3d_video_decoder_output_view +{ + ID3D11VideoDecoderOutputView ID3D11VideoDecoderOutputView_iface; + LONG refcount; + + struct wined3d_private_store private_store; + D3D11_VIDEO_DECODER_OUTPUT_VIEW_DESC desc; + ID3D11Resource *resource; + struct d3d_device *device; +}; + +HRESULT d3d_video_decoder_output_view_create(struct d3d_device *device, ID3D11Resource *resource, + const D3D11_VIDEO_DECODER_OUTPUT_VIEW_DESC *desc, struct d3d_video_decoder_output_view **view); + /* ID3D11InputLayout, ID3D10InputLayout */ struct d3d_input_layout { diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 540fbfc7894..d1dc676e8f8 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -6847,8 +6847,23 @@ static HRESULT STDMETHODCALLTYPE d3d11_video_device_CreateCryptoSession(ID3D11Vi static HRESULT STDMETHODCALLTYPE d3d11_video_device_CreateVideoDecoderOutputView(ID3D11VideoDevice1 *iface, ID3D11Resource *resource, const D3D11_VIDEO_DECODER_OUTPUT_VIEW_DESC *desc, ID3D11VideoDecoderOutputView **view) { - FIXME("iface %p, resource %p, desc %p, view %p, stub!\n", iface, resource, desc, view); - return E_NOTIMPL; + struct d3d_device *device = impl_from_ID3D11VideoDevice1(iface); + struct d3d_video_decoder_output_view *object; + HRESULT hr; + + TRACE("iface %p, resource %p, desc %p, view %p.\n", iface, resource, desc, view); + + *view = NULL; + + if (!resource) + return E_INVALIDARG; + + if (FAILED(hr = d3d_video_decoder_output_view_create(device, resource, desc, &object))) + return hr; + + *view = &object->ID3D11VideoDecoderOutputView_iface; + + return S_OK; }
static HRESULT STDMETHODCALLTYPE d3d11_video_device_CreateVideoProcessorInputView( diff --git a/dlls/d3d11/view.c b/dlls/d3d11/view.c index 228bed0ed66..449a365362a 100644 --- a/dlls/d3d11/view.c +++ b/dlls/d3d11/view.c @@ -2580,3 +2580,172 @@ struct d3d11_unordered_access_view *unsafe_impl_from_ID3D11UnorderedAccessView(I
return impl_from_ID3D11UnorderedAccessView(iface); } + +static struct d3d_video_decoder_output_view *impl_from_ID3D11VideoDecoderOutputView(ID3D11VideoDecoderOutputView *iface) +{ + return CONTAINING_RECORD(iface, struct d3d_video_decoder_output_view, ID3D11VideoDecoderOutputView_iface); +} + +static HRESULT STDMETHODCALLTYPE d3d11_video_decoder_output_view_QueryInterface(ID3D11VideoDecoderOutputView *iface, + REFIID riid, void **object) +{ + TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), object); + + if (IsEqualGUID(riid, &IID_ID3D11VideoDecoderOutputView) + || IsEqualGUID(riid, &IID_ID3D11View) + || IsEqualGUID(riid, &IID_ID3D11DeviceChild) + || IsEqualGUID(riid, &IID_IUnknown)) + { + ID3D11VideoDecoderOutputView_AddRef(*object = iface); + return S_OK; + } + + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(riid)); + + *object = NULL; + return E_NOINTERFACE; +} + +static ULONG STDMETHODCALLTYPE d3d11_video_decoder_output_view_AddRef(ID3D11VideoDecoderOutputView *iface) +{ + struct d3d_video_decoder_output_view *view = impl_from_ID3D11VideoDecoderOutputView(iface); + ULONG refcount = InterlockedIncrement(&view->refcount); + + TRACE("%p increasing refcount to %lu.\n", view, refcount); + + return refcount; +} + +static ULONG STDMETHODCALLTYPE d3d11_video_decoder_output_view_Release(ID3D11VideoDecoderOutputView *iface) +{ + struct d3d_video_decoder_output_view *view = impl_from_ID3D11VideoDecoderOutputView(iface); + ULONG refcount = InterlockedDecrement(&view->refcount); + + TRACE("%p decreasing refcount to %lu.\n", view, refcount); + + if (!refcount) + { + ID3D11Device2_Release(&view->device->ID3D11Device2_iface); + wined3d_private_store_cleanup(&view->private_store); + free(view); + } + + return refcount; +} + +static void STDMETHODCALLTYPE d3d11_video_decoder_output_view_GetDevice(ID3D11VideoDecoderOutputView *iface, + ID3D11Device **device) +{ + struct d3d_video_decoder_output_view *view = impl_from_ID3D11VideoDecoderOutputView(iface); + + TRACE("iface %p, device %p.\n", iface, device); + + ID3D11Device_AddRef(*device = (ID3D11Device *)view->device); +} + +static HRESULT STDMETHODCALLTYPE d3d11_video_decoder_output_view_GetPrivateData( + ID3D11VideoDecoderOutputView *iface, REFGUID guid, UINT *data_size, void *data) +{ + struct d3d_video_decoder_output_view *view = impl_from_ID3D11VideoDecoderOutputView(iface); + + TRACE("iface %p, guid %s, data_size %p, data %p.\n", iface, debugstr_guid(guid), data_size, data); + + return d3d_get_private_data(&view->private_store, guid, data_size, data); +} + +static HRESULT STDMETHODCALLTYPE d3d11_video_decoder_output_view_SetPrivateData( + ID3D11VideoDecoderOutputView *iface, REFGUID guid, UINT data_size, const void *data) +{ + struct d3d_video_decoder_output_view *view = impl_from_ID3D11VideoDecoderOutputView(iface); + + TRACE("iface %p, guid %s, data_size %u, data %p.\n", iface, debugstr_guid(guid), data_size, data); + + return d3d_set_private_data(&view->private_store, guid, data_size, data); +} + +static HRESULT STDMETHODCALLTYPE d3d11_video_decoder_output_view_SetPrivateDataInterface( + ID3D11VideoDecoderOutputView *iface, REFGUID guid, const IUnknown *data) +{ + struct d3d_video_decoder_output_view *view = impl_from_ID3D11VideoDecoderOutputView(iface); + + TRACE("iface %p, guid %s, data %p.\n", iface, debugstr_guid(guid), data); + + return d3d_set_private_data_interface(&view->private_store, guid, data); +} + +static void STDMETHODCALLTYPE d3d11_video_decoder_output_view_GetResource( + ID3D11VideoDecoderOutputView *iface, ID3D11Resource **resource) +{ + struct d3d_video_decoder_output_view *view = impl_from_ID3D11VideoDecoderOutputView(iface); + + TRACE("iface %p, resource %p.\n", iface, resource); + + ID3D11Resource_AddRef(*resource = view->resource); +} + +static void STDMETHODCALLTYPE d3d11_video_decoder_output_view_GetDesc( + ID3D11VideoDecoderOutputView *iface, D3D11_VIDEO_DECODER_OUTPUT_VIEW_DESC *desc) +{ + struct d3d_video_decoder_output_view *view = impl_from_ID3D11VideoDecoderOutputView(iface); + + TRACE("iface %p, desc %p.\n", iface, desc); + + *desc = view->desc; +} + +static const struct ID3D11VideoDecoderOutputViewVtbl d3d11_video_decoder_output_view_vtbl = +{ + /* IUnknown methods */ + d3d11_video_decoder_output_view_QueryInterface, + d3d11_video_decoder_output_view_AddRef, + d3d11_video_decoder_output_view_Release, + /* ID3D11DeviceChild methods */ + d3d11_video_decoder_output_view_GetDevice, + d3d11_video_decoder_output_view_GetPrivateData, + d3d11_video_decoder_output_view_SetPrivateData, + d3d11_video_decoder_output_view_SetPrivateDataInterface, + /* ID3D11View methods */ + d3d11_video_decoder_output_view_GetResource, + /* ID3D11VideoDecoderOutputView methods */ + d3d11_video_decoder_output_view_GetDesc, +}; + +static HRESULT d3d_video_decoder_output_view_init(struct d3d_video_decoder_output_view *view, + struct d3d_device *device, ID3D11Resource *resource, const D3D11_VIDEO_DECODER_OUTPUT_VIEW_DESC *desc) +{ + view->ID3D11VideoDecoderOutputView_iface.lpVtbl = &d3d11_video_decoder_output_view_vtbl; + view->refcount = 1; + + wined3d_mutex_lock(); + wined3d_private_store_init(&view->private_store); + wined3d_mutex_unlock(); + view->resource = resource; + view->device = device; + ID3D11Device2_AddRef(&device->ID3D11Device2_iface); + + return S_OK; +} + +HRESULT d3d_video_decoder_output_view_create(struct d3d_device *device, ID3D11Resource *resource, + const D3D11_VIDEO_DECODER_OUTPUT_VIEW_DESC *desc, struct d3d_video_decoder_output_view **view) +{ + struct d3d_video_decoder_output_view *object; + HRESULT hr; + + TRACE("profile %s, slice %u.\n", debugstr_guid(&desc->DecodeProfile), desc->u.Texture2D.ArraySlice); + + if (!(object = calloc(1, sizeof(*object)))) + return E_OUTOFMEMORY; + + if (FAILED(hr = d3d_video_decoder_output_view_init(object, device, resource, desc))) + { + WARN("Failed to initialise video decoder output view, hr %#lx.\n", hr); + free(object); + return hr; + } + + TRACE("Created video decoder output view %p.\n", object); + *view = object; + + return S_OK; +}