July 2024 - Wine-commits - list.winehq.org

Rémi Bernon : win32u: Use the thread message queue shared memory in NtUserGetQueueStatus.
by Alexandre Julliard 01 Jul '24

01 Jul '24

Module: wine Branch: master Commit: 8b5cad9e58be283eb473fcc0b7fe722c47a75fba URL: https://gitlab.winehq.org/wine/wine/-/commit/8b5cad9e58be283eb473fcc0b7fe72… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Jun 26 16:18:22 2024 +0200 win32u: Use the thread message queue shared memory in NtUserGetQueueStatus. --- dlls/win32u/input.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/win32u/input.c b/dlls/win32u/input.c index 999cce23715..8356e97e238 100644 --- a/dlls/win32u/input.c +++ b/dlls/win32u/input.c @@ -866,7 +866,7 @@ static BOOL get_shared_queue_bits( UINT *wake_bits, UINT *changed_bits ) */ DWORD WINAPI NtUserGetQueueStatus( UINT flags ) { - DWORD ret; + UINT ret, wake_bits, changed_bits; if (flags & ~(QS_ALLINPUT | QS_ALLPOSTMESSAGE | QS_SMRESULT)) { @@ -876,7 +876,9 @@ DWORD WINAPI NtUserGetQueueStatus( UINT flags ) check_for_events( flags ); - SERVER_START_REQ( get_queue_status ) + if (get_shared_queue_bits( &wake_bits, &changed_bits ) && !(changed_bits & flags)) + ret = MAKELONG( changed_bits & flags, wake_bits & flags ); + else SERVER_START_REQ( get_queue_status ) { req->clear_bits = flags; wine_server_call( req );

1 0

Rémi Bernon : win32u: Use the thread message queue shared memory in wait_message_reply.
by Alexandre Julliard 01 Jul '24

01 Jul '24

Module: wine Branch: master Commit: 1933020c05899d16f5df8e2fb860b797d8fd259f URL: https://gitlab.winehq.org/wine/wine/-/commit/1933020c05899d16f5df8e2fb860b7… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Jun 26 16:16:56 2024 +0200 win32u: Use the thread message queue shared memory in wait_message_reply. --- dlls/win32u/message.c | 44 +++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 41 insertions(+), 3 deletions(-) diff --git a/dlls/win32u/message.c b/dlls/win32u/message.c index d8cb6f395b2..2f5ffc3a538 100644 --- a/dlls/win32u/message.c +++ b/dlls/win32u/message.c @@ -2643,6 +2643,40 @@ static BOOL process_hardware_message( MSG *msg, UINT hw_id, const struct hardwar return ret; } +/*********************************************************************** + * check_queue_bits + * + * returns TRUE and the queue wake bits and changed bits if we can skip a server request + * returns FALSE if we need to make a server request to update the queue masks or bits + */ +static BOOL check_queue_bits( UINT wake_mask, UINT changed_mask, UINT signal_bits, UINT clear_bits, + UINT *wake_bits, UINT *changed_bits ) +{ + struct object_lock lock = OBJECT_LOCK_INIT; + const queue_shm_t *queue_shm; + BOOL skip = FALSE; + UINT status; + + while ((status = get_shared_queue( &lock, &queue_shm )) == STATUS_PENDING) + { + /* if the masks need an update */ + if (queue_shm->wake_mask != wake_mask) skip = FALSE; + else if (queue_shm->changed_mask != changed_mask) skip = FALSE; + /* or if some bits need to be cleared, or queue is signaled */ + else if (queue_shm->wake_bits & signal_bits) skip = FALSE; + else if (queue_shm->changed_bits & clear_bits) skip = FALSE; + else + { + *wake_bits = queue_shm->wake_bits; + *changed_bits = queue_shm->changed_bits; + skip = TRUE; + } + } + + if (status) return FALSE; + return skip; +} + /*********************************************************************** * peek_message * @@ -3326,14 +3360,18 @@ static void wait_message_reply( UINT flags ) for (;;) { - unsigned int wake_bits = 0; + UINT wake_bits, changed_bits; - SERVER_START_REQ( set_queue_mask ) + if (check_queue_bits( wake_mask, wake_mask, wake_mask, wake_mask, + &wake_bits, &changed_bits )) + wake_bits = wake_bits & wake_mask; + else SERVER_START_REQ( set_queue_mask ) { req->wake_mask = wake_mask; req->changed_mask = wake_mask; req->skip_wait = 1; - if (!wine_server_call( req )) wake_bits = reply->wake_bits & wake_mask; + wine_server_call( req ); + wake_bits = reply->wake_bits & wake_mask; } SERVER_END_REQ;

1 0

Rémi Bernon : mf/session: Don't update transform output type if not needed.
by Alexandre Julliard 01 Jul '24

01 Jul '24

Module: wine Branch: master Commit: fbd7bd516767f5f005096b261d7fe83e5d2c64d7 URL: https://gitlab.winehq.org/wine/wine/-/commit/fbd7bd516767f5f005096b261d7fe8… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed May 15 11:30:15 2024 +0200 mf/session: Don't update transform output type if not needed. --- dlls/mf/session.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/mf/session.c b/dlls/mf/session.c index dc9578ce86b..611e3675b1d 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -3348,6 +3348,13 @@ static HRESULT transform_stream_update_input_type(struct topo_node *node, UINT i struct transform_stream *stream = &node->u.transform.outputs[output]; UINT id = transform_node_get_stream_id(node, TRUE, output); + /* check if transform output type is still valid or if we need to update it as well */ + if (SUCCEEDED(hr = IMFTransform_GetOutputCurrentType(node->object.transform, id, &new_output_type))) + { + IMFMediaType_Release(new_output_type); + continue; + } + if (SUCCEEDED(hr = transform_stream_update_output_type(node, stream, id, old_output_types[output], &new_output_type))) {

1 0

Rémi Bernon : mf/session: Implement D3D device manager propagation.
by Alexandre Julliard 01 Jul '24

01 Jul '24

Module: wine Branch: master Commit: c6723f8592f040d296f3f957ad479056abccfe8a URL: https://gitlab.winehq.org/wine/wine/-/commit/c6723f8592f040d296f3f957ad4790… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon May 13 18:04:48 2024 +0200 mf/session: Implement D3D device manager propagation. --- dlls/mf/mf_private.h | 3 ++ dlls/mf/session.c | 17 +++++++ dlls/mf/tests/topology.c | 24 ++++----- dlls/mf/topology_loader.c | 126 ++++++++++++++++++++++++++++++++++++++-------- 4 files changed, 136 insertions(+), 34 deletions(-)

1 0

Rémi Bernon : winegstreamer: Translate GstCaps directly to MFVIDEOFORMAT / WAVEFORMATEX in wg_transform.
by Alexandre Julliard 01 Jul '24

01 Jul '24

Module: wine Branch: master Commit: fbceb9e60b3fa4c3009abd4e639c5ab8cc0a75c3 URL: https://gitlab.winehq.org/wine/wine/-/commit/fbceb9e60b3fa4c3009abd4e639c5a… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri May 10 13:07:26 2024 +0200 winegstreamer: Translate GstCaps directly to MFVIDEOFORMAT / WAVEFORMATEX in wg_transform. --- dlls/winegstreamer/Makefile.in | 1 + dlls/winegstreamer/gst_private.h | 2 +- dlls/winegstreamer/main.c | 63 ++++- dlls/winegstreamer/unix_private.h | 9 +- dlls/winegstreamer/unixlib.h | 37 ++- dlls/winegstreamer/video_decoder.c | 10 +- dlls/winegstreamer/wg_format.c | 2 +- dlls/winegstreamer/wg_media_type.c | 461 +++++++++++++++++++++++++++++++++++++ dlls/winegstreamer/wg_parser.c | 31 ++- dlls/winegstreamer/wg_transform.c | 33 +-- 10 files changed, 597 insertions(+), 52 deletions(-)

1 0

Rémi Bernon : winegstreamer: Translate MFVIDEOFORMAT / WAVEFORMATEX directly to GstCaps in wg_transform.
by Alexandre Julliard 01 Jul '24

01 Jul '24

Module: wine Branch: master Commit: 0906f6957a4a7f48f915fe841a6be7ce68c86c94 URL: https://gitlab.winehq.org/wine/wine/-/commit/0906f6957a4a7f48f915fe841a6be7… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue May 7 18:28:07 2024 +0200 winegstreamer: Translate MFVIDEOFORMAT / WAVEFORMATEX directly to GstCaps in wg_transform. --- dlls/winegstreamer/gst_private.h | 2 +- dlls/winegstreamer/main.c | 83 ++++++++- dlls/winegstreamer/unix_private.h | 3 +- dlls/winegstreamer/unixlib.h | 6 +- dlls/winegstreamer/video_decoder.c | 20 +- dlls/winegstreamer/wg_media_type.c | 365 +++++++++++++++++++++++++++++++++++++ dlls/winegstreamer/wg_parser.c | 19 +- dlls/winegstreamer/wg_transform.c | 15 +- 8 files changed, 476 insertions(+), 37 deletions(-)

1 0

Rémi Bernon : winegstreamer: Create transforms from MFVIDEOFORMAT / WAVEFORMATEX.
by Alexandre Julliard 01 Jul '24

01 Jul '24

Module: wine Branch: master Commit: 9192b3b724d90788f7a1682b3f9eedb7bf363e22 URL: https://gitlab.winehq.org/wine/wine/-/commit/9192b3b724d90788f7a1682b3f9eed… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon May 6 11:28:42 2024 +0200 winegstreamer: Create transforms from MFVIDEOFORMAT / WAVEFORMATEX. Instead of going through a custom intermediate format. --- dlls/winegstreamer/gst_private.h | 2 - dlls/winegstreamer/main.c | 133 ++++++++++++++------------ dlls/winegstreamer/quartz_transform.c | 25 ++--- dlls/winegstreamer/unixlib.h | 6 +- dlls/winegstreamer/wg_parser.c | 22 +++-- dlls/winegstreamer/wg_transform.c | 171 +++++++++++++--------------------- 6 files changed, 168 insertions(+), 191 deletions(-)

1 0

Ziqing Hui : winegstreamer/video_encoder: Implement GetInputAvailableType.
by Alexandre Julliard 01 Jul '24

01 Jul '24

Module: wine Branch: master Commit: 758af39175c06b864f22d96c49259053a456c010 URL: https://gitlab.winehq.org/wine/wine/-/commit/758af39175c06b864f22d96c492590… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Fri Jun 28 14:05:04 2024 +0800 winegstreamer/video_encoder: Implement GetInputAvailableType. --- dlls/winegstreamer/video_encoder.c | 67 ++++++++++++++++++++++++++++++++++---- 1 file changed, 61 insertions(+), 6 deletions(-) diff --git a/dlls/winegstreamer/video_encoder.c b/dlls/winegstreamer/video_encoder.c index 0c54bc543a2..b374b919f92 100644 --- a/dlls/winegstreamer/video_encoder.c +++ b/dlls/winegstreamer/video_encoder.c @@ -38,6 +38,8 @@ struct video_encoder IMFTransform IMFTransform_iface; LONG refcount; + const GUID *const *input_types; + UINT input_type_count; const GUID *const *output_types; UINT output_type_count; @@ -174,8 +176,51 @@ static HRESULT WINAPI transform_AddInputStreams(IMFTransform *iface, DWORD strea static HRESULT WINAPI transform_GetInputAvailableType(IMFTransform *iface, DWORD id, DWORD index, IMFMediaType **type) { - FIXME("iface %p, id %#lx, index %#lx, type %p.\n", iface, id, index, type); - return E_NOTIMPL; + struct video_encoder *encoder = impl_from_IMFTransform(iface); + IMFVideoMediaType *input_type; + UINT64 ratio; + UINT32 value; + HRESULT hr; + + TRACE("iface %p, id %#lx, index %#lx, type %p.\n", iface, id, index, type); + + *type = NULL; + + if (!encoder->output_type) + return MF_E_TRANSFORM_TYPE_NOT_SET; + if (index >= encoder->input_type_count) + return MF_E_NO_MORE_TYPES; + + if (!(hr = MFCreateVideoMediaTypeFromSubtype(encoder->input_types[index], &input_type))) + return hr; + + if (FAILED(hr = IMFMediaType_GetUINT64(encoder->output_type, &MF_MT_FRAME_SIZE, &ratio)) + || FAILED(hr = IMFVideoMediaType_SetUINT64(input_type, &MF_MT_FRAME_SIZE, ratio))) + goto done; + + if (FAILED(hr = IMFMediaType_GetUINT64(encoder->output_type, &MF_MT_FRAME_RATE, &ratio)) + || FAILED(hr = IMFVideoMediaType_SetUINT64(input_type, &MF_MT_FRAME_RATE, ratio))) + goto done; + + if (FAILED(hr = IMFMediaType_GetUINT32(encoder->output_type, &MF_MT_INTERLACE_MODE, &value)) + || FAILED(hr = IMFVideoMediaType_SetUINT32(input_type, &MF_MT_INTERLACE_MODE, value))) + goto done; + + if (FAILED(IMFMediaType_GetUINT32(encoder->output_type, &MF_MT_VIDEO_NOMINAL_RANGE, &value))) + value = MFNominalRange_Wide; + if (FAILED(hr = IMFVideoMediaType_SetUINT32(input_type, &MF_MT_VIDEO_NOMINAL_RANGE, value))) + goto done; + + if (FAILED(IMFMediaType_GetUINT64(encoder->output_type, &MF_MT_PIXEL_ASPECT_RATIO, &ratio))) + ratio = (UINT64)1 << 32 | 1; + if (FAILED(hr = IMFVideoMediaType_SetUINT64(input_type, &MF_MT_PIXEL_ASPECT_RATIO, ratio))) + goto done; + + IMFMediaType_AddRef((*type = (IMFMediaType *)input_type)); + +done: + IMFVideoMediaType_Release(input_type); + return hr; } static HRESULT WINAPI transform_GetOutputAvailableType(IMFTransform *iface, DWORD id, @@ -345,8 +390,8 @@ static const IMFTransformVtbl transform_vtbl = transform_ProcessOutput, }; -static HRESULT video_encoder_create(const GUID *const *output_types, UINT output_type_count, - struct video_encoder **out) +static HRESULT video_encoder_create(const GUID *const *input_types, UINT input_type_count, + const GUID *const *output_types, UINT output_type_count, struct video_encoder **out) { struct video_encoder *encoder; HRESULT hr; @@ -357,6 +402,8 @@ static HRESULT video_encoder_create(const GUID *const *output_types, UINT output encoder->IMFTransform_iface.lpVtbl = &transform_vtbl; encoder->refcount = 1; + encoder->input_types = input_types; + encoder->input_type_count = input_type_count; encoder->output_types = output_types; encoder->output_type_count = output_type_count; @@ -376,6 +423,14 @@ failed: return hr; } +static const GUID *const h264_encoder_input_types[] = +{ + &MFVideoFormat_IYUV, + &MFVideoFormat_YV12, + &MFVideoFormat_NV12, + &MFVideoFormat_YUY2, +}; + static const GUID *const h264_encoder_output_types[] = { &MFVideoFormat_H264, @@ -406,8 +461,8 @@ HRESULT h264_encoder_create(REFIID riid, void **out) return hr; } - if (FAILED(hr = video_encoder_create(h264_encoder_output_types, ARRAY_SIZE(h264_encoder_output_types), - &encoder))) + if (FAILED(hr = video_encoder_create(h264_encoder_input_types, ARRAY_SIZE(h264_encoder_input_types), + h264_encoder_output_types, ARRAY_SIZE(h264_encoder_output_types), &encoder))) return hr; TRACE("Created h264 encoder transform %p.\n", &encoder->IMFTransform_iface);

1 0

Ziqing Hui : winegstreamer/video_encoder: Implement SetInputType.
by Alexandre Julliard 01 Jul '24

01 Jul '24

Module: wine Branch: master Commit: 6f22111a9f630dd823cbb1bc9700f63f87b24419 URL: https://gitlab.winehq.org/wine/wine/-/commit/6f22111a9f630dd823cbb1bc9700f6… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Fri Jun 28 14:14:30 2024 +0800 winegstreamer/video_encoder: Implement SetInputType. --- dlls/winegstreamer/video_encoder.c | 56 ++++++++++++++++++++++++++++++++++++-- 1 file changed, 54 insertions(+), 2 deletions(-) diff --git a/dlls/winegstreamer/video_encoder.c b/dlls/winegstreamer/video_encoder.c index b374b919f92..a78cbfffdc5 100644 --- a/dlls/winegstreamer/video_encoder.c +++ b/dlls/winegstreamer/video_encoder.c @@ -43,6 +43,7 @@ struct video_encoder const GUID *const *output_types; UINT output_type_count; + IMFMediaType *input_type; IMFMediaType *output_type; IMFAttributes *attributes; @@ -91,6 +92,8 @@ static ULONG WINAPI transform_Release(IMFTransform *iface) if (!refcount) { + if (encoder->input_type) + IMFMediaType_Release(encoder->input_type); if (encoder->output_type) IMFMediaType_Release(encoder->output_type); IMFAttributes_Release(encoder->attributes); @@ -238,8 +241,52 @@ static HRESULT WINAPI transform_GetOutputAvailableType(IMFTransform *iface, DWOR static HRESULT WINAPI transform_SetInputType(IMFTransform *iface, DWORD id, IMFMediaType *type, DWORD flags) { - FIXME("iface %p, id %#lx, type %p, flags %#lx.\n", iface, id, type, flags); - return E_NOTIMPL; + struct video_encoder *encoder = impl_from_IMFTransform(iface); + GUID major, subtype; + UINT64 ratio; + ULONG i; + + TRACE("iface %p, id %#lx, type %p, flags %#lx.\n", iface, id, type, flags); + + if (!type) + { + if (encoder->input_type) + { + IMFMediaType_Release(encoder->input_type); + encoder->input_type = NULL; + } + + return S_OK; + } + + if (!encoder->output_type) + return MF_E_TRANSFORM_TYPE_NOT_SET; + + if (FAILED(IMFMediaType_GetGUID(type, &MF_MT_MAJOR_TYPE, &major)) || + FAILED(IMFMediaType_GetGUID(type, &MF_MT_SUBTYPE, &subtype))) + return E_INVALIDARG; + + if (!IsEqualGUID(&major, &MFMediaType_Video)) + return MF_E_INVALIDMEDIATYPE; + + for (i = 0; i < encoder->input_type_count; ++i) + if (IsEqualGUID(&subtype, encoder->input_types[i])) + break; + if (i == encoder->input_type_count) + return MF_E_INVALIDMEDIATYPE; + + if (FAILED(IMFMediaType_GetUINT64(type, &MF_MT_FRAME_SIZE, &ratio)) + || FAILED(IMFMediaType_GetUINT64(type, &MF_MT_FRAME_RATE, &ratio))) + return MF_E_INVALIDMEDIATYPE; + + if (flags & MFT_SET_TYPE_TEST_ONLY) + return S_OK; + + if (encoder->input_type) + IMFMediaType_Release(encoder->input_type); + IMFMediaType_AddRef((encoder->input_type = type)); + + return S_OK; } static HRESULT WINAPI transform_SetOutputType(IMFTransform *iface, DWORD id, IMFMediaType *type, DWORD flags) @@ -254,6 +301,11 @@ static HRESULT WINAPI transform_SetOutputType(IMFTransform *iface, DWORD id, IMF if (!type) { + if (encoder->input_type) + { + IMFMediaType_Release(encoder->input_type); + encoder->input_type = NULL; + } if (encoder->output_type) { IMFMediaType_Release(encoder->output_type);

1 0

Ziqing Hui : winegstreamer/video_encoder: Implement GetInputCurrentType.
by Alexandre Julliard 01 Jul '24

01 Jul '24

Module: wine Branch: master Commit: adce0d34f5c27b4778622718f0f6e71c9e04fabe URL: https://gitlab.winehq.org/wine/wine/-/commit/adce0d34f5c27b4778622718f0f6e7… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Fri Jun 28 14:19:20 2024 +0800 winegstreamer/video_encoder: Implement GetInputCurrentType. --- dlls/winegstreamer/video_encoder.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/winegstreamer/video_encoder.c b/dlls/winegstreamer/video_encoder.c index a78cbfffdc5..cfdd5be9d50 100644 --- a/dlls/winegstreamer/video_encoder.c +++ b/dlls/winegstreamer/video_encoder.c @@ -349,8 +349,19 @@ static HRESULT WINAPI transform_SetOutputType(IMFTransform *iface, DWORD id, IMF static HRESULT WINAPI transform_GetInputCurrentType(IMFTransform *iface, DWORD id, IMFMediaType **type) { - FIXME("iface %p, id %#lx, type %p\n", iface, id, type); - return E_NOTIMPL; + struct video_encoder *encoder = impl_from_IMFTransform(iface); + HRESULT hr; + + TRACE("iface %p, id %#lx, type %p\n", iface, id, type); + + if (!encoder->input_type) + return MF_E_TRANSFORM_TYPE_NOT_SET; + + if (FAILED(hr = MFCreateMediaType(type))) + return hr; + + return IMFMediaType_CopyAllItems(encoder->input_type, (IMFAttributes *)*type); + } static HRESULT WINAPI transform_GetOutputCurrentType(IMFTransform *iface, DWORD id, IMFMediaType **type)

1 0