December 2020 - Wine-Devel - list.winehq.org

[PATCH v2 10/17] winegstreamer: Implement ::SetInputType for color conversion transform.

by Derek Lesho

Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> --- v2: Reorganize function to avoid having a conditionally initialized variable. --- dlls/winegstreamer/colorconvert.c | 82 ++++++++++++++++++++++++++++++- 1 file changed, 80 insertions(+), 2 deletions(-) diff --git a/dlls/winegstreamer/colorconvert.c b/dlls/winegstreamer/colorconvert.c index 9a1d2880234..a7660453766 100644 --- a/dlls/winegstreamer/colorconvert.c +++ b/dlls/winegstreamer/colorconvert.c @@ -52,6 +52,8 @@ struct color_converter { IMFTransform IMFTransform_iface; LONG refcount; + IMFMediaType *input_type; + CRITICAL_SECTION cs; }; static struct color_converter *impl_color_converter_from_IMFTransform(IMFTransform *iface) @@ -95,6 +97,8 @@ static ULONG WINAPI color_converter_Release(IMFTransform *iface) if (!refcount) { + transform->cs.DebugInfo->Spare[0] = 0; + DeleteCriticalSection(&transform->cs); heap_free(transform); } @@ -223,9 +227,80 @@ static HRESULT WINAPI color_converter_GetOutputAvailableType(IMFTransform *iface static HRESULT WINAPI color_converter_SetInputType(IMFTransform *iface, DWORD id, IMFMediaType *type, DWORD flags) { - FIXME("%p, %u, %p, %#x.\n", iface, id, type, flags); + GUID major_type, subtype; + GstCaps *input_caps; + unsigned int i; + HRESULT hr; - return E_NOTIMPL; + struct color_converter *converter = impl_color_converter_from_IMFTransform(iface); + + TRACE("%p, %u, %p, %#x.\n", iface, id, type, flags); + + if (id != 0) + return MF_E_INVALIDSTREAMNUMBER; + + if (!type) + { + if (flags & MFT_SET_TYPE_TEST_ONLY) + return S_OK; + + EnterCriticalSection(&converter->cs); + + if (converter->input_type) + { + IMFMediaType_Release(converter->input_type); + converter->input_type = NULL; + } + + LeaveCriticalSection(&converter->cs); + + return S_OK; + } + + if (FAILED(IMFMediaType_GetGUID(type, &MF_MT_MAJOR_TYPE, &major_type))) + return MF_E_INVALIDTYPE; + if (FAILED(IMFMediaType_GetGUID(type, &MF_MT_SUBTYPE, &subtype))) + return MF_E_INVALIDTYPE; + + if (!(IsEqualGUID(&major_type, &MFMediaType_Video))) + return MF_E_INVALIDTYPE; + + for (i = 0; i < ARRAY_SIZE(raw_types); i++) + { + if (IsEqualGUID(&subtype, raw_types[i])) + break; + } + + if (i == ARRAY_SIZE(raw_types)) + return MF_E_INVALIDTYPE; + + if (!(input_caps = caps_from_mf_media_type(type))) + return MF_E_INVALIDTYPE; + + gst_caps_unref(input_caps); + + if (flags & MFT_SET_TYPE_TEST_ONLY) + return S_OK; + + EnterCriticalSection(&converter->cs); + + hr = S_OK; + + if (!converter->input_type) + hr = MFCreateMediaType(&converter->input_type); + + if (SUCCEEDED(hr)) + hr = IMFMediaType_CopyAllItems(type, (IMFAttributes *) converter->input_type); + + if (FAILED(hr)) + { + IMFMediaType_Release(converter->input_type); + converter->input_type = NULL; + } + + LeaveCriticalSection(&converter->cs); + + return hr; } static HRESULT WINAPI color_converter_SetOutputType(IMFTransform *iface, DWORD id, IMFMediaType *type, DWORD flags) @@ -341,6 +416,9 @@ HRESULT color_converter_create(REFIID riid, void **ret) object->IMFTransform_iface.lpVtbl = &color_converter_vtbl; object->refcount = 1; + InitializeCriticalSection(&object->cs); + object->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": color_converter_lock"); + *ret = &object->IMFTransform_iface; return S_OK; } -- 2.29.2

Dec. 4, 2020

[PATCH v2 09/17] winegstreamer: Implement ::GetInputAvailableType for color conversion transform.

by Derek Lesho

Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> --- dlls/winegstreamer/colorconvert.c | 48 +++++++++++++++++++++++++++++-- 1 file changed, 46 insertions(+), 2 deletions(-) diff --git a/dlls/winegstreamer/colorconvert.c b/dlls/winegstreamer/colorconvert.c index 8d0823fc0dc..9a1d2880234 100644 --- a/dlls/winegstreamer/colorconvert.c +++ b/dlls/winegstreamer/colorconvert.c @@ -30,6 +30,24 @@ WINE_DEFAULT_DEBUG_CHANNEL(mfplat); +static const GUID *raw_types[] = { + &MFVideoFormat_RGB24, + &MFVideoFormat_RGB32, + &MFVideoFormat_RGB555, + &MFVideoFormat_RGB8, + &MFVideoFormat_AYUV, + &MFVideoFormat_I420, + &MFVideoFormat_IYUV, + &MFVideoFormat_NV11, + &MFVideoFormat_NV12, + &MFVideoFormat_UYVY, + &MFVideoFormat_v216, + &MFVideoFormat_v410, + &MFVideoFormat_YUY2, + &MFVideoFormat_YVYU, + &MFVideoFormat_YVYU, +}; + struct color_converter { IMFTransform IMFTransform_iface; @@ -164,9 +182,35 @@ static HRESULT WINAPI color_converter_AddInputStreams(IMFTransform *iface, DWORD static HRESULT WINAPI color_converter_GetInputAvailableType(IMFTransform *iface, DWORD id, DWORD index, IMFMediaType **type) { - FIXME("%p, %u, %u, %p.\n", iface, id, index, type); + IMFMediaType *ret; + HRESULT hr; - return E_NOTIMPL; + TRACE("%p, %u, %u, %p.\n", iface, id, index, type); + + if (id != 0) + return MF_E_INVALIDSTREAMNUMBER; + + if (index >= ARRAY_SIZE(raw_types)) + return MF_E_NO_MORE_TYPES; + + if (FAILED(hr = MFCreateMediaType(&ret))) + return hr; + + if (FAILED(hr = IMFMediaType_SetGUID(ret, &MF_MT_MAJOR_TYPE, &MFMediaType_Video))) + { + IMFMediaType_Release(ret); + return hr; + } + + if (FAILED(hr = IMFMediaType_SetGUID(ret, &MF_MT_SUBTYPE, raw_types[index]))) + { + IMFMediaType_Release(ret); + return hr; + } + + *type = ret; + + return S_OK; } static HRESULT WINAPI color_converter_GetOutputAvailableType(IMFTransform *iface, DWORD id, DWORD index, -- 2.29.2

Dec. 4, 2020

[PATCH v2 08/17] winegstreamer: Register the color conversion transform.

by Derek Lesho

Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> --- dlls/winegstreamer/mfplat.c | 34 +++++++++++++++++++++++++++++++++- 1 file changed, 33 insertions(+), 1 deletion(-) diff --git a/dlls/winegstreamer/mfplat.c b/dlls/winegstreamer/mfplat.c index 5ec408eea34..bab2ccce64c 100644 --- a/dlls/winegstreamer/mfplat.c +++ b/dlls/winegstreamer/mfplat.c @@ -454,6 +454,26 @@ static const GUID *audio_converter_supported_types[] = &MFAudioFormat_Float, }; +static WCHAR color_converterW[] = {'C','o','l','o','r',' ','C','o','n','v','e','r','t','e','r',0}; +const GUID *color_converter_supported_types[] = +{ + &MFVideoFormat_RGB24, + &MFVideoFormat_RGB32, + &MFVideoFormat_RGB555, + &MFVideoFormat_RGB8, + &MFVideoFormat_AYUV, + &MFVideoFormat_I420, + &MFVideoFormat_IYUV, + &MFVideoFormat_NV11, + &MFVideoFormat_NV12, + &MFVideoFormat_UYVY, + &MFVideoFormat_v216, + &MFVideoFormat_v410, + &MFVideoFormat_YUY2, + &MFVideoFormat_YVYU, + &MFVideoFormat_YVYU, +}; + static const struct mft { const GUID *clsid; @@ -481,13 +501,25 @@ mfts[] = audio_converter_supported_types, NULL }, + { + &CLSID_CColorConvertDMO, + &MFT_CATEGORY_VIDEO_EFFECT, + color_converterW, + MFT_ENUM_FLAG_SYNCMFT, + &MFMediaType_Video, + ARRAY_SIZE(color_converter_supported_types), + color_converter_supported_types, + ARRAY_SIZE(color_converter_supported_types), + color_converter_supported_types, + NULL + }, }; HRESULT mfplat_DllRegisterServer(void) { unsigned int i, j; HRESULT hr; - MFT_REGISTER_TYPE_INFO input_types[2], output_types[2]; + MFT_REGISTER_TYPE_INFO input_types[15], output_types[15]; for (i = 0; i < ARRAY_SIZE(mfts); i++) { -- 2.29.2

Dec. 4, 2020

[PATCH v2 07/17] winegstreamer: Introduce color conversion transform.

by Derek Lesho

Serves as a wrapper of videoconvert, and exposes the CColorConverterDMO MFT interface. Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> --- v2: Use existing CColorConverterDMO GUID instead of creating a custom one. --- dlls/winegstreamer/Makefile.in | 1 + dlls/winegstreamer/colorconvert.c | 302 +++++++++++++++++++ dlls/winegstreamer/gst_private.h | 1 + dlls/winegstreamer/mfplat.c | 2 + dlls/winegstreamer/winegstreamer_classes.idl | 6 + include/wmcodecdsp.idl | 5 + 6 files changed, 317 insertions(+) create mode 100644 dlls/winegstreamer/colorconvert.c diff --git a/dlls/winegstreamer/Makefile.in b/dlls/winegstreamer/Makefile.in index 0b3229160b9..5395d6fd501 100644 --- a/dlls/winegstreamer/Makefile.in +++ b/dlls/winegstreamer/Makefile.in @@ -7,6 +7,7 @@ PARENTSRC = ../strmbase C_SRCS = \ audioconvert.c \ + colorconvert.c \ filter.c \ gst_cbs.c \ gstdemux.c \ diff --git a/dlls/winegstreamer/colorconvert.c b/dlls/winegstreamer/colorconvert.c new file mode 100644 index 00000000000..8d0823fc0dc --- /dev/null +++ b/dlls/winegstreamer/colorconvert.c @@ -0,0 +1,302 @@ +/* GStreamer Color Converter + * + * Copyright 2020 Derek Lesho + * + * 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 + */ + +#include "config.h" + +#include "gst_private.h" + +#include "mfapi.h" +#include "mferror.h" +#include "mfidl.h" + +#include "wine/debug.h" +#include "wine/heap.h" + +WINE_DEFAULT_DEBUG_CHANNEL(mfplat); + +struct color_converter +{ + IMFTransform IMFTransform_iface; + LONG refcount; +}; + +static struct color_converter *impl_color_converter_from_IMFTransform(IMFTransform *iface) +{ + return CONTAINING_RECORD(iface, struct color_converter, IMFTransform_iface); +} + +static HRESULT WINAPI color_converter_QueryInterface(IMFTransform *iface, REFIID riid, void **obj) +{ + TRACE("%p, %s, %p.\n", iface, debugstr_guid(riid), obj); + + if (IsEqualIID(riid, &IID_IMFTransform) || + IsEqualIID(riid, &IID_IUnknown)) + { + *obj = iface; + IMFTransform_AddRef(iface); + return S_OK; + } + + WARN("Unsupported %s.\n", debugstr_guid(riid)); + *obj = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI color_converter_AddRef(IMFTransform *iface) +{ + struct color_converter *transform = impl_color_converter_from_IMFTransform(iface); + ULONG refcount = InterlockedIncrement(&transform->refcount); + + TRACE("%p, refcount %u.\n", iface, refcount); + + return refcount; +} + +static ULONG WINAPI color_converter_Release(IMFTransform *iface) +{ + struct color_converter *transform = impl_color_converter_from_IMFTransform(iface); + ULONG refcount = InterlockedDecrement(&transform->refcount); + + TRACE("%p, refcount %u.\n", iface, refcount); + + if (!refcount) + { + heap_free(transform); + } + + return refcount; +} + +static HRESULT WINAPI color_converter_GetStreamLimits(IMFTransform *iface, DWORD *input_minimum, DWORD *input_maximum, + DWORD *output_minimum, DWORD *output_maximum) +{ + TRACE("%p, %p, %p, %p, %p.\n", iface, input_minimum, input_maximum, output_minimum, output_maximum); + + *input_minimum = *input_maximum = *output_minimum = *output_maximum = 1; + + return S_OK; +} + +static HRESULT WINAPI color_converter_GetStreamCount(IMFTransform *iface, DWORD *inputs, DWORD *outputs) +{ + TRACE("%p, %p, %p.\n", iface, inputs, outputs); + + *inputs = *outputs = 1; + + return S_OK; +} + +static HRESULT WINAPI color_converter_GetStreamIDs(IMFTransform *iface, DWORD input_size, DWORD *inputs, + DWORD output_size, DWORD *outputs) +{ + TRACE("%p %u %p %u %p.\n", iface, input_size, inputs, output_size, outputs); + + return E_NOTIMPL; +} + +static HRESULT WINAPI color_converter_GetInputStreamInfo(IMFTransform *iface, DWORD id, MFT_INPUT_STREAM_INFO *info) +{ + FIXME("%p %u %p.\n", iface, id, info); + + return E_NOTIMPL; +} + +static HRESULT WINAPI color_converter_GetOutputStreamInfo(IMFTransform *iface, DWORD id, MFT_OUTPUT_STREAM_INFO *info) +{ + FIXME("%p %u %p.\n", iface, id, info); + + return E_NOTIMPL; +} + +static HRESULT WINAPI color_converter_GetAttributes(IMFTransform *iface, IMFAttributes **attributes) +{ + FIXME("%p, %p.\n", iface, attributes); + + return E_NOTIMPL; +} + +static HRESULT WINAPI color_converter_GetInputStreamAttributes(IMFTransform *iface, DWORD id, + IMFAttributes **attributes) +{ + FIXME("%p, %u, %p.\n", iface, id, attributes); + + return E_NOTIMPL; +} + +static HRESULT WINAPI color_converter_GetOutputStreamAttributes(IMFTransform *iface, DWORD id, + IMFAttributes **attributes) +{ + FIXME("%p, %u, %p.\n", iface, id, attributes); + + return E_NOTIMPL; +} + +static HRESULT WINAPI color_converter_DeleteInputStream(IMFTransform *iface, DWORD id) +{ + TRACE("%p, %u.\n", iface, id); + + return E_NOTIMPL; +} + +static HRESULT WINAPI color_converter_AddInputStreams(IMFTransform *iface, DWORD streams, DWORD *ids) +{ + TRACE("%p, %u, %p.\n", iface, streams, ids); + + return E_NOTIMPL; +} + +static HRESULT WINAPI color_converter_GetInputAvailableType(IMFTransform *iface, DWORD id, DWORD index, + IMFMediaType **type) +{ + FIXME("%p, %u, %u, %p.\n", iface, id, index, type); + + return E_NOTIMPL; +} + +static HRESULT WINAPI color_converter_GetOutputAvailableType(IMFTransform *iface, DWORD id, DWORD index, + IMFMediaType **type) +{ + FIXME("%p, %u, %u, %p.\n", iface, id, index, type); + + return E_NOTIMPL; +} + +static HRESULT WINAPI color_converter_SetInputType(IMFTransform *iface, DWORD id, IMFMediaType *type, DWORD flags) +{ + FIXME("%p, %u, %p, %#x.\n", iface, id, type, flags); + + return E_NOTIMPL; +} + +static HRESULT WINAPI color_converter_SetOutputType(IMFTransform *iface, DWORD id, IMFMediaType *type, DWORD flags) +{ + FIXME("%p, %u, %p, %#x.\n", iface, id, type, flags); + + return E_NOTIMPL; +} + +static HRESULT WINAPI color_converter_GetInputCurrentType(IMFTransform *iface, DWORD id, IMFMediaType **type) +{ + FIXME("%p, %u, %p.\n", iface, id, type); + + return E_NOTIMPL; +} + +static HRESULT WINAPI color_converter_GetOutputCurrentType(IMFTransform *iface, DWORD id, IMFMediaType **type) +{ + FIXME("%p, %u, %p.\n", iface, id, type); + + return E_NOTIMPL; +} + +static HRESULT WINAPI color_converter_GetInputStatus(IMFTransform *iface, DWORD id, DWORD *flags) +{ + FIXME("%p, %u, %p.\n", iface, id, flags); + + return E_NOTIMPL; +} + +static HRESULT WINAPI color_converter_GetOutputStatus(IMFTransform *iface, DWORD *flags) +{ + FIXME("%p, %p.\n", iface, flags); + + return E_NOTIMPL; +} + +static HRESULT WINAPI color_converter_SetOutputBounds(IMFTransform *iface, LONGLONG lower, LONGLONG upper) +{ + FIXME("%p, %s, %s.\n", iface, wine_dbgstr_longlong(lower), wine_dbgstr_longlong(upper)); + + return E_NOTIMPL; +} + +static HRESULT WINAPI color_converter_ProcessEvent(IMFTransform *iface, DWORD id, IMFMediaEvent *event) +{ + TRACE("%p, %u, %p.\n", iface, id, event); + + return E_NOTIMPL; +} + +static HRESULT WINAPI color_converter_ProcessMessage(IMFTransform *iface, MFT_MESSAGE_TYPE message, ULONG_PTR param) +{ + FIXME("%p, %u %lu.\n", iface, message, param); + + return E_NOTIMPL; +} + +static HRESULT WINAPI color_converter_ProcessInput(IMFTransform *iface, DWORD id, IMFSample *sample, DWORD flags) +{ + FIXME("%p, %u, %p, %#x.\n", iface, id, sample, flags); + + return E_NOTIMPL; +} + +static HRESULT WINAPI color_converter_ProcessOutput(IMFTransform *iface, DWORD flags, DWORD count, + MFT_OUTPUT_DATA_BUFFER *samples, DWORD *status) +{ + FIXME("%p, %#x, %u, %p, %p.\n", iface, flags, count, samples, status); + + return E_NOTIMPL; +} + +static const IMFTransformVtbl color_converter_vtbl = +{ + color_converter_QueryInterface, + color_converter_AddRef, + color_converter_Release, + color_converter_GetStreamLimits, + color_converter_GetStreamCount, + color_converter_GetStreamIDs, + color_converter_GetInputStreamInfo, + color_converter_GetOutputStreamInfo, + color_converter_GetAttributes, + color_converter_GetInputStreamAttributes, + color_converter_GetOutputStreamAttributes, + color_converter_DeleteInputStream, + color_converter_AddInputStreams, + color_converter_GetInputAvailableType, + color_converter_GetOutputAvailableType, + color_converter_SetInputType, + color_converter_SetOutputType, + color_converter_GetInputCurrentType, + color_converter_GetOutputCurrentType, + color_converter_GetInputStatus, + color_converter_GetOutputStatus, + color_converter_SetOutputBounds, + color_converter_ProcessEvent, + color_converter_ProcessMessage, + color_converter_ProcessInput, + color_converter_ProcessOutput, +}; + +HRESULT color_converter_create(REFIID riid, void **ret) +{ + struct color_converter *object; + + TRACE("%s %p\n", debugstr_guid(riid), ret); + + if (!(object = heap_alloc_zero(sizeof(*object)))) + return E_OUTOFMEMORY; + + object->IMFTransform_iface.lpVtbl = &color_converter_vtbl; + object->refcount = 1; + + *ret = &object->IMFTransform_iface; + return S_OK; +} diff --git a/dlls/winegstreamer/gst_private.h b/dlls/winegstreamer/gst_private.h index 14b6a011ac2..075e0ce1f0f 100644 --- a/dlls/winegstreamer/gst_private.h +++ b/dlls/winegstreamer/gst_private.h @@ -87,5 +87,6 @@ GstBuffer *gst_buffer_from_mf_sample(IMFSample *in) DECLSPEC_HIDDEN; HRESULT winegstreamer_stream_handler_create(REFIID riid, void **obj) DECLSPEC_HIDDEN; HRESULT audio_converter_create(REFIID riid, void **ret) DECLSPEC_HIDDEN; +HRESULT color_converter_create(REFIID riid, void **ret) DECLSPEC_HIDDEN; #endif /* __GST_PRIVATE_INCLUDED__ */ diff --git a/dlls/winegstreamer/mfplat.c b/dlls/winegstreamer/mfplat.c index b2b5b247dac..5ec408eea34 100644 --- a/dlls/winegstreamer/mfplat.c +++ b/dlls/winegstreamer/mfplat.c @@ -26,6 +26,7 @@ #include "gst_private.h" #include "mfapi.h" #include "mfidl.h" +#include "wmcodecdsp.h" #include "wine/debug.h" #include "wine/heap.h" @@ -417,6 +418,7 @@ class_objects[] = { &CLSID_VideoProcessorMFT, &video_processor_create }, { &CLSID_GStreamerByteStreamHandler, &winegstreamer_stream_handler_create }, { &CLSID_WINEAudioConverter, &audio_converter_create }, + { &CLSID_CColorConvertDMO, &color_converter_create }, }; HRESULT mfplat_get_class_object(REFCLSID rclsid, REFIID riid, void **obj) diff --git a/dlls/winegstreamer/winegstreamer_classes.idl b/dlls/winegstreamer/winegstreamer_classes.idl index cf1fc69f38a..47c10a09cf0 100644 --- a/dlls/winegstreamer/winegstreamer_classes.idl +++ b/dlls/winegstreamer/winegstreamer_classes.idl @@ -67,3 +67,9 @@ coclass GStreamerByteStreamHandler {} uuid(6a170414-aad9-4693-b806-3a0c47c570d6) ] coclass WINEAudioConverter { } + +[ + threading(both), + uuid(2be8b27f-cd60-4b8a-95ae-d174cc5cbaa7) +] +coclass WINEColorConverter { } diff --git a/include/wmcodecdsp.idl b/include/wmcodecdsp.idl index 61381bee6d4..87305422332 100644 --- a/include/wmcodecdsp.idl +++ b/include/wmcodecdsp.idl @@ -30,3 +30,8 @@ coclass CMP3DecMediaObject {} uuid(f447b69e-1884-4a7e-8055-346f74d6edb3) ] coclass CResamplerMediaObject {} + +[ + uuid(98230571-0087-4204-b020-3282538e57d3) +] +coclass CColorConvertDMO {} -- 2.29.2

Dec. 4, 2020

[PATCH v2 06/17] winegstreamer: Implement Get(Input/Output)CurrentType functions for audio converter transform.

by Derek Lesho

Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> --- dlls/winegstreamer/audioconvert.c | 56 ++++++++++++++++++++++++++++--- 1 file changed, 52 insertions(+), 4 deletions(-) diff --git a/dlls/winegstreamer/audioconvert.c b/dlls/winegstreamer/audioconvert.c index 4b9f4f92b9a..f22bcfe67e4 100644 --- a/dlls/winegstreamer/audioconvert.c +++ b/dlls/winegstreamer/audioconvert.c @@ -495,16 +495,64 @@ static HRESULT WINAPI audio_converter_SetOutputType(IMFTransform *iface, DWORD i static HRESULT WINAPI audio_converter_GetInputCurrentType(IMFTransform *iface, DWORD id, IMFMediaType **type) { - FIXME("%p, %u, %p.\n", iface, id, type); + struct audio_converter *converter = impl_audio_converter_from_IMFTransform(iface); + IMFMediaType *ret; + HRESULT hr; - return E_NOTIMPL; + TRACE("%p, %u, %p.\n", converter, id, type); + + if (id != 0) + return MF_E_INVALIDSTREAMNUMBER; + + if (FAILED(hr = MFCreateMediaType(&ret))) + return hr; + + EnterCriticalSection(&converter->cs); + + if (converter->input_type) + hr = IMFMediaType_CopyAllItems(converter->input_type, (IMFAttributes *)ret); + else + hr = MF_E_TRANSFORM_TYPE_NOT_SET; + + LeaveCriticalSection(&converter->cs); + + if (SUCCEEDED(hr)) + *type = ret; + else + IMFMediaType_Release(ret); + + return hr; } static HRESULT WINAPI audio_converter_GetOutputCurrentType(IMFTransform *iface, DWORD id, IMFMediaType **type) { - FIXME("%p, %u, %p.\n", iface, id, type); + struct audio_converter *converter = impl_audio_converter_from_IMFTransform(iface); + IMFMediaType *ret; + HRESULT hr; - return E_NOTIMPL; + TRACE("%p, %u, %p.\n", converter, id, type); + + if (id != 0) + return MF_E_INVALIDSTREAMNUMBER; + + if (FAILED(hr = MFCreateMediaType(&ret))) + return hr; + + EnterCriticalSection(&converter->cs); + + if (converter->output_type) + hr = IMFMediaType_CopyAllItems(converter->output_type, (IMFAttributes *)ret); + else + hr = MF_E_TRANSFORM_TYPE_NOT_SET; + + LeaveCriticalSection(&converter->cs); + + if (SUCCEEDED(hr)) + *type = ret; + else + IMFMediaType_Release(ret); + + return hr; } static HRESULT WINAPI audio_converter_GetInputStatus(IMFTransform *iface, DWORD id, DWORD *flags) -- 2.29.2

Dec. 4, 2020

[PATCH v2 05/17] winegstreamer: Semi-stub Get*Attributes functions for audio converter transform.

by Derek Lesho

Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> --- dlls/winegstreamer/audioconvert.c | 37 +++++++++++++++++++++++++++---- 1 file changed, 33 insertions(+), 4 deletions(-) diff --git a/dlls/winegstreamer/audioconvert.c b/dlls/winegstreamer/audioconvert.c index 6f30902f38b..4b9f4f92b9a 100644 --- a/dlls/winegstreamer/audioconvert.c +++ b/dlls/winegstreamer/audioconvert.c @@ -37,6 +37,8 @@ struct audio_converter { IMFTransform IMFTransform_iface; LONG refcount; + IMFAttributes *attributes; + IMFAttributes *output_attributes; IMFMediaType *input_type; IMFMediaType *output_type; CRITICAL_SECTION cs; @@ -87,6 +89,10 @@ static ULONG WINAPI audio_converter_Release(IMFTransform *iface) { transform->cs.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&transform->cs); + if (transform->attributes) + IMFAttributes_Release(transform->attributes); + if (transform->output_attributes) + IMFAttributes_Release(transform->output_attributes); gst_object_unref(transform->container); heap_free(transform); } @@ -155,9 +161,14 @@ static HRESULT WINAPI audio_converter_GetOutputStreamInfo(IMFTransform *iface, D static HRESULT WINAPI audio_converter_GetAttributes(IMFTransform *iface, IMFAttributes **attributes) { - FIXME("%p, %p.\n", iface, attributes); + struct audio_converter *converter = impl_audio_converter_from_IMFTransform(iface); - return E_NOTIMPL; + TRACE("%p, %p.\n", iface, attributes); + + *attributes = converter->attributes; + IMFAttributes_AddRef(*attributes); + + return S_OK; } static HRESULT WINAPI audio_converter_GetInputStreamAttributes(IMFTransform *iface, DWORD id, @@ -171,9 +182,14 @@ static HRESULT WINAPI audio_converter_GetInputStreamAttributes(IMFTransform *ifa static HRESULT WINAPI audio_converter_GetOutputStreamAttributes(IMFTransform *iface, DWORD id, IMFAttributes **attributes) { - FIXME("%p, %u, %p.\n", iface, id, attributes); + struct audio_converter *converter = impl_audio_converter_from_IMFTransform(iface); - return E_NOTIMPL; + TRACE("%p, %u, %p.\n", iface, id, attributes); + + *attributes = converter->output_attributes; + IMFAttributes_AddRef(*attributes); + + return S_OK; } static HRESULT WINAPI audio_converter_DeleteInputStream(IMFTransform *iface, DWORD id) @@ -667,6 +683,7 @@ HRESULT audio_converter_create(REFIID riid, void **ret) { GstElement *audioconvert, *resampler; struct audio_converter *object; + HRESULT hr; TRACE("%s %p\n", debugstr_guid(riid), ret); @@ -679,6 +696,18 @@ HRESULT audio_converter_create(REFIID riid, void **ret) InitializeCriticalSection(&object->cs); object->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": audio_converter_lock"); + if (FAILED(hr = MFCreateAttributes(&object->attributes, 0))) + { + IMFTransform_Release(&object->IMFTransform_iface); + return hr; + } + + if (FAILED(hr = MFCreateAttributes(&object->output_attributes, 0))) + { + IMFTransform_Release(&object->IMFTransform_iface); + return hr; + } + object->container = gst_bin_new(NULL); if (!(object->appsrc = gst_element_factory_make("appsrc", NULL))) -- 2.29.2

Dec. 4, 2020

[PATCH v2 04/17] winegstreamer: Implement ::Get(Input/Output)StreamInfo for audio conversion transform.

by Derek Lesho

Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> --- v2: - Set MFT_OUTPUT_STREAM_WHOLE_SAMPLES for consistency. - Set cbSize. --- dlls/winegstreamer/audioconvert.c | 26 ++++++++++++++++++++++---- 1 file changed, 22 insertions(+), 4 deletions(-) diff --git a/dlls/winegstreamer/audioconvert.c b/dlls/winegstreamer/audioconvert.c index 8537e87ade3..6f30902f38b 100644 --- a/dlls/winegstreamer/audioconvert.c +++ b/dlls/winegstreamer/audioconvert.c @@ -123,16 +123,34 @@ static HRESULT WINAPI audio_converter_GetStreamIDs(IMFTransform *iface, DWORD in static HRESULT WINAPI audio_converter_GetInputStreamInfo(IMFTransform *iface, DWORD id, MFT_INPUT_STREAM_INFO *info) { - FIXME("%p %u %p.\n", iface, id, info); + TRACE("%p %u %p.\n", iface, id, info); - return E_NOTIMPL; + if (id != 0) + return MF_E_INVALIDSTREAMNUMBER; + + info->dwFlags = MFT_INPUT_STREAM_WHOLE_SAMPLES | MFT_INPUT_STREAM_DOES_NOT_ADDREF; + info->cbMaxLookahead = 0; + info->cbAlignment = 0; + info->hnsMaxLatency = 0; + /* TODO: this can be calculated using MFCalculateImageSize */ + info->cbSize = 0; + + return S_OK; } static HRESULT WINAPI audio_converter_GetOutputStreamInfo(IMFTransform *iface, DWORD id, MFT_OUTPUT_STREAM_INFO *info) { - FIXME("%p %u %p.\n", iface, id, info); + TRACE("%p %u %p.\n", iface, id, info); - return E_NOTIMPL; + if (id != 0) + return MF_E_INVALIDSTREAMNUMBER; + + info->dwFlags = MFT_OUTPUT_STREAM_PROVIDES_SAMPLES | MFT_OUTPUT_STREAM_WHOLE_SAMPLES; + info->cbAlignment = 0; + /* TODO: this can be calculated using MFCalculateImageSize */ + info->cbSize = 0; + + return S_OK; } static HRESULT WINAPI audio_converter_GetAttributes(IMFTransform *iface, IMFAttributes **attributes) -- 2.29.2

Dec. 4, 2020

[PATCH v2 03/17] winegstreamer: Implement ::Process(Input/Output) for audio conversion transform.

by Derek Lesho

Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> --- v2: - Don't store intermediate elements in object structure. - Reset 'inflight' when I/O types change. - Cleanup redundant error logging. - Address nits. --- dlls/winegstreamer/audioconvert.c | 188 ++++++++++++++++++++++++++++-- dlls/winegstreamer/gst_private.h | 1 + dlls/winegstreamer/mfplat.c | 69 +++++++++++ 3 files changed, 250 insertions(+), 8 deletions(-) diff --git a/dlls/winegstreamer/audioconvert.c b/dlls/winegstreamer/audioconvert.c index a79ab616720..8537e87ade3 100644 --- a/dlls/winegstreamer/audioconvert.c +++ b/dlls/winegstreamer/audioconvert.c @@ -40,6 +40,8 @@ struct audio_converter IMFMediaType *input_type; IMFMediaType *output_type; CRITICAL_SECTION cs; + BOOL inflight; + GstElement *container, *appsrc, *appsink; }; static struct audio_converter *impl_audio_converter_from_IMFTransform(IMFTransform *iface) @@ -85,6 +87,7 @@ static ULONG WINAPI audio_converter_Release(IMFTransform *iface) { transform->cs.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&transform->cs); + gst_object_unref(transform->container); heap_free(transform); } @@ -295,6 +298,9 @@ static HRESULT WINAPI audio_converter_SetInputType(IMFTransform *iface, DWORD id EnterCriticalSection(&converter->cs); + converter->inflight = FALSE; + gst_element_set_state(converter->container, GST_STATE_READY); + if (converter->input_type) { IMFMediaType_Release(converter->input_type); @@ -326,14 +332,17 @@ static HRESULT WINAPI audio_converter_SetInputType(IMFTransform *iface, DWORD id if (!(input_caps = caps_from_mf_media_type(type))) return MF_E_INVALIDTYPE; - gst_caps_unref(input_caps); - if (flags & MFT_SET_TYPE_TEST_ONLY) + { + gst_caps_unref(input_caps); return S_OK; + } EnterCriticalSection(&converter->cs); hr = S_OK; + converter->inflight = FALSE; + gst_element_set_state(converter->container, GST_STATE_READY); if (!converter->input_type) hr = MFCreateMediaType(&converter->input_type); @@ -341,12 +350,18 @@ static HRESULT WINAPI audio_converter_SetInputType(IMFTransform *iface, DWORD id if (SUCCEEDED(hr)) hr = IMFMediaType_CopyAllItems(type, (IMFAttributes *) converter->input_type); + g_object_set(converter->appsrc, "caps", input_caps, NULL); + gst_caps_unref(input_caps); + if (FAILED(hr)) { IMFMediaType_Release(converter->input_type); converter->input_type = NULL; } + if (converter->input_type && converter->output_type) + gst_element_set_state(converter->container, GST_STATE_PLAYING); + LeaveCriticalSection(&converter->cs); return hr; @@ -375,6 +390,9 @@ static HRESULT WINAPI audio_converter_SetOutputType(IMFTransform *iface, DWORD i EnterCriticalSection(&converter->cs); + converter->inflight = FALSE; + gst_element_set_state(converter->container, GST_STATE_READY); + if (converter->output_type) { IMFMediaType_Release(converter->output_type); @@ -406,14 +424,17 @@ static HRESULT WINAPI audio_converter_SetOutputType(IMFTransform *iface, DWORD i if (!(output_caps = caps_from_mf_media_type(type))) return MF_E_INVALIDTYPE; - gst_caps_unref(output_caps); - if (flags & MFT_SET_TYPE_TEST_ONLY) + { + gst_caps_unref(output_caps); return S_OK; + } EnterCriticalSection(&converter->cs); hr = S_OK; + converter->inflight = FALSE; + gst_element_set_state(converter->container, GST_STATE_READY); if (!converter->output_type) hr = MFCreateMediaType(&converter->output_type); @@ -421,12 +442,18 @@ static HRESULT WINAPI audio_converter_SetOutputType(IMFTransform *iface, DWORD i if (SUCCEEDED(hr)) hr = IMFMediaType_CopyAllItems(type, (IMFAttributes *) converter->output_type); + g_object_set(converter->appsink, "caps", output_caps, NULL); + gst_caps_unref(output_caps); + if (FAILED(hr)) { IMFMediaType_Release(converter->output_type); converter->output_type = NULL; } + if (converter->input_type && converter->output_type) + gst_element_set_state(converter->container, GST_STATE_PLAYING); + LeaveCriticalSection(&converter->cs); return hr; @@ -490,17 +517,102 @@ static HRESULT WINAPI audio_converter_ProcessMessage(IMFTransform *iface, MFT_ME static HRESULT WINAPI audio_converter_ProcessInput(IMFTransform *iface, DWORD id, IMFSample *sample, DWORD flags) { - FIXME("%p, %u, %p, %#x.\n", iface, id, sample, flags); + GstBuffer *gst_buffer; + int ret; - return E_NOTIMPL; + struct audio_converter *converter = impl_audio_converter_from_IMFTransform(iface); + + TRACE("%p, %u, %p, %#x.\n", iface, id, sample, flags); + + if (flags) + WARN("Unsupported flags %#x\n", flags); + + if (id != 0) + return MF_E_INVALIDSTREAMNUMBER; + + EnterCriticalSection(&converter->cs); + + if (!converter->input_type || !converter->output_type) + { + LeaveCriticalSection(&converter->cs); + return MF_E_TRANSFORM_TYPE_NOT_SET; + } + + if (converter->inflight) + { + LeaveCriticalSection(&converter->cs); + return MF_E_NOTACCEPTING; + } + + if (!(gst_buffer = gst_buffer_from_mf_sample(sample))) + { + LeaveCriticalSection(&converter->cs); + return E_FAIL; + } + + g_signal_emit_by_name(converter->appsrc, "push-buffer", gst_buffer, &ret); + gst_buffer_unref(gst_buffer); + if (ret != GST_FLOW_OK) + { + ERR("Couldn't push buffer ret, (%s)\n", gst_flow_get_name(ret)); + LeaveCriticalSection(&converter->cs); + return E_FAIL; + } + + converter->inflight = TRUE; + LeaveCriticalSection(&converter->cs); + + return S_OK; } static HRESULT WINAPI audio_converter_ProcessOutput(IMFTransform *iface, DWORD flags, DWORD count, MFT_OUTPUT_DATA_BUFFER *samples, DWORD *status) { - FIXME("%p, %#x, %u, %p, %p.\n", iface, flags, count, samples, status); + GstSample *sample; - return E_NOTIMPL; + struct audio_converter *converter = impl_audio_converter_from_IMFTransform(iface); + + TRACE("%p, %#x, %u, %p, %p.\n", iface, flags, count, samples, status); + + if (flags) + WARN("Unsupported flags %#x\n", flags); + + if (!count) + return S_OK; + + if (count != 1) + return MF_E_INVALIDSTREAMNUMBER; + + if (samples[0].dwStreamID != 0) + return MF_E_INVALIDSTREAMNUMBER; + + EnterCriticalSection(&converter->cs); + + if (!converter->input_type || !converter->output_type) + { + LeaveCriticalSection(&converter->cs); + return MF_E_TRANSFORM_TYPE_NOT_SET; + } + + if (!converter->inflight) + { + LeaveCriticalSection(&converter->cs); + return MF_E_TRANSFORM_NEED_MORE_INPUT; + } + + g_signal_emit_by_name(converter->appsink, "pull-sample", &sample); + + converter->inflight = FALSE; + + samples[0].pSample = mf_sample_from_gst_buffer(gst_sample_get_buffer(sample)); + gst_sample_unref(sample); + samples[0].dwStatus = S_OK; + samples[0].pEvents = NULL; + *status = 0; + + LeaveCriticalSection(&converter->cs); + + return S_OK; } static const IMFTransformVtbl audio_converter_vtbl = @@ -535,6 +647,7 @@ static const IMFTransformVtbl audio_converter_vtbl = HRESULT audio_converter_create(REFIID riid, void **ret) { + GstElement *audioconvert, *resampler; struct audio_converter *object; TRACE("%s %p\n", debugstr_guid(riid), ret); @@ -548,6 +661,65 @@ HRESULT audio_converter_create(REFIID riid, void **ret) InitializeCriticalSection(&object->cs); object->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": audio_converter_lock"); + object->container = gst_bin_new(NULL); + + if (!(object->appsrc = gst_element_factory_make("appsrc", NULL))) + { + ERR("Failed to create appsrc, are %u-bit Gstreamer \"base\" plugins installed?\n", + 8 * (int)sizeof(void *)); + IMFTransform_Release(&object->IMFTransform_iface); + return E_FAIL; + } + gst_bin_add(GST_BIN(object->container), object->appsrc); + + if (!(audioconvert = gst_element_factory_make("audioconvert", NULL))) + { + ERR("Failed to create audioconvert, are %u-bit Gstreamer \"base\" plugins installed?\n", + 8 * (int)sizeof(void *)); + IMFTransform_Release(&object->IMFTransform_iface); + return E_FAIL; + } + gst_bin_add(GST_BIN(object->container), audioconvert); + + if (!(resampler = gst_element_factory_make("audioresample", NULL))) + { + ERR("Failed to create audioresample, are %u-bit Gstreamer \"base\" plugins installed?\n", + 8 * (int)sizeof(void *)); + IMFTransform_Release(&object->IMFTransform_iface); + return E_FAIL; + } + gst_bin_add(GST_BIN(object->container), resampler); + + if (!(object->appsink = gst_element_factory_make("appsink", NULL))) + { + ERR("Failed to create appsink, are %u-bit Gstreamer \"base\" plugins installed?\n", + 8 * (int)sizeof(void *)); + IMFTransform_Release(&object->IMFTransform_iface); + return E_FAIL; + } + gst_bin_add(GST_BIN(object->container), object->appsink); + + if (!gst_element_link(object->appsrc, audioconvert)) + { + ERR("Failed to link appsrc to audioconvert\n"); + IMFTransform_Release(&object->IMFTransform_iface); + return E_FAIL; + } + + if (!gst_element_link(audioconvert, resampler)) + { + ERR("Failed to link audioconvert to resampler\n"); + IMFTransform_Release(&object->IMFTransform_iface); + return E_FAIL; + } + + if (!gst_element_link(resampler, object->appsink)) + { + ERR("Failed to link resampler to appsink\n"); + IMFTransform_Release(&object->IMFTransform_iface); + return E_FAIL; + } + *ret = &object->IMFTransform_iface; return S_OK; } diff --git a/dlls/winegstreamer/gst_private.h b/dlls/winegstreamer/gst_private.h index 9518f721504..14b6a011ac2 100644 --- a/dlls/winegstreamer/gst_private.h +++ b/dlls/winegstreamer/gst_private.h @@ -82,6 +82,7 @@ HRESULT winegstreamer_stream_handler_create(REFIID riid, void **obj) DECLSPEC_HI IMFMediaType *mf_media_type_from_caps(const GstCaps *caps) DECLSPEC_HIDDEN; GstCaps *caps_from_mf_media_type(IMFMediaType *type) DECLSPEC_HIDDEN; IMFSample *mf_sample_from_gst_buffer(GstBuffer *in) DECLSPEC_HIDDEN; +GstBuffer *gst_buffer_from_mf_sample(IMFSample *in) DECLSPEC_HIDDEN; HRESULT winegstreamer_stream_handler_create(REFIID riid, void **obj) DECLSPEC_HIDDEN; diff --git a/dlls/winegstreamer/mfplat.c b/dlls/winegstreamer/mfplat.c index f300988fc5c..b2b5b247dac 100644 --- a/dlls/winegstreamer/mfplat.c +++ b/dlls/winegstreamer/mfplat.c @@ -865,3 +865,72 @@ done: return out; } + +GstBuffer *gst_buffer_from_mf_sample(IMFSample *mf_sample) +{ + GstBuffer *out = gst_buffer_new(); + IMFMediaBuffer *mf_buffer = NULL; + LONGLONG duration, time; + DWORD buffer_count; + unsigned int i; + HRESULT hr; + + if (FAILED(hr = IMFSample_GetSampleDuration(mf_sample, &duration))) + goto fail; + + if (FAILED(hr = IMFSample_GetSampleTime(mf_sample, &time))) + goto fail; + + GST_BUFFER_DURATION(out) = duration; + GST_BUFFER_PTS(out) = time * 100; + + if (FAILED(hr = IMFSample_GetBufferCount(mf_sample, &buffer_count))) + goto fail; + + for (i = 0; i < buffer_count; i++) + { + DWORD buffer_size; + GstMapInfo map_info; + GstMemory *memory; + BYTE *buf_data; + + if (FAILED(hr = IMFSample_GetBufferByIndex(mf_sample, i, &mf_buffer))) + goto fail; + + if (FAILED(hr = IMFMediaBuffer_GetCurrentLength(mf_buffer, &buffer_size))) + goto fail; + + memory = gst_allocator_alloc(NULL, buffer_size, NULL); + gst_memory_resize(memory, 0, buffer_size); + + if (!gst_memory_map(memory, &map_info, GST_MAP_WRITE)) + { + hr = E_FAIL; + goto fail; + } + + if (FAILED(hr = IMFMediaBuffer_Lock(mf_buffer, &buf_data, NULL, NULL))) + goto fail; + + memcpy(map_info.data, buf_data, buffer_size); + + if (FAILED(hr = IMFMediaBuffer_Unlock(mf_buffer))) + goto fail; + + gst_memory_unmap(memory, &map_info); + + gst_buffer_append_memory(out, memory); + + IMFMediaBuffer_Release(mf_buffer); + mf_buffer = NULL; + } + + return out; + +fail: + ERR("Failed to copy IMFSample to GstBuffer, hr = %#x\n", hr); + if (mf_buffer) + IMFMediaBuffer_Release(mf_buffer); + gst_buffer_unref(out); + return NULL; +} -- 2.29.2

Dec. 4, 2020

[PATCH v2 02/17] winegstreamer: Implement ::SetOutputType for audio conversion transform.

by Derek Lesho

Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> --- v2: Reorganize function to avoid having a conditionally initialized variable. --- dlls/winegstreamer/audioconvert.c | 78 ++++++++++++++++++++++++++++++- 1 file changed, 76 insertions(+), 2 deletions(-) diff --git a/dlls/winegstreamer/audioconvert.c b/dlls/winegstreamer/audioconvert.c index 4d8a4836bc6..a79ab616720 100644 --- a/dlls/winegstreamer/audioconvert.c +++ b/dlls/winegstreamer/audioconvert.c @@ -38,6 +38,7 @@ struct audio_converter IMFTransform IMFTransform_iface; LONG refcount; IMFMediaType *input_type; + IMFMediaType *output_type; CRITICAL_SECTION cs; }; @@ -353,9 +354,82 @@ static HRESULT WINAPI audio_converter_SetInputType(IMFTransform *iface, DWORD id static HRESULT WINAPI audio_converter_SetOutputType(IMFTransform *iface, DWORD id, IMFMediaType *type, DWORD flags) { - FIXME("%p, %u, %p, %#x.\n", iface, id, type, flags); + struct audio_converter *converter = impl_audio_converter_from_IMFTransform(iface); + GUID major_type, subtype; + GstCaps *output_caps; + DWORD unused; + HRESULT hr; - return E_NOTIMPL; + TRACE("%p, %u, %p, %#x.\n", iface, id, type, flags); + + if (id != 0) + return MF_E_INVALIDSTREAMNUMBER; + + if (!converter->input_type) + return MF_E_TRANSFORM_TYPE_NOT_SET; + + if (!type) + { + if (flags & MFT_SET_TYPE_TEST_ONLY) + return S_OK; + + EnterCriticalSection(&converter->cs); + + if (converter->output_type) + { + IMFMediaType_Release(converter->output_type); + converter->output_type = NULL; + } + + LeaveCriticalSection(&converter->cs); + + return S_OK; + } + + if (FAILED(IMFMediaType_GetGUID(type, &MF_MT_MAJOR_TYPE, &major_type))) + return MF_E_INVALIDTYPE; + if (FAILED(IMFMediaType_GetGUID(type, &MF_MT_SUBTYPE, &subtype))) + return MF_E_INVALIDTYPE; + if (FAILED(IMFMediaType_GetUINT32(type, &MF_MT_AUDIO_NUM_CHANNELS, &unused))) + return MF_E_INVALIDTYPE; + if (IsEqualGUID(&subtype, &MFAudioFormat_PCM) && FAILED(IMFMediaType_GetUINT32(type, &MF_MT_AUDIO_BITS_PER_SAMPLE, &unused))) + return MF_E_INVALIDTYPE; + if (FAILED(IMFMediaType_GetUINT32(type, &MF_MT_AUDIO_SAMPLES_PER_SECOND, &unused))) + return MF_E_INVALIDTYPE; + + if (!(IsEqualGUID(&major_type, &MFMediaType_Audio))) + return MF_E_INVALIDTYPE; + + if (!IsEqualGUID(&subtype, &MFAudioFormat_PCM) && !IsEqualGUID(&subtype, &MFAudioFormat_Float)) + return MF_E_INVALIDTYPE; + + if (!(output_caps = caps_from_mf_media_type(type))) + return MF_E_INVALIDTYPE; + + gst_caps_unref(output_caps); + + if (flags & MFT_SET_TYPE_TEST_ONLY) + return S_OK; + + EnterCriticalSection(&converter->cs); + + hr = S_OK; + + if (!converter->output_type) + hr = MFCreateMediaType(&converter->output_type); + + if (SUCCEEDED(hr)) + hr = IMFMediaType_CopyAllItems(type, (IMFAttributes *) converter->output_type); + + if (FAILED(hr)) + { + IMFMediaType_Release(converter->output_type); + converter->output_type = NULL; + } + + LeaveCriticalSection(&converter->cs); + + return hr; } static HRESULT WINAPI audio_converter_GetInputCurrentType(IMFTransform *iface, DWORD id, IMFMediaType **type) -- 2.29.2

Dec. 4, 2020

[PATCH v2 01/17] winegstreamer: Implement ::SetInputType for audio conversion transform.

by Derek Lesho

Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> --- v2: Reorganize function to avoid having a conditionally initialized variable. --- dlls/winegstreamer/audioconvert.c | 83 ++++++++++++++++++++++++++++++- 1 file changed, 81 insertions(+), 2 deletions(-) diff --git a/dlls/winegstreamer/audioconvert.c b/dlls/winegstreamer/audioconvert.c index 9499920347f..4d8a4836bc6 100644 --- a/dlls/winegstreamer/audioconvert.c +++ b/dlls/winegstreamer/audioconvert.c @@ -18,6 +18,7 @@ */ #include "config.h" +#include <gst/gst.h> #include "gst_private.h" @@ -36,6 +37,8 @@ struct audio_converter { IMFTransform IMFTransform_iface; LONG refcount; + IMFMediaType *input_type; + CRITICAL_SECTION cs; }; static struct audio_converter *impl_audio_converter_from_IMFTransform(IMFTransform *iface) @@ -79,6 +82,8 @@ static ULONG WINAPI audio_converter_Release(IMFTransform *iface) if (!refcount) { + transform->cs.DebugInfo->Spare[0] = 0; + DeleteCriticalSection(&transform->cs); heap_free(transform); } @@ -270,9 +275,80 @@ fail: static HRESULT WINAPI audio_converter_SetInputType(IMFTransform *iface, DWORD id, IMFMediaType *type, DWORD flags) { - FIXME("%p, %u, %p, %#x.\n", iface, id, type, flags); + GUID major_type, subtype; + GstCaps *input_caps; + DWORD unused; + HRESULT hr; - return E_NOTIMPL; + struct audio_converter *converter = impl_audio_converter_from_IMFTransform(iface); + + TRACE("%p, %u, %p, %#x.\n", iface, id, type, flags); + + if (id != 0) + return MF_E_INVALIDSTREAMNUMBER; + + if (!type) + { + if (flags & MFT_SET_TYPE_TEST_ONLY) + return S_OK; + + EnterCriticalSection(&converter->cs); + + if (converter->input_type) + { + IMFMediaType_Release(converter->input_type); + converter->input_type = NULL; + } + + LeaveCriticalSection(&converter->cs); + + return S_OK; + } + + if (FAILED(IMFMediaType_GetGUID(type, &MF_MT_MAJOR_TYPE, &major_type))) + return MF_E_INVALIDTYPE; + if (FAILED(IMFMediaType_GetGUID(type, &MF_MT_SUBTYPE, &subtype))) + return MF_E_INVALIDTYPE; + if (FAILED(IMFMediaType_GetUINT32(type, &MF_MT_AUDIO_SAMPLES_PER_SECOND, &unused))) + return MF_E_INVALIDTYPE; + if (FAILED(IMFMediaType_GetUINT32(type, &MF_MT_AUDIO_NUM_CHANNELS, &unused))) + return MF_E_INVALIDTYPE; + if (IsEqualGUID(&subtype, &MFAudioFormat_PCM) && FAILED(IMFMediaType_GetUINT32(type, &MF_MT_AUDIO_BITS_PER_SAMPLE, &unused))) + return MF_E_INVALIDTYPE; + + if (!(IsEqualGUID(&major_type, &MFMediaType_Audio))) + return MF_E_INVALIDTYPE; + + if (!IsEqualGUID(&subtype, &MFAudioFormat_PCM) && !IsEqualGUID(&subtype, &MFAudioFormat_Float)) + return MF_E_INVALIDTYPE; + + if (!(input_caps = caps_from_mf_media_type(type))) + return MF_E_INVALIDTYPE; + + gst_caps_unref(input_caps); + + if (flags & MFT_SET_TYPE_TEST_ONLY) + return S_OK; + + EnterCriticalSection(&converter->cs); + + hr = S_OK; + + if (!converter->input_type) + hr = MFCreateMediaType(&converter->input_type); + + if (SUCCEEDED(hr)) + hr = IMFMediaType_CopyAllItems(type, (IMFAttributes *) converter->input_type); + + if (FAILED(hr)) + { + IMFMediaType_Release(converter->input_type); + converter->input_type = NULL; + } + + LeaveCriticalSection(&converter->cs); + + return hr; } static HRESULT WINAPI audio_converter_SetOutputType(IMFTransform *iface, DWORD id, IMFMediaType *type, DWORD flags) @@ -395,6 +471,9 @@ HRESULT audio_converter_create(REFIID riid, void **ret) object->IMFTransform_iface.lpVtbl = &audio_converter_vtbl; object->refcount = 1; + InitializeCriticalSection(&object->cs); + object->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": audio_converter_lock"); + *ret = &object->IMFTransform_iface; return S_OK; } -- 2.29.2

Dec. 4, 2020

[PATCH 11/11] msvcrt: Remove separate long double math funtions.

by Piotr Caban

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcr120/msvcr120.spec | 50 ++++----- dlls/msvcrt/math.c | 195 ------------------------------------ dlls/ucrtbase/ucrtbase.spec | 92 ++++++++--------- 3 files changed, 71 insertions(+), 266 deletions(-)

Dec. 4, 2020

[PATCH 10/11] msvcrt: Use _configthreadlocale arguments definition from public header.

by Piotr Caban

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/locale.c | 8 ++++---- dlls/msvcrt/msvcrt.h | 3 --- include/msvcrt/locale.h | 12 ++++++++++++ 3 files changed, 16 insertions(+), 7 deletions(-)

Dec. 4, 2020

[PATCH 09/11] msvcrt: Remove non-needed function declarations from msvcrt.h.

by Piotr Caban

Dec. 4, 2020

[PATCH 08/11] msvcrt: Remove non-needed defines from msvcrt.h.

by Piotr Caban

Dec. 4, 2020

[PATCH 07/11] msvcrt: Use _stat64 definition from public header.

by Piotr Caban

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/file.c | 4 ++-- dlls/msvcrt/msvcrt.h | 56 -------------------------------------------- 2 files changed, 2 insertions(+), 58 deletions(-)

Dec. 4, 2020

[PATCH 06/11] msvcrt: Use _finddata_t definition from public header.

by Piotr Caban

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/dir.c | 42 +++++++++++++-------- dlls/msvcrt/msvcrt.h | 88 -------------------------------------------- 2 files changed, 27 insertions(+), 103 deletions(-)

Dec. 4, 2020

[PATCH 05/11] include: Add corecrt_io.h header.

by Piotr Caban

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- include/msvcrt/corecrt_io.h | 109 ++++++++++++++++++++++++++++++++++++ 1 file changed, 109 insertions(+) create mode 100644 include/msvcrt/corecrt_io.h

Dec. 4, 2020

[PATCH 04/11] msvcrt: Use _JUMP_BUFFER from public header.

by Piotr Caban

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/except_arm.c | 3 +- dlls/msvcrt/except_arm64.c | 3 +- dlls/msvcrt/except_i386.c | 15 ++++--- dlls/msvcrt/except_x86_64.c | 3 +- dlls/msvcrt/msvcrt.h | 86 ------------------------------------- 5 files changed, 14 insertions(+), 96 deletions(-)

Dec. 4, 2020

[PATCH 03/11] msvcrt: Use _Dcomplex definition from public header.

by Piotr Caban

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/math.c | 7 ++++--- dlls/msvcrt/msvcrt.h | 2 -- include/msvcrt/complex.h | 27 +++++++++++++++++++++++++++ 3 files changed, 31 insertions(+), 5 deletions(-) create mode 100644 include/msvcrt/complex.h

Dec. 4, 2020

[PATCH 02/11] msvcrt: Use _purecall_handler from public header.

by Piotr Caban

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/exit.c | 8 ++++---- dlls/msvcrt/msvcrt.h | 1 - include/msvcrt/stdlib.h | 4 ++++ 3 files changed, 8 insertions(+), 5 deletions(-)

Dec. 4, 2020

[PATCH 01/11] msvcrt: Use _invalid_parameter_handler from public header.

by Piotr Caban

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/errno.c | 18 +++++++++--------- dlls/msvcrt/msvcrt.h | 3 +-- 2 files changed, 10 insertions(+), 11 deletions(-)

Dec. 4, 2020

Re: [PATCH] bcrypt: Add initial support for asymmetric keys in BCryptDecrypt().

by Hans Leidekker

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com>

Dec. 4, 2020

[PATCH 4/4] wined3d: Handle GL_APPLE_flush_buffer_range flushing in wined3d_context_gl_unmap_bo_address().

by Henri Verbeet

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/buffer.c | 27 --------------------------- dlls/wined3d/context_gl.c | 9 +++++++++ 2 files changed, 9 insertions(+), 27 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index c752b329a32..6ff6a5b6cd0 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -32,7 +32,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d); #define WINED3D_BUFFER_HASDESC 0x01 /* A vertex description has been found. */ #define WINED3D_BUFFER_USE_BO 0x02 /* Use a buffer object for this buffer. */ #define WINED3D_BUFFER_PIN_SYSMEM 0x04 /* Keep a system memory copy for this buffer. */ -#define WINED3D_BUFFER_APPLESYNC 0x10 /* Using sync as in GL_APPLE_flush_buffer_range. */ #define VB_MAXDECLCHANGES 100 /* After that number of decl changes we stop converting */ #define VB_RESETDECLCHANGE 1000 /* Reset the decl changecount after that number of draws */ @@ -160,8 +159,6 @@ static void wined3d_buffer_gl_destroy_buffer_object(struct wined3d_buffer_gl *bu list_remove(&buffer_gl->bo_user.entry); wined3d_context_gl_destroy_bo(context_gl, &buffer_gl->bo); buffer_gl->b.buffer_object = 0; - - buffer_gl->b.flags &= ~WINED3D_BUFFER_APPLESYNC; } /* Context activation is done by the caller. */ @@ -196,9 +193,6 @@ static BOOL wined3d_buffer_gl_create_buffer_object(struct wined3d_buffer_gl *buf return FALSE; } - if (!coherent && gl_info->supported[APPLE_FLUSH_BUFFER_RANGE]) - buffer_gl->b.flags |= WINED3D_BUFFER_APPLESYNC; - list_init(&buffer_gl->bo_user.entry); list_add_head(&buffer_gl->bo.users, &buffer_gl->bo_user.entry); buffer_gl->b.buffer_object = (uintptr_t)bo; @@ -988,27 +982,6 @@ static HRESULT buffer_resource_sub_resource_unmap(struct wined3d_resource *resou context = context_acquire(device, NULL, 0); - if (buffer->flags & WINED3D_BUFFER_APPLESYNC) - { - struct wined3d_context_gl *context_gl; - const struct wined3d_gl_info *gl_info; - struct wined3d_buffer_gl *buffer_gl; - unsigned int i; - - buffer_gl = wined3d_buffer_gl(buffer); - context_gl = wined3d_context_gl(context); - gl_info = context_gl->gl_info; - - wined3d_buffer_gl_bind(buffer_gl, context_gl); - for (i = 0; i < range_count; ++i) - { - GL_EXTCALL(glFlushMappedBufferRangeAPPLE(buffer_gl->bo.binding, - buffer->maps[i].offset, buffer->maps[i].size)); - checkGLcall("glFlushMappedBufferRangeAPPLE"); - } - range_count = 0; - } - addr.buffer_object = buffer->buffer_object; addr.addr = 0; wined3d_context_unmap_bo_address(context, &addr, range_count, buffer->maps); diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c index f2f6185ecc6..ea12778e292 100644 --- a/dlls/wined3d/context_gl.c +++ b/dlls/wined3d/context_gl.c @@ -2743,6 +2743,15 @@ void wined3d_context_gl_unmap_bo_address(struct wined3d_context_gl *context_gl, (UINT_PTR)data->addr + ranges[i].offset, ranges[i].size)); } } + else if (!bo->coherent && gl_info->supported[APPLE_FLUSH_BUFFER_RANGE]) + { + for (i = 0; i < range_count; ++i) + { + GL_EXTCALL(glFlushMappedBufferRangeAPPLE(bo->binding, + (uintptr_t)data->addr + ranges[i].offset, ranges[i].size)); + checkGLcall("glFlushMappedBufferRangeAPPLE"); + } + } GL_EXTCALL(glUnmapBuffer(bo->binding)); wined3d_context_gl_bind_bo(context_gl, bo->binding, 0); -- 2.20.1

Dec. 4, 2020

[PATCH 3/4] wined3d: Get rid of redundant DISCARD filtering.

by Henri Verbeet

Now that we handle DISCARD maps ourselves, this happens implicitly. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/buffer.c | 24 ------------------------ 1 file changed, 24 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index acedc1a183e..c752b329a32 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -32,7 +32,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d); #define WINED3D_BUFFER_HASDESC 0x01 /* A vertex description has been found. */ #define WINED3D_BUFFER_USE_BO 0x02 /* Use a buffer object for this buffer. */ #define WINED3D_BUFFER_PIN_SYSMEM 0x04 /* Keep a system memory copy for this buffer. */ -#define WINED3D_BUFFER_DISCARD 0x08 /* A DISCARD lock has occurred since the last preload. */ #define WINED3D_BUFFER_APPLESYNC 0x10 /* Using sync as in GL_APPLE_flush_buffer_range. */ #define VB_MAXDECLCHANGES 100 /* After that number of decl changes we stop converting */ @@ -714,11 +713,6 @@ void * CDECL wined3d_buffer_get_parent(const struct wined3d_buffer *buffer) return buffer->resource.parent; } -static void buffer_mark_used(struct wined3d_buffer *buffer) -{ - buffer->flags &= ~WINED3D_BUFFER_DISCARD; -} - /* Context activation is done by the caller. */ void wined3d_buffer_load(struct wined3d_buffer *buffer, struct wined3d_context *context, const struct wined3d_state *state) @@ -738,8 +732,6 @@ void wined3d_buffer_load(struct wined3d_buffer *buffer, struct wined3d_context * WARN("Loading mapped buffer.\n"); } - buffer_mark_used(buffer); - /* TODO: Make converting independent from VBOs */ if (!(buffer->flags & WINED3D_BUFFER_USE_BO)) { @@ -921,16 +913,6 @@ static HRESULT buffer_resource_sub_resource_map(struct wined3d_resource *resourc if (count == 1) { - /* Filter redundant WINED3D_MAP_DISCARD maps. The 3DMark2001 - * multitexture fill rate test seems to depend on this. When - * we map a buffer with GL_MAP_INVALIDATE_BUFFER_BIT, the - * driver is free to discard the previous contents of the - * buffer. The r600g driver only does this when the buffer is - * currently in use, while the proprietary NVIDIA driver - * appears to do this unconditionally. */ - if (buffer->flags & WINED3D_BUFFER_DISCARD) - flags &= ~WINED3D_MAP_DISCARD; - addr.buffer_object = buffer->buffer_object; addr.addr = 0; buffer->map_ptr = wined3d_context_map_bo_address(context, &addr, resource->size, flags); @@ -962,9 +944,6 @@ static HRESULT buffer_resource_sub_resource_map(struct wined3d_resource *resourc context_release(context); } - - if (flags & WINED3D_MAP_DISCARD) - buffer->flags |= WINED3D_BUFFER_DISCARD; } base = buffer->map_ptr ? buffer->map_ptr : resource->heap_memory; @@ -1052,9 +1031,6 @@ void wined3d_buffer_copy(struct wined3d_buffer *dst_buffer, unsigned int dst_off TRACE("dst_buffer %p, dst_offset %u, src_buffer %p, src_offset %u, size %u.\n", dst_buffer, dst_offset, src_buffer, src_offset, size); - buffer_mark_used(dst_buffer); - buffer_mark_used(src_buffer); - dst_location = wined3d_buffer_get_memory(dst_buffer, &dst, dst_buffer->locations); dst.addr += dst_offset; -- 2.20.1

Dec. 4, 2020

[PATCH 2/4] wined3d: Allocate a new bo for busy DISCARD maps.

by Henri Verbeet

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/adapter_gl.c | 2 + dlls/wined3d/buffer.c | 26 ------------ dlls/wined3d/context_gl.c | 72 ++++++++++++++++++++++++++++------ dlls/wined3d/resource.c | 5 +-- dlls/wined3d/view.c | 25 +++++++++++- dlls/wined3d/wined3d_private.h | 9 +++++ 6 files changed, 95 insertions(+), 44 deletions(-) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index 4781622d530..b6be5854714 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -4867,6 +4867,7 @@ static void adapter_gl_destroy_shader_resource_view(struct wined3d_shader_resour * the refcount on a device that's in the process of being destroyed. */ if (swapchain_count) wined3d_device_incref(device); + list_remove(&view_gl->bo_user.entry); wined3d_shader_resource_view_cleanup(&view_gl->v); wined3d_view_gl_destroy(device, &view_gl->gl_view, NULL, view_gl); if (swapchain_count) @@ -4913,6 +4914,7 @@ static void adapter_gl_destroy_unordered_access_view(struct wined3d_unordered_ac * the refcount on a device that's in the process of being destroyed. */ if (swapchain_count) wined3d_device_incref(device); + list_remove(&view_gl->bo_user.entry); wined3d_unordered_access_view_cleanup(&view_gl->v); wined3d_view_gl_destroy(device, &view_gl->gl_view, &view_gl->counter_bo, view_gl); if (swapchain_count) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index e179f202cb8..acedc1a183e 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -714,29 +714,6 @@ void * CDECL wined3d_buffer_get_parent(const struct wined3d_buffer *buffer) return buffer->resource.parent; } -/* The caller provides a context and binds the buffer */ -static void wined3d_buffer_gl_sync_apple(struct wined3d_buffer_gl *buffer_gl, - uint32_t flags, struct wined3d_context_gl *context_gl) -{ - const struct wined3d_gl_info *gl_info = context_gl->gl_info; - struct wined3d_bo_gl *bo = &buffer_gl->bo; - - /* No fencing needs to be done if the app promises not to overwrite - * existing data. */ - if (flags & WINED3D_MAP_NOOVERWRITE) - return; - - if (flags & WINED3D_MAP_DISCARD) - { - wined3d_buffer_gl_bind(buffer_gl, context_gl); - - GL_EXTCALL(glBufferData(bo->binding, buffer_gl->b.resource.size, NULL, bo->usage)); - checkGLcall("glBufferData"); - bo->command_fence_id = 0; - return; - } -} - static void buffer_mark_used(struct wined3d_buffer *buffer) { buffer->flags &= ~WINED3D_BUFFER_DISCARD; @@ -954,9 +931,6 @@ static HRESULT buffer_resource_sub_resource_map(struct wined3d_resource *resourc if (buffer->flags & WINED3D_BUFFER_DISCARD) flags &= ~WINED3D_MAP_DISCARD; - if (buffer->flags & WINED3D_BUFFER_APPLESYNC) - wined3d_buffer_gl_sync_apple(wined3d_buffer_gl(buffer), flags, wined3d_context_gl(context)); - addr.buffer_object = buffer->buffer_object; addr.addr = 0; buffer->map_ptr = wined3d_context_map_bo_address(context, &addr, resource->size, flags); diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c index 305ca0507ff..f2f6185ecc6 100644 --- a/dlls/wined3d/context_gl.c +++ b/dlls/wined3d/context_gl.c @@ -2650,20 +2650,39 @@ void wined3d_context_gl_submit_command_fence(struct wined3d_context_gl *context_ wined3d_context_gl_poll_fences(context_gl); } -void *wined3d_context_gl_map_bo_address(struct wined3d_context_gl *context_gl, - const struct wined3d_bo_address *data, size_t size, uint32_t flags) +static void *wined3d_bo_gl_map(struct wined3d_bo_gl *bo, + struct wined3d_context_gl *context_gl, size_t offset, size_t size, uint32_t flags) { struct wined3d_device_gl *device_gl = wined3d_device_gl(context_gl->c.device); const struct wined3d_gl_info *gl_info; - struct wined3d_bo_gl *bo; - BYTE *memory; + struct wined3d_bo_user *bo_user; + struct wined3d_bo_gl tmp; + uint8_t *map_ptr; - if (!(bo = (struct wined3d_bo_gl *)data->buffer_object)) - return data->addr; - - if (flags & (WINED3D_MAP_DISCARD | WINED3D_MAP_NOOVERWRITE)) + if (flags & WINED3D_MAP_NOOVERWRITE) goto map; + if ((flags & WINED3D_MAP_DISCARD) && bo->command_fence_id > device_gl->completed_fence_id) + { + if (wined3d_context_gl_create_bo(context_gl, bo->size, + bo->binding, bo->usage, bo->coherent, bo->flags, &tmp)) + { + list_move_head(&tmp.users, &bo->users); + wined3d_context_gl_destroy_bo(context_gl, bo); + *bo = tmp; + list_init(&bo->users); + list_move_head(&bo->users, &tmp.users); + LIST_FOR_EACH_ENTRY(bo_user, &bo->users, struct wined3d_bo_user, entry) + { + bo_user->valid = false; + } + + goto map; + } + + ERR("Failed to create new buffer object.\n"); + } + if (bo->command_fence_id == device_gl->current_fence_id) wined3d_context_gl_submit_command_fence(context_gl); wined3d_context_gl_wait_command_fence(context_gl, bo->command_fence_id); @@ -2674,19 +2693,33 @@ map: if (gl_info->supported[ARB_MAP_BUFFER_RANGE]) { - memory = GL_EXTCALL(glMapBufferRange(bo->binding, (INT_PTR)data->addr, - size, wined3d_resource_gl_map_flags(flags))); + map_ptr = GL_EXTCALL(glMapBufferRange(bo->binding, offset, size, wined3d_resource_gl_map_flags(flags))); } else { - memory = GL_EXTCALL(glMapBuffer(bo->binding, wined3d_resource_gl_legacy_map_flags(flags))); - memory += (INT_PTR)data->addr; + map_ptr = GL_EXTCALL(glMapBuffer(bo->binding, wined3d_resource_gl_legacy_map_flags(flags))); + map_ptr += offset; } wined3d_context_gl_bind_bo(context_gl, bo->binding, 0); checkGLcall("Map buffer object"); - return memory; + return map_ptr; +} + +void *wined3d_context_gl_map_bo_address(struct wined3d_context_gl *context_gl, + const struct wined3d_bo_address *data, size_t size, uint32_t flags) +{ + struct wined3d_bo_gl *bo; + void *map_ptr; + + if (!(bo = (struct wined3d_bo_gl *)data->buffer_object)) + return data->addr; + + if (!(map_ptr = wined3d_bo_gl_map(bo, context_gl, (uintptr_t)data->addr, size, flags))) + ERR("Failed to map bo.\n"); + + return map_ptr; } void wined3d_context_gl_unmap_bo_address(struct wined3d_context_gl *context_gl, @@ -2821,8 +2854,11 @@ bool wined3d_context_gl_create_bo(struct wined3d_context_gl *context_gl, GLsizei TRACE("Created buffer object %u.\n", id); bo->id = id; + bo->size = size; bo->binding = binding; bo->usage = usage; + bo->flags = flags; + bo->coherent = coherent; list_init(&bo->users); bo->command_fence_id = 0; @@ -3698,6 +3734,7 @@ static void context_gl_load_shader_resources(struct wined3d_context_gl *context_ const struct wined3d_state *state, unsigned int shader_mask) { struct wined3d_shader_sampler_map_entry *entry; + struct wined3d_shader_resource_view_gl *srv_gl; struct wined3d_shader_resource_view *view; struct wined3d_buffer_gl *buffer_gl; struct wined3d_shader *shader; @@ -3735,6 +3772,10 @@ static void context_gl_load_shader_resources(struct wined3d_context_gl *context_ buffer_gl = wined3d_buffer_gl(buffer_from_resource(view->resource)); wined3d_buffer_load(&buffer_gl->b, &context_gl->c, state); wined3d_context_gl_reference_bo(context_gl, &buffer_gl->bo); + + srv_gl = wined3d_shader_resource_view_gl(view); + if (!srv_gl->bo_user.valid) + wined3d_shader_resource_view_gl_update(srv_gl, context_gl); } else { @@ -3747,6 +3788,7 @@ static void context_gl_load_shader_resources(struct wined3d_context_gl *context_ static void context_gl_load_unordered_access_resources(struct wined3d_context_gl *context_gl, const struct wined3d_shader *shader, struct wined3d_unordered_access_view * const *views) { + struct wined3d_unordered_access_view_gl *uav_gl; struct wined3d_unordered_access_view *view; struct wined3d_buffer_gl *buffer_gl; struct wined3d_texture *texture; @@ -3768,6 +3810,10 @@ static void context_gl_load_unordered_access_resources(struct wined3d_context_gl wined3d_buffer_load_location(&buffer_gl->b, &context_gl->c, WINED3D_LOCATION_BUFFER); wined3d_unordered_access_view_invalidate_location(view, ~WINED3D_LOCATION_BUFFER); wined3d_context_gl_reference_bo(context_gl, &buffer_gl->bo); + + uav_gl = wined3d_unordered_access_view_gl(view); + if (!uav_gl->bo_user.valid) + wined3d_unordered_access_view_gl_update(uav_gl, context_gl); } else { diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index f6e233d8057..2b2088ab771 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -451,12 +451,9 @@ GLbitfield wined3d_resource_gl_map_flags(DWORD d3d_flags) ret |= GL_MAP_WRITE_BIT | GL_MAP_FLUSH_EXPLICIT_BIT; if (d3d_flags & WINED3D_MAP_READ) ret |= GL_MAP_READ_BIT; - else if (!(d3d_flags & WINED3D_MAP_DISCARD)) + else ret |= GL_MAP_UNSYNCHRONIZED_BIT; - if (d3d_flags & WINED3D_MAP_DISCARD) - ret |= GL_MAP_INVALIDATE_BUFFER_BIT; - return ret; } diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index 1abbbac4fb4..f2c8ceab461 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -268,7 +268,8 @@ static void create_buffer_texture(struct wined3d_gl_view *view, struct wined3d_c wined3d_buffer_load_location(&buffer_gl->b, &context_gl->c, WINED3D_LOCATION_BUFFER); view->target = GL_TEXTURE_BUFFER; - gl_info->gl_ops.gl.p_glGenTextures(1, &view->name); + if (!view->name) + gl_info->gl_ops.gl.p_glGenTextures(1, &view->name); wined3d_context_gl_bind_texture(context_gl, GL_TEXTURE_BUFFER, view->name); if (gl_info->supported[ARB_TEXTURE_BUFFER_RANGE]) @@ -916,6 +917,14 @@ void * CDECL wined3d_shader_resource_view_get_parent(const struct wined3d_shader return view->parent; } +void wined3d_shader_resource_view_gl_update(struct wined3d_shader_resource_view_gl *srv_gl, + struct wined3d_context_gl *context_gl) +{ + create_buffer_view(&srv_gl->gl_view, &context_gl->c, &srv_gl->v.desc, + buffer_from_resource(srv_gl->v.resource), srv_gl->v.format); + srv_gl->bo_user.valid = true; +} + static void wined3d_shader_resource_view_gl_cs_init(void *object) { struct wined3d_shader_resource_view_gl *view_gl = object; @@ -936,6 +945,8 @@ static void wined3d_shader_resource_view_gl_cs_init(void *object) context = context_acquire(resource->device, NULL, 0); create_buffer_view(&view_gl->gl_view, context, desc, buffer, view_format); + view_gl->bo_user.valid = true; + list_add_head(&wined3d_buffer_gl(buffer)->bo.users, &view_gl->bo_user.entry); context_release(context); } else @@ -1006,6 +1017,7 @@ HRESULT wined3d_shader_resource_view_gl_init(struct wined3d_shader_resource_view if (FAILED(hr = wined3d_shader_resource_view_init(&view_gl->v, desc, resource, parent, parent_ops))) return hr; + list_init(&view_gl->bo_user.entry); wined3d_cs_init_object(resource->device->cs, wined3d_shader_resource_view_gl_cs_init, view_gl); return hr; @@ -1394,6 +1406,14 @@ void wined3d_unordered_access_view_copy_counter(struct wined3d_unordered_access_ wined3d_buffer_invalidate_location(buffer, ~dst_location); } +void wined3d_unordered_access_view_gl_update(struct wined3d_unordered_access_view_gl *uav_gl, + struct wined3d_context_gl *context_gl) +{ + create_buffer_view(&uav_gl->gl_view, &context_gl->c, &uav_gl->v.desc, + buffer_from_resource(uav_gl->v.resource), uav_gl->v.format); + uav_gl->bo_user.valid = true; +} + static void wined3d_unordered_access_view_gl_cs_init(void *object) { struct wined3d_unordered_access_view_gl *view_gl = object; @@ -1410,6 +1430,8 @@ static void wined3d_unordered_access_view_gl_cs_init(void *object) context_gl = wined3d_context_gl(context_acquire(resource->device, NULL, 0)); create_buffer_view(&view_gl->gl_view, &context_gl->c, desc, buffer, view_gl->v.format); + view_gl->bo_user.valid = true; + list_add_head(&wined3d_buffer_gl(buffer)->bo.users, &view_gl->bo_user.entry); if (desc->flags & (WINED3D_VIEW_BUFFER_COUNTER | WINED3D_VIEW_BUFFER_APPEND)) { struct wined3d_bo_gl *bo = &view_gl->counter_bo; @@ -1470,6 +1492,7 @@ HRESULT wined3d_unordered_access_view_gl_init(struct wined3d_unordered_access_vi if (FAILED(hr = wined3d_unordered_access_view_init(&view_gl->v, desc, resource, parent, parent_ops))) return hr; + list_init(&view_gl->bo_user.entry); wined3d_cs_init_object(resource->device->cs, wined3d_unordered_access_view_gl_cs_init, view_gl); return hr; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 67a55c4dedd..a82defbbe7f 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1572,9 +1572,12 @@ do { \ struct wined3d_bo_gl { GLuint id; + GLsizeiptr size; GLenum binding; GLenum usage; + GLbitfield flags; + bool coherent; struct list users; uint64_t command_fence_id; }; @@ -5014,6 +5017,7 @@ void shader_resource_view_generate_mipmaps(struct wined3d_shader_resource_view * struct wined3d_shader_resource_view_gl { struct wined3d_shader_resource_view v; + struct wined3d_bo_user bo_user; struct wined3d_gl_view gl_view; }; @@ -5028,6 +5032,8 @@ void wined3d_shader_resource_view_gl_bind(struct wined3d_shader_resource_view_gl HRESULT wined3d_shader_resource_view_gl_init(struct wined3d_shader_resource_view_gl *view_gl, const struct wined3d_view_desc *desc, struct wined3d_resource *resource, void *parent, const struct wined3d_parent_ops *parent_ops) DECLSPEC_HIDDEN; +void wined3d_shader_resource_view_gl_update(struct wined3d_shader_resource_view_gl *srv_gl, + struct wined3d_context_gl *context_gl) DECLSPEC_HIDDEN; struct wined3d_view_vk { @@ -5083,6 +5089,7 @@ void wined3d_unordered_access_view_set_counter(struct wined3d_unordered_access_v struct wined3d_unordered_access_view_gl { struct wined3d_unordered_access_view v; + struct wined3d_bo_user bo_user; struct wined3d_gl_view gl_view; struct wined3d_bo_gl counter_bo; }; @@ -5098,6 +5105,8 @@ void wined3d_unordered_access_view_gl_clear_uint(struct wined3d_unordered_access HRESULT wined3d_unordered_access_view_gl_init(struct wined3d_unordered_access_view_gl *view_gl, const struct wined3d_view_desc *desc, struct wined3d_resource *resource, void *parent, const struct wined3d_parent_ops *parent_ops) DECLSPEC_HIDDEN; +void wined3d_unordered_access_view_gl_update(struct wined3d_unordered_access_view_gl *uav_gl, + struct wined3d_context_gl *context_gl) DECLSPEC_HIDDEN; struct wined3d_unordered_access_view_vk { -- 2.20.1

Dec. 4, 2020