August 2023 - Wine-commits - list.winehq.org

Conor McCarthy : vkd3d-shader/dxil: Implement DX instruction StoreOutput.
by Alexandre Julliard 30 Aug '23

30 Aug '23

Module: vkd3d Branch: master Commit: d27b8eb2c0d8e62d95558b72da31e5dbb406fa14 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/d27b8eb2c0d8e62d95558b72da31e… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Wed May 17 11:48:08 2023 +1000 vkd3d-shader/dxil: Implement DX instruction StoreOutput. --- libs/vkd3d-shader/dxil.c | 250 ++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 245 insertions(+), 5 deletions(-)

1 0

Wonjun Jung : wbemprox: Add Win32_SoundDevice query test for Caption property.
by Alexandre Julliard 29 Aug '23

29 Aug '23

Module: wine Branch: master Commit: fe28e61580e933d5802de52c39f17a51dcabad70 URL: https://gitlab.winehq.org/wine/wine/-/commit/fe28e61580e933d5802de52c39f17a… Author: Wonjun Jung <kokoseij(a)gmail.com> Date: Wed Aug 30 01:47:36 2023 +0900 wbemprox: Add Win32_SoundDevice query test for Caption property. --- dlls/wbemprox/tests/query.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index beceffe7e69..23b4c86d33a 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -2122,6 +2122,7 @@ static void test_Win32_SoundDevice( IWbemServices *services ) hr = IEnumWbemClassObject_Next( result, 10000, 1, &obj, &count ); if (hr != S_OK) break; + check_property( obj, L"Caption", VT_BSTR, CIM_STRING ); check_property( obj, L"DeviceID", VT_BSTR, CIM_STRING ); check_property( obj, L"Manufacturer", VT_BSTR, CIM_STRING ); check_property( obj, L"Name", VT_BSTR, CIM_STRING );

1 0

Wonjun Jung : wbemprox: Add Caption property in Win32_SoundDevice.
by Alexandre Julliard 29 Aug '23

29 Aug '23

Module: wine Branch: master Commit: b27d1809c798393572aef045d3133a4794084e23 URL: https://gitlab.winehq.org/wine/wine/-/commit/b27d1809c798393572aef045d3133a… Author: Wonjun Jung <kokoseij(a)gmail.com> Date: Wed Aug 30 01:39:44 2023 +0900 wbemprox: Add Caption property in Win32_SoundDevice. --- dlls/wbemprox/builtin.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 346c2a98eed..26750416d74 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -407,6 +407,7 @@ static const struct column col_softwarelicensingproduct[] = }; static const struct column col_sounddevice[] = { + { L"Caption", CIM_STRING }, { L"DeviceID", CIM_STRING|COL_FLAG_DYNAMIC }, { L"Manufacturer", CIM_STRING }, { L"Name", CIM_STRING }, @@ -857,6 +858,7 @@ struct record_softwarelicensingproduct }; struct record_sounddevice { + const WCHAR *caption; const WCHAR *deviceid; const WCHAR *manufacturer; const WCHAR *name; @@ -4285,6 +4287,7 @@ static enum fill_status fill_sounddevice( struct table *table, const struct expr get_dxgi_adapter_desc( &desc ); rec = (struct record_sounddevice *)table->data; + rec->caption = L"Wine Audio Device"; rec->deviceid = get_sounddevice_pnpdeviceid( &desc ); rec->manufacturer = L"The Wine Project"; rec->name = L"Wine Audio Device";

1 0

Wonjun Jung : wbemprox: Add NetConnectionID, NetEnabled properties in Win32_NetworkAdapter.
by Alexandre Julliard 29 Aug '23

29 Aug '23

Module: wine Branch: master Commit: b4280a486f7308fd1da260cd5b48b7d9e3c747c5 URL: https://gitlab.winehq.org/wine/wine/-/commit/b4280a486f7308fd1da260cd5b48b7… Author: Wonjun Jung <kokoseij(a)gmail.com> Date: Wed Aug 30 03:26:08 2023 +0900 wbemprox: Add NetConnectionID, NetEnabled properties in Win32_NetworkAdapter. --- dlls/wbemprox/builtin.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 26750416d74..3703fd0cca5 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -204,7 +204,9 @@ static const struct column col_networkadapter[] = { L"MACAddress", CIM_STRING|COL_FLAG_DYNAMIC }, { L"Manufacturer", CIM_STRING }, { L"Name", CIM_STRING|COL_FLAG_DYNAMIC }, + { L"NetConnectionID", CIM_STRING }, { L"NetConnectionStatus", CIM_UINT16 }, + { L"NetEnabled", CIM_BOOLEAN }, { L"PhysicalAdapter", CIM_BOOLEAN }, { L"PNPDeviceID", CIM_STRING }, { L"ServiceName", CIM_STRING|COL_FLAG_DYNAMIC }, @@ -655,7 +657,9 @@ struct record_networkadapter const WCHAR *mac_address; const WCHAR *manufacturer; const WCHAR *name; + const WCHAR *netconnection_id; UINT16 netconnection_status; + int netenabled; int physicaladapter; const WCHAR *pnpdevice_id; const WCHAR *servicename; @@ -2853,6 +2857,7 @@ static enum fill_status fill_networkadapter( struct table *table, const struct e UINT row = 0, offset = 0, count = 0; DWORD size = 0, ret; int adaptertypeid, physical; + UINT16 connection_status; enum fill_status status = FILL_STATUS_UNFILTERED; ret = GetAdaptersAddresses( AF_UNSPEC, 0, NULL, NULL, &size ); @@ -2877,6 +2882,8 @@ static enum fill_status fill_networkadapter( struct table *table, const struct e { if (aa->IfType == IF_TYPE_SOFTWARE_LOOPBACK) continue; + connection_status = get_connection_status( aa->OperStatus ); + rec = (struct record_networkadapter *)(table->data + offset); swprintf( device_id, ARRAY_SIZE( device_id ), L"%u", aa->IfIndex ); rec->adaptertype = get_adaptertype( aa->IfType, &adaptertypeid, &physical ); @@ -2888,8 +2895,10 @@ static enum fill_status fill_networkadapter( struct table *table, const struct e rec->interface_index = aa->IfIndex; rec->mac_address = get_mac_address( aa->PhysicalAddress, aa->PhysicalAddressLength ); rec->manufacturer = L"The Wine Project"; + rec->netconnection_id = NULL; /* FIXME Windows seems to fill this when it's connected and in use */ rec->name = wcsdup( aa->FriendlyName ); - rec->netconnection_status = get_connection_status( aa->OperStatus ); + rec->netenabled = connection_status ? -1 : 0; + rec->netconnection_status = connection_status; rec->physicaladapter = physical; rec->pnpdevice_id = L"PCI\\VEN_8086&DEV_100E&SUBSYS_001E8086&REV_02\\3&267A616A&1&18"; rec->servicename = wcsdup( aa->FriendlyName );

1 0

Biswapriyo Nath : include: Add AudioProcessing enum in windows.media.idl.
by Alexandre Julliard 29 Aug '23

29 Aug '23

Module: wine Branch: master Commit: 9b4ae4129a07acf87cc795c4cfd0449aedf1e230 URL: https://gitlab.winehq.org/wine/wine/-/commit/9b4ae4129a07acf87cc795c4cfd044… Author: Biswapriyo Nath <nathbappai(a)gmail.com> Date: Tue Aug 29 10:48:17 2023 +0530 include: Add AudioProcessing enum in windows.media.idl. Required for Windows.Media.Effects.IAudioEffectsManagerStatics interface. --- include/windows.media.idl | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/include/windows.media.idl b/include/windows.media.idl index 2c80e49a92b..03d03a6389f 100644 --- a/include/windows.media.idl +++ b/include/windows.media.idl @@ -25,6 +25,8 @@ import "windows.foundation.idl"; namespace Windows.Media { + typedef enum AudioProcessing AudioProcessing; + interface IMediaControl; interface IMediaMarker; @@ -36,6 +38,15 @@ namespace Windows.Media interface Windows.Foundation.Collections.IVector<Windows.Media.IMediaMarker*>; } + [ + contract(Windows.Foundation.UniversalApiContract, 1.0) + ] + enum AudioProcessing + { + Default = 0, + Raw = 1, + }; + [ contract(Windows.Foundation.UniversalApiContract, 1.0), uuid(1803def8-dca5-4b6f-9c20-e3d3c0643625)

1 0

Rémi Bernon : mf/session: Use local variables to access transform node streams.
by Alexandre Julliard 29 Aug '23

29 Aug '23

Module: wine Branch: master Commit: b3e4a52fcc750f4b2900c71665ccdefe378ff342 URL: https://gitlab.winehq.org/wine/wine/-/commit/b3e4a52fcc750f4b2900c71665ccde… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Jun 7 16:24:20 2023 +0200 mf/session: Use local variables to access transform node streams. --- dlls/mf/session.c | 48 ++++++++++++++++++++++++++++++++---------------- 1 file changed, 32 insertions(+), 16 deletions(-) diff --git a/dlls/mf/session.c b/dlls/mf/session.c index 555a71dcdf7..c629399d10e 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -3128,6 +3128,8 @@ static HRESULT transform_node_pull_samples(const struct media_session *session, /* Collect returned samples for all streams. */ for (i = 0; i < node->u.transform.output_count; ++i) { + struct transform_stream *stream = &node->u.transform.outputs[i]; + if (buffers[i].pEvents) IMFCollection_Release(buffers[i].pEvents); @@ -3137,7 +3139,7 @@ static HRESULT transform_node_pull_samples(const struct media_session *session, IMFQualityManager_NotifyProcessOutput(session->quality_manager, node->node, i, buffers[i].pSample); queued_sample = transform_create_sample(buffers[i].pSample); - list_add_tail(&node->u.transform.outputs[i].samples, &queued_sample->entry); + list_add_tail(&stream->samples, &queued_sample->entry); } if (buffers[i].pSample) @@ -3189,17 +3191,21 @@ static void session_deliver_sample_to_node(struct media_session *session, IMFTop } break; case MF_TOPOLOGY_TRANSFORM_NODE: + { + struct transform_stream *input_stream = &topo_node->u.transform.inputs[input]; transform_node_pull_samples(session, topo_node); sample_entry = transform_create_sample(sample); - list_add_tail(&topo_node->u.transform.inputs[input].samples, &sample_entry->entry); + list_add_tail(&input_stream->samples, &sample_entry->entry); for (i = 0; i < topo_node->u.transform.input_count; ++i) { + struct transform_stream *stream = &topo_node->u.transform.inputs[i]; + stream_id = transform_node_get_stream_id(topo_node, FALSE, i); - LIST_FOR_EACH_ENTRY_SAFE(sample_entry, sample_entry2, &topo_node->u.transform.inputs[i].samples, - struct sample, entry) + + LIST_FOR_EACH_ENTRY_SAFE(sample_entry, sample_entry2, &stream->samples, struct sample, entry) { if (sample_entry->sample) { @@ -3212,7 +3218,7 @@ static void session_deliver_sample_to_node(struct media_session *session, IMFTop } else { - transform_stream_drop_samples(&topo_node->u.transform.inputs[i]); + transform_stream_drop_samples(stream); drain = TRUE; } } @@ -3231,28 +3237,32 @@ static void session_deliver_sample_to_node(struct media_session *session, IMFTop { for (i = 0; i < topo_node->u.transform.output_count; ++i) { - if ((sample_entry = transform_create_sample(NULL))) - list_add_tail(&topo_node->u.transform.outputs[i].samples, &sample_entry->entry); + struct transform_stream *stream = &topo_node->u.transform.outputs[i]; + + if ((sample_entry = transform_create_sample(NULL))) + list_add_tail(&stream->samples, &sample_entry->entry); } } /* Push down all available output. */ for (i = 0; i < topo_node->u.transform.output_count; ++i) { + struct transform_stream *stream = &topo_node->u.transform.outputs[i]; + if (FAILED(IMFTopologyNode_GetOutput(node, i, &downstream_node, &downstream_input))) { WARN("Failed to get connected node for output %u.\n", i); continue; } - LIST_FOR_EACH_ENTRY_SAFE(sample_entry, sample_entry2, &topo_node->u.transform.outputs[i].samples, + LIST_FOR_EACH_ENTRY_SAFE(sample_entry, sample_entry2, &stream->samples, struct sample, entry) { - if (!topo_node->u.transform.outputs[i].requests) + if (!stream->requests) break; session_deliver_sample_to_node(session, downstream_node, downstream_input, sample_entry->sample); - topo_node->u.transform.outputs[i].requests--; + stream->requests--; transform_release_sample(sample_entry); } @@ -3261,6 +3271,7 @@ static void session_deliver_sample_to_node(struct media_session *session, IMFTop } break; + } case MF_TOPOLOGY_TEE_NODE: FIXME("Unhandled downstream node type %d.\n", node_type); break; @@ -3293,20 +3304,22 @@ static void session_deliver_pending_samples(struct media_session *session, IMFTo /* Push down all available output. */ for (i = 0; i < topo_node->u.transform.output_count; ++i) { + struct transform_stream *stream = &topo_node->u.transform.outputs[i]; + if (FAILED(IMFTopologyNode_GetOutput(node, i, &downstream_node, &downstream_input))) { WARN("Failed to get connected node for output %u.\n", i); continue; } - LIST_FOR_EACH_ENTRY_SAFE(sample_entry, sample_entry2, &topo_node->u.transform.outputs[i].samples, + LIST_FOR_EACH_ENTRY_SAFE(sample_entry, sample_entry2, &stream->samples, struct sample, entry) { - if (!topo_node->u.transform.outputs[i].requests) + if (!stream->requests) break; session_deliver_sample_to_node(session, downstream_node, downstream_input, sample_entry->sample); - topo_node->u.transform.outputs[i].requests--; + stream->requests--; transform_release_sample(sample_entry); } @@ -3342,14 +3355,16 @@ static HRESULT session_request_sample_from_node(struct media_session *session, I WARN("Sample request failed, hr %#lx.\n", hr); break; case MF_TOPOLOGY_TRANSFORM_NODE: + { + struct transform_stream *stream = &topo_node->u.transform.outputs[output]; - if (list_empty(&topo_node->u.transform.outputs[output].samples)) + if (list_empty(&stream->samples)) { /* Forward request to upstream node. */ if (SUCCEEDED(hr = IMFTopologyNode_GetInput(node, 0 /* FIXME */, &upstream_node, &upstream_output))) { if (SUCCEEDED(hr = session_request_sample_from_node(session, upstream_node, upstream_output))) - topo_node->u.transform.outputs[output].requests++; + stream->requests++; IMFTopologyNode_Release(upstream_node); } } @@ -3357,7 +3372,7 @@ static HRESULT session_request_sample_from_node(struct media_session *session, I { if (SUCCEEDED(hr = IMFTopologyNode_GetOutput(node, output, &downstream_node, &downstream_input))) { - sample = LIST_ENTRY(list_head(&topo_node->u.transform.outputs[output].samples), struct sample, entry); + sample = LIST_ENTRY(list_head(&stream->samples), struct sample, entry); session_deliver_sample_to_node(session, downstream_node, downstream_input, sample->sample); transform_release_sample(sample); IMFTopologyNode_Release(downstream_node); @@ -3365,6 +3380,7 @@ static HRESULT session_request_sample_from_node(struct media_session *session, I } break; + } case MF_TOPOLOGY_TEE_NODE: FIXME("Unhandled upstream node type %d.\n", node_type); default:

1 0

Rémi Bernon : mf/session: Use a helper to deliver transform node requested samples.
by Alexandre Julliard 29 Aug '23

29 Aug '23

Module: wine Branch: master Commit: 46743a0546d381d65346de65c0ad7e64a2fd50f3 URL: https://gitlab.winehq.org/wine/wine/-/commit/46743a0546d381d65346de65c0ad7e… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Jul 4 09:30:26 2023 +0200 mf/session: Use a helper to deliver transform node requested samples. --- dlls/mf/session.c | 98 ++++++++++++++++++++++--------------------------------- 1 file changed, 39 insertions(+), 59 deletions(-) diff --git a/dlls/mf/session.c b/dlls/mf/session.c index c629399d10e..254fea6dfe4 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -3151,12 +3151,47 @@ static HRESULT transform_node_pull_samples(const struct media_session *session, return hr; } +static void session_deliver_sample_to_node(struct media_session *session, IMFTopologyNode *node, unsigned int input, + IMFSample *sample); + +static void transform_node_deliver_samples(struct media_session *session, struct topo_node *topo_node) +{ + IMFTopologyNode *up_node = topo_node->node, *down_node; + struct sample *sample, *next; + DWORD output, input; + HRESULT hr; + + /* Push down all available output. */ + for (output = 0; output < topo_node->u.transform.output_count; ++output) + { + struct transform_stream *stream = &topo_node->u.transform.outputs[output]; + + if (FAILED(hr = IMFTopologyNode_GetOutput(up_node, output, &down_node, &input))) + { + WARN("Failed to node %p/%lu output, hr %#lx.\n", up_node, output, hr); + continue; + } + + LIST_FOR_EACH_ENTRY_SAFE(sample, next, &stream->samples, struct sample, entry) + { + if (!stream->requests) + break; + + session_deliver_sample_to_node(session, down_node, input, sample->sample); + stream->requests--; + + transform_release_sample(sample); + } + + IMFTopologyNode_Release(down_node); + } +} + static void session_deliver_sample_to_node(struct media_session *session, IMFTopologyNode *node, unsigned int input, IMFSample *sample) { struct sample *sample_entry, *sample_entry2; - DWORD stream_id, downstream_input; - IMFTopologyNode *downstream_node; + DWORD stream_id; struct topo_node *topo_node; MF_TOPOLOGY_TYPE node_type; BOOL drain = FALSE; @@ -3244,32 +3279,7 @@ static void session_deliver_sample_to_node(struct media_session *session, IMFTop } } - /* Push down all available output. */ - for (i = 0; i < topo_node->u.transform.output_count; ++i) - { - struct transform_stream *stream = &topo_node->u.transform.outputs[i]; - - if (FAILED(IMFTopologyNode_GetOutput(node, i, &downstream_node, &downstream_input))) - { - WARN("Failed to get connected node for output %u.\n", i); - continue; - } - - LIST_FOR_EACH_ENTRY_SAFE(sample_entry, sample_entry2, &stream->samples, - struct sample, entry) - { - if (!stream->requests) - break; - - session_deliver_sample_to_node(session, downstream_node, downstream_input, sample_entry->sample); - stream->requests--; - - transform_release_sample(sample_entry); - } - - IMFTopologyNode_Release(downstream_node); - } - + transform_node_deliver_samples(session, topo_node); break; } case MF_TOPOLOGY_TEE_NODE: @@ -3282,13 +3292,9 @@ static void session_deliver_sample_to_node(struct media_session *session, IMFTop static void session_deliver_pending_samples(struct media_session *session, IMFTopologyNode *node) { - struct sample *sample_entry, *sample_entry2; - IMFTopologyNode *downstream_node; struct topo_node *topo_node; MF_TOPOLOGY_TYPE node_type; - DWORD downstream_input; TOPOID node_id; - unsigned int i; IMFTopologyNode_GetNodeType(node, &node_type); IMFTopologyNode_GetTopoNodeID(node, &node_id); @@ -3298,34 +3304,8 @@ static void session_deliver_pending_samples(struct media_session *session, IMFTo switch (node_type) { case MF_TOPOLOGY_TRANSFORM_NODE: - transform_node_pull_samples(session, topo_node); - - /* Push down all available output. */ - for (i = 0; i < topo_node->u.transform.output_count; ++i) - { - struct transform_stream *stream = &topo_node->u.transform.outputs[i]; - - if (FAILED(IMFTopologyNode_GetOutput(node, i, &downstream_node, &downstream_input))) - { - WARN("Failed to get connected node for output %u.\n", i); - continue; - } - - LIST_FOR_EACH_ENTRY_SAFE(sample_entry, sample_entry2, &stream->samples, - struct sample, entry) - { - if (!stream->requests) - break; - - session_deliver_sample_to_node(session, downstream_node, downstream_input, sample_entry->sample); - stream->requests--; - - transform_release_sample(sample_entry); - } - - IMFTopologyNode_Release(downstream_node); - } + transform_node_deliver_samples(session, topo_node); break; default: FIXME("Unexpected node type %u.\n", node_type);

1 0

Rémi Bernon : mf/session: Drain transform node input streams individually.
by Alexandre Julliard 29 Aug '23

29 Aug '23

Module: wine Branch: master Commit: 6946c761bf0a043b1c777b39311addc5f66859e6 URL: https://gitlab.winehq.org/wine/wine/-/commit/6946c761bf0a043b1c777b39311add… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Jul 6 10:59:40 2023 +0200 mf/session: Drain transform node input streams individually. --- dlls/mf/session.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/dlls/mf/session.c b/dlls/mf/session.c index 254fea6dfe4..1fbacde318c 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -3255,16 +3255,14 @@ static void session_deliver_sample_to_node(struct media_session *session, IMFTop { transform_stream_drop_samples(stream); drain = TRUE; + + if (FAILED(hr = IMFTransform_ProcessMessage(topo_node->object.transform, + MFT_MESSAGE_COMMAND_DRAIN, stream_id))) + WARN("Drain command failed for transform, hr %#lx.\n", hr); } } } - if (drain) - { - if (FAILED(hr = IMFTransform_ProcessMessage(topo_node->object.transform, MFT_MESSAGE_COMMAND_DRAIN, 0))) - WARN("Drain command failed for transform, hr %#lx.\n", hr); - } - transform_node_pull_samples(session, topo_node); /* Remaining unprocessed input has been discarded, now queue markers for every output. */

1 0

Rémi Bernon : mf/session: Drain remaining requests in transform_node_deliver_samples.
by Alexandre Julliard 29 Aug '23

29 Aug '23

Module: wine Branch: master Commit: b60db1693e91c01f8055b56cd595cb04c6c3c54c URL: https://gitlab.winehq.org/wine/wine/-/commit/b60db1693e91c01f8055b56cd595cb… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Aug 8 11:39:43 2023 +0200 mf/session: Drain remaining requests in transform_node_deliver_samples. --- dlls/mf/session.c | 55 ++++++++++++++++++++++++++++++++++++++----------------- 1 file changed, 38 insertions(+), 17 deletions(-) diff --git a/dlls/mf/session.c b/dlls/mf/session.c index 1fbacde318c..c9f911c1777 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -155,6 +155,7 @@ struct transform_stream struct list samples; unsigned int requests; unsigned int min_buffer_size; + BOOL draining; }; enum topo_node_flags @@ -892,7 +893,9 @@ static HRESULT session_subscribe_sources(struct media_session *session) static void session_start(struct media_session *session, const GUID *time_format, const PROPVARIANT *start_position) { struct media_source *source; + struct topo_node *topo_node; HRESULT hr; + UINT i; switch (session->state) { @@ -928,6 +931,18 @@ static void session_start(struct media_session *session, const GUID *time_format } } + LIST_FOR_EACH_ENTRY(topo_node, &session->presentation.nodes, struct topo_node, entry) + { + if (topo_node->type == MF_TOPOLOGY_TRANSFORM_NODE) + { + for (i = 0; i < topo_node->u.transform.input_count; i++) + { + struct transform_stream *stream = &topo_node->u.transform.inputs[i]; + stream->draining = FALSE; + } + } + } + session->state = SESSION_STATE_STARTING_SOURCES; break; case SESSION_STATE_STARTED: @@ -3151,12 +3166,27 @@ static HRESULT transform_node_pull_samples(const struct media_session *session, return hr; } +static BOOL transform_node_is_drained(struct topo_node *topo_node) +{ + UINT i; + + for (i = 0; i < topo_node->u.transform.input_count; i++) + { + struct transform_stream *stream = &topo_node->u.transform.inputs[i]; + if (!stream->draining) + return FALSE; + } + + return TRUE; +} + static void session_deliver_sample_to_node(struct media_session *session, IMFTopologyNode *node, unsigned int input, IMFSample *sample); static void transform_node_deliver_samples(struct media_session *session, struct topo_node *topo_node) { IMFTopologyNode *up_node = topo_node->node, *down_node; + BOOL drained = transform_node_is_drained(topo_node); struct sample *sample, *next; DWORD output, input; HRESULT hr; @@ -3183,6 +3213,12 @@ static void transform_node_deliver_samples(struct media_session *session, struct transform_release_sample(sample); } + while (stream->requests && drained) + { + session_deliver_sample_to_node(session, down_node, input, NULL); + stream->requests--; + } + IMFTopologyNode_Release(down_node); } } @@ -3194,7 +3230,6 @@ static void session_deliver_sample_to_node(struct media_session *session, IMFTop DWORD stream_id; struct topo_node *topo_node; MF_TOPOLOGY_TYPE node_type; - BOOL drain = FALSE; TOPOID node_id; unsigned int i; HRESULT hr; @@ -3253,30 +3288,16 @@ static void session_deliver_sample_to_node(struct media_session *session, IMFTop } else { - transform_stream_drop_samples(stream); - drain = TRUE; - if (FAILED(hr = IMFTransform_ProcessMessage(topo_node->object.transform, MFT_MESSAGE_COMMAND_DRAIN, stream_id))) WARN("Drain command failed for transform, hr %#lx.\n", hr); + else + stream->draining = TRUE; } } } transform_node_pull_samples(session, topo_node); - - /* Remaining unprocessed input has been discarded, now queue markers for every output. */ - if (drain) - { - for (i = 0; i < topo_node->u.transform.output_count; ++i) - { - struct transform_stream *stream = &topo_node->u.transform.outputs[i]; - - if ((sample_entry = transform_create_sample(NULL))) - list_add_tail(&stream->samples, &sample_entry->entry); - } - } - transform_node_deliver_samples(session, topo_node); break; }

1 0

Rémi Bernon : mf/session: Use helpers to push and pop samples for transform streams.
by Alexandre Julliard 29 Aug '23

29 Aug '23

Module: wine Branch: master Commit: 5d5134927652ca0fc07dd57f9aeb433a25dd3986 URL: https://gitlab.winehq.org/wine/wine/-/commit/5d5134927652ca0fc07dd57f9aeb43… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Aug 8 11:32:44 2023 +0200 mf/session: Use helpers to push and pop samples for transform streams. --- dlls/mf/session.c | 80 ++++++++++++++++++++++++++++++------------------------- 1 file changed, 44 insertions(+), 36 deletions(-) diff --git a/dlls/mf/session.c b/dlls/mf/session.c index c9f911c1777..a089d2b765c 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -681,12 +681,41 @@ static void transform_release_sample(struct sample *sample) free(sample); } +static HRESULT transform_stream_push_sample(struct transform_stream *stream, IMFSample *sample) +{ + struct sample *entry; + + if (!(entry = calloc(1, sizeof(*entry)))) + return E_OUTOFMEMORY; + + entry->sample = sample; + IMFSample_AddRef(entry->sample); + + list_add_tail(&stream->samples, &entry->entry); + return S_OK; +} + +static HRESULT transform_stream_pop_sample(struct transform_stream *stream, IMFSample **sample) +{ + struct sample *entry; + struct list *ptr; + + if (!(ptr = list_head(&stream->samples))) + return E_FAIL; + + entry = LIST_ENTRY(ptr, struct sample, entry); + list_remove(&entry->entry); + *sample = entry->sample; + free(entry); + return S_OK; +} + static void transform_stream_drop_samples(struct transform_stream *stream) { - struct sample *sample, *sample2; + IMFSample *sample; - LIST_FOR_EACH_ENTRY_SAFE(sample, sample2, &stream->samples, struct sample, entry) - transform_release_sample(sample); + while (SUCCEEDED(transform_stream_pop_sample(stream, &sample))) + IMFSample_Release(sample); } static void release_topo_node(struct topo_node *node) @@ -3049,20 +3078,6 @@ static void session_set_sink_stream_state(struct media_session *session, IMFStre } } -static struct sample *transform_create_sample(IMFSample *sample) -{ - struct sample *sample_entry = calloc(1, sizeof(*sample_entry)); - - if (sample_entry) - { - sample_entry->sample = sample; - if (sample_entry->sample) - IMFSample_AddRef(sample_entry->sample); - } - - return sample_entry; -} - static HRESULT transform_get_external_output_sample(const struct media_session *session, struct topo_node *transform, unsigned int output_index, const MFT_OUTPUT_STREAM_INFO *stream_info, IMFSample **sample) { @@ -3111,7 +3126,6 @@ static HRESULT transform_node_pull_samples(const struct media_session *session, { MFT_OUTPUT_STREAM_INFO stream_info; MFT_OUTPUT_DATA_BUFFER *buffers; - struct sample *queued_sample; HRESULT hr = E_UNEXPECTED; DWORD status = 0; unsigned int i; @@ -3152,9 +3166,8 @@ static HRESULT transform_node_pull_samples(const struct media_session *session, { if (session->quality_manager) IMFQualityManager_NotifyProcessOutput(session->quality_manager, node->node, i, buffers[i].pSample); - - queued_sample = transform_create_sample(buffers[i].pSample); - list_add_tail(&stream->samples, &queued_sample->entry); + if (FAILED(hr = transform_stream_push_sample(stream, buffers[i].pSample))) + WARN("Failed to queue output sample, hr %#lx\n", hr); } if (buffers[i].pSample) @@ -3187,8 +3200,8 @@ static void transform_node_deliver_samples(struct media_session *session, struct { IMFTopologyNode *up_node = topo_node->node, *down_node; BOOL drained = transform_node_is_drained(topo_node); - struct sample *sample, *next; DWORD output, input; + IMFSample *sample; HRESULT hr; /* Push down all available output. */ @@ -3202,15 +3215,11 @@ static void transform_node_deliver_samples(struct media_session *session, struct continue; } - LIST_FOR_EACH_ENTRY_SAFE(sample, next, &stream->samples, struct sample, entry) + while (stream->requests && SUCCEEDED(hr = transform_stream_pop_sample(stream, &sample))) { - if (!stream->requests) - break; - - session_deliver_sample_to_node(session, down_node, input, sample->sample); + session_deliver_sample_to_node(session, down_node, input, sample); stream->requests--; - - transform_release_sample(sample); + IMFSample_Release(sample); } while (stream->requests && drained) @@ -3266,8 +3275,7 @@ static void session_deliver_sample_to_node(struct media_session *session, IMFTop transform_node_pull_samples(session, topo_node); - sample_entry = transform_create_sample(sample); - list_add_tail(&input_stream->samples, &sample_entry->entry); + transform_stream_push_sample(input_stream, sample); for (i = 0; i < topo_node->u.transform.input_count; ++i) { @@ -3338,7 +3346,7 @@ static HRESULT session_request_sample_from_node(struct media_session *session, I DWORD downstream_input, upstream_output; struct topo_node *topo_node; MF_TOPOLOGY_TYPE node_type; - struct sample *sample; + IMFSample *sample; TOPOID node_id; HRESULT hr; @@ -3357,7 +3365,7 @@ static HRESULT session_request_sample_from_node(struct media_session *session, I { struct transform_stream *stream = &topo_node->u.transform.outputs[output]; - if (list_empty(&stream->samples)) + if (FAILED(hr = transform_stream_pop_sample(stream, &sample))) { /* Forward request to upstream node. */ if (SUCCEEDED(hr = IMFTopologyNode_GetInput(node, 0 /* FIXME */, &upstream_node, &upstream_output))) @@ -3371,11 +3379,11 @@ static HRESULT session_request_sample_from_node(struct media_session *session, I { if (SUCCEEDED(hr = IMFTopologyNode_GetOutput(node, output, &downstream_node, &downstream_input))) { - sample = LIST_ENTRY(list_head(&stream->samples), struct sample, entry); - session_deliver_sample_to_node(session, downstream_node, downstream_input, sample->sample); - transform_release_sample(sample); + session_deliver_sample_to_node(session, downstream_node, downstream_input, sample); IMFTopologyNode_Release(downstream_node); } + + IMFSample_Release(sample); } break;

1 0