March 2020 - Wine-commits - list.winehq.org

Zebediah Figura : wined3d: Move the color masks to wined3d_blend_state.
by Alexandre Julliard 13 Mar '20

13 Mar '20

Module: wine Branch: master Commit: f396b49a92029051d1c454286bf8028ff84214a7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f396b49a92029051d1c45428… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Mar 12 23:25:02 2020 -0500 wined3d: Move the color masks to wined3d_blend_state. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/d3d10core.c | 3 +- dlls/d3d11/device.c | 28 ++-------- dlls/d3d11/state.c | 5 +- dlls/d3d11/tests/d3d11.c | 6 +-- dlls/wined3d/context.c | 8 +-- dlls/wined3d/device.c | 29 ++++++++-- dlls/wined3d/state.c | 111 ++++++++++----------------------------- dlls/wined3d/surface.c | 5 +- include/wine/wined3d.h | 1 + 9 files changed, 63 insertions(+), 133 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f396b49a92029051d1c4…

1 0

Nikolay Sivov : mf: Use single list for topology nodes in current presentation.
by Alexandre Julliard 13 Mar '20

13 Mar '20

Module: wine Branch: master Commit: 2eb80e12786d701135905e622bdc97b6fe13ba99 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2eb80e12786d701135905e62… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Mar 13 15:34:31 2020 +0300 mf: Use single list for topology nodes in current presentation. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/session.c | 325 ++++++++++++++++++++++++++---------------------------- 1 file changed, 155 insertions(+), 170 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=2eb80e12786d70113590…

1 0

Nikolay Sivov : mf/tests: Add a test for default node attributes.
by Alexandre Julliard 13 Mar '20

13 Mar '20

Module: wine Branch: master Commit: 38f94b48126c588734ce57981dafab25c1709521 URL: https://source.winehq.org/git/wine.git/?a=commit;h=38f94b48126c588734ce5798… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Mar 13 15:34:32 2020 +0300 mf/tests: Add a test for default node attributes. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/tests/mf.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index d799446676..dfbd928f60 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -150,6 +150,17 @@ static void test_topology(void) IMFTopology_Release(topology2); + /* No attributes by default. */ + for (node_type = MF_TOPOLOGY_OUTPUT_NODE; node_type < MF_TOPOLOGY_TEE_NODE; ++node_type) + { + hr = MFCreateTopologyNode(node_type, &node); + ok(hr == S_OK, "Failed to create a node for type %d, hr %#x.\n", node_type, hr); + hr = IMFTopologyNode_GetCount(node, &count); + ok(hr == S_OK, "Failed to get attribute count, hr %#x.\n", hr); + ok(!count, "Unexpected attribute count %u.\n", count); + IMFTopologyNode_Release(node); + } + hr = MFCreateTopologyNode(MF_TOPOLOGY_OUTPUT_NODE, NULL); ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr);

1 0

Nikolay Sivov : mf: Handle basic case of sample request/response.
by Alexandre Julliard 13 Mar '20

13 Mar '20

Module: wine Branch: master Commit: 321484d115ae6b0fef4268e2dd4c521cdc929348 URL: https://source.winehq.org/git/wine.git/?a=commit;h=321484d115ae6b0fef4268e2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Mar 13 15:34:33 2020 +0300 mf: Handle basic case of sample request/response. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/session.c | 162 +++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 161 insertions(+), 1 deletion(-) diff --git a/dlls/mf/session.c b/dlls/mf/session.c index 9c3288da34..1d5cc4f8d5 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -115,6 +115,7 @@ struct topo_node struct list entry; MF_TOPOLOGY_TYPE type; TOPOID node_id; + IMFTopologyNode *node; enum object_state state; union { @@ -129,8 +130,12 @@ struct topo_node struct { IMFMediaSource *source; - DWORD stream_id; + unsigned int stream_id; } source; + struct + { + unsigned int requests; + } sink; } u; }; @@ -624,6 +629,8 @@ static void release_topo_node(struct topo_node *node) if (node->object.object) IUnknown_Release(node->object.object); + if (node->node) + IMFTopologyNode_Release(node->node); heap_free(node); } @@ -951,6 +958,8 @@ static HRESULT session_append_node(struct media_session *session, IMFTopologyNod IMFTopologyNode_GetNodeType(node, &topo_node->type); IMFTopologyNode_GetTopoNodeID(node, &topo_node->node_id); + topo_node->node = node; + IMFTopologyNode_AddRef(topo_node->node); switch (topo_node->type) { @@ -2055,6 +2064,145 @@ static void session_set_sink_stream_state(struct media_session *session, IMFStre } } +static struct topo_node *session_get_node_by_id(struct media_session *session, TOPOID id) +{ + struct topo_node *node; + + LIST_FOR_EACH_ENTRY(node, &session->presentation.nodes, struct topo_node, entry) + { + if (node->node_id == id) + return node; + } + + return NULL; +} + +static HRESULT session_request_sample_from_node(struct media_session *session, IMFTopologyNode *upstream_node, + DWORD upsteam_output) +{ + MF_TOPOLOGY_TYPE upstream_type; + struct topo_node *node; + TOPOID upstream_id; + HRESULT hr; + + IMFTopologyNode_GetNodeType(upstream_node, &upstream_type); + IMFTopologyNode_GetTopoNodeID(upstream_node, &upstream_id); + + node = session_get_node_by_id(session, upstream_id); + + switch (upstream_type) + { + case MF_TOPOLOGY_SOURCESTREAM_NODE: + if (FAILED(hr = IMFMediaStream_RequestSample(node->object.source_stream, NULL))) + WARN("Sample request failed, hr %#x.\n", hr); + break; + case MF_TOPOLOGY_TRANSFORM_NODE: + case MF_TOPOLOGY_TEE_NODE: + FIXME("Unhandled upstream node type %d.\n", upstream_type); + default: + hr = E_UNEXPECTED; + } + + return hr; +} + +static void session_request_sample(struct media_session *session, IMFStreamSink *sink_stream) +{ + struct topo_node *sink_node = NULL, *node; + IMFTopologyNode *upstream_node; + DWORD upstream_output; + HRESULT hr; + + LIST_FOR_EACH_ENTRY(node, &session->presentation.nodes, struct topo_node, entry) + { + if (node->type == MF_TOPOLOGY_OUTPUT_NODE && node->object.sink_stream == sink_stream) + { + sink_node = node; + break; + } + } + + if (!sink_node) + return; + + if (FAILED(hr = IMFTopologyNode_GetInput(sink_node->node, 0, &upstream_node, &upstream_output))) + { + WARN("Failed to get upstream node connection, hr %#x.\n", hr); + return; + } + + if (SUCCEEDED(session_request_sample_from_node(session, upstream_node, upstream_output))) + sink_node->u.sink.requests++; + IMFTopologyNode_Release(upstream_node); +} + +static void session_deliver_sample_to_node(struct media_session *session, IMFTopologyNode *downstream_node, + DWORD downstream_input, IMFSample *sample) +{ + MF_TOPOLOGY_TYPE downstream_type; + struct topo_node *node; + TOPOID downstream_id; + HRESULT hr; + + IMFTopologyNode_GetNodeType(downstream_node, &downstream_type); + IMFTopologyNode_GetTopoNodeID(downstream_node, &downstream_id); + + node = session_get_node_by_id(session, downstream_id); + + switch (downstream_type) + { + case MF_TOPOLOGY_OUTPUT_NODE: + if (node->u.sink.requests) + { + if (FAILED(hr = IMFStreamSink_ProcessSample(node->object.sink_stream, sample))) + WARN("Sample delivery failed, hr %#x.\n", hr); + node->u.sink.requests--; + } + break; + case MF_TOPOLOGY_TRANSFORM_NODE: + case MF_TOPOLOGY_TEE_NODE: + FIXME("Unhandled downstream node type %d.\n", downstream_type); + break; + default: + ; + } +} + +static void session_deliver_sample(struct media_session *session, IMFMediaStream *stream, const PROPVARIANT *value) +{ + struct topo_node *source_node = NULL, *node; + IMFTopologyNode *downstream_node; + DWORD downstream_input; + HRESULT hr; + + if (value->vt != VT_UNKNOWN || !value->punkVal) + { + WARN("Unexpected value type %d.\n", value->vt); + return; + } + + LIST_FOR_EACH_ENTRY(node, &session->presentation.nodes, struct topo_node, entry) + { + if (node->type == MF_TOPOLOGY_SOURCESTREAM_NODE && node->object.source_stream == stream) + { + source_node = node; + break; + } + } + + if (!source_node) + return; + + if (FAILED(hr = IMFTopologyNode_GetOutput(source_node->node, 0, &downstream_node, &downstream_input))) + { + WARN("Failed to get downstream node connection, hr %#x.\n", hr); + return; + } + + session_deliver_sample_to_node(session, downstream_node, downstream_input, (IMFSample *)value->punkVal); + IMFTopologyNode_Release(downstream_node); +} + static HRESULT WINAPI session_events_callback_Invoke(IMFAsyncCallback *iface, IMFAsyncResult *result) { struct media_session *session = impl_from_events_callback_IMFAsyncCallback(iface); @@ -2131,6 +2279,18 @@ static HRESULT WINAPI session_events_callback_Invoke(IMFAsyncCallback *iface, IM LeaveCriticalSection(&session->cs); break; + case MEStreamSinkRequestSample: + + EnterCriticalSection(&session->cs); + session_request_sample(session, (IMFStreamSink *)event_source); + LeaveCriticalSection(&session->cs); + break; + + case MEMediaSample: + + EnterCriticalSection(&session->cs); + session_deliver_sample(session, (IMFMediaStream *)event_source, &value); + LeaveCriticalSection(&session->cs); default: ; }

1 0

Nikolay Sivov : mf: Send MFT_MESSAGE_NOTIFY_BEGIN_STREAMING message after setting current topology.
by Alexandre Julliard 13 Mar '20

13 Mar '20

Module: wine Branch: master Commit: 7454ac9c049bc9ccb62c6548a9555fca5a40507d URL: https://source.winehq.org/git/wine.git/?a=commit;h=7454ac9c049bc9ccb62c6548… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Mar 13 15:34:34 2020 +0300 mf: Send MFT_MESSAGE_NOTIFY_BEGIN_STREAMING message after setting current topology. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/session.c | 65 +++++++++++++++++++++++++++++++++++++++---------------- 1 file changed, 46 insertions(+), 19 deletions(-) diff --git a/dlls/mf/session.c b/dlls/mf/session.c index 1d5cc4f8d5..e1e7753a1c 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -1004,6 +1004,16 @@ static HRESULT session_append_node(struct media_session *session, IMFTopologyNod break; case MF_TOPOLOGY_TRANSFORM_NODE: + if (SUCCEEDED(hr = IMFTopologyNode_GetObject(node, &object))) + { + hr = IUnknown_QueryInterface(object, &IID_IMFTransform, (void **)&topo_node->object.transform); + IUnknown_Release(object); + } + + if (FAILED(hr)) + WARN("Failed to get IMFTransform for MFT node, hr %#x.\n", hr); + + break; case MF_TOPOLOGY_TEE_NODE: FIXME("Unsupported node type %d.\n", topo_node->type); @@ -1025,45 +1035,61 @@ static HRESULT session_collect_nodes(struct media_session *session) IMFTopology *topology = session->presentation.current_topology; IMFTopologyNode *node; WORD i, count = 0; + HRESULT hr; if (!list_empty(&session->presentation.nodes)) return S_OK; - IMFTopology_GetNodeCount(topology, &count); + if (FAILED(hr = IMFTopology_GetNodeCount(topology, &count))) + return hr; for (i = 0; i < count; ++i) { - if (FAILED(IMFTopology_GetNode(topology, i, &node))) + if (FAILED(hr = IMFTopology_GetNode(topology, i, &node))) { WARN("Failed to get node %u.\n", i); - continue; + break; } - if (FAILED(session_append_node(session, node))) - WARN("Failed to add node %u.\n", i); - + hr = session_append_node(session, node); IMFTopologyNode_Release(node); + if (FAILED(hr)) + { + WARN("Failed to add node %u.\n", i); + break; + } } - return S_OK; + return hr; } -static void session_set_current_topology(struct media_session *session, IMFTopology *topology) +static HRESULT session_set_current_topology(struct media_session *session, IMFTopology *topology) { struct media_source *source; DWORD caps, object_flags; struct media_sink *sink; + struct topo_node *node; IMFMediaEvent *event; HRESULT hr; if (FAILED(hr = IMFTopology_CloneFrom(session->presentation.current_topology, topology))) { WARN("Failed to clone topology, hr %#x.\n", hr); - return; + return hr; } session_collect_nodes(session); + LIST_FOR_EACH_ENTRY(node, &session->presentation.nodes, struct topo_node, entry) + { + if (node->type == MF_TOPOLOGY_TRANSFORM_NODE) + { + if (FAILED(hr = IMFTransform_ProcessMessage(node->object.transform, + MFT_MESSAGE_NOTIFY_BEGIN_STREAMING, 0))) + return hr; + } + } + /* FIXME: attributes are all zero for now */ if (SUCCEEDED(MFCreateMediaEvent(MESessionNotifyPresentationTime, &GUID_NULL, S_OK, NULL, &event))) { @@ -1114,11 +1140,13 @@ static void session_set_current_topology(struct media_session *session, IMFTopol } session_set_caps(session, caps); + + return S_OK; } static void session_set_topology(struct media_session *session, DWORD flags, IMFTopology *topology) { - HRESULT status = S_OK; + HRESULT hr = S_OK; /* Resolve unless claimed to be full. */ if (!(flags & MFSESSION_SETTOPOLOGY_CLEAR_CURRENT) && topology) @@ -1127,12 +1155,12 @@ static void session_set_topology(struct media_session *session, DWORD flags, IMF { IMFTopology *resolved_topology = NULL; - status = session_bind_output_nodes(topology); + hr = session_bind_output_nodes(topology); - if (SUCCEEDED(status)) - status = IMFTopoLoader_Load(session->topo_loader, topology, &resolved_topology, NULL /* FIXME? */); + if (SUCCEEDED(hr)) + hr = IMFTopoLoader_Load(session->topo_loader, topology, &resolved_topology, NULL /* FIXME? */); - if (SUCCEEDED(status)) + if (SUCCEEDED(hr)) { topology = resolved_topology; } @@ -1149,7 +1177,7 @@ static void session_set_topology(struct media_session *session, DWORD flags, IMF session_clear_presentation(session); } else - status = S_FALSE; + hr = S_FALSE; topology = NULL; } @@ -1159,14 +1187,14 @@ static void session_set_topology(struct media_session *session, DWORD flags, IMF session_clear_presentation(session); } - session_raise_topology_set(session, topology, status); + session_raise_topology_set(session, topology, hr); /* With no current topology set it right away, otherwise queue. */ if (topology) { if (session->presentation.topo_status == MF_TOPOSTATUS_INVALID) { - session_set_current_topology(session, topology); + hr = session_set_current_topology(session, topology); } else { @@ -1182,8 +1210,7 @@ static void session_set_topology(struct media_session *session, DWORD flags, IMF } } - if (status == S_OK) - session_set_topo_status(session, S_OK, MF_TOPOSTATUS_READY); + session_set_topo_status(session, hr, MF_TOPOSTATUS_READY); LeaveCriticalSection(&session->cs); }

1 0

Nikolay Sivov : mf: Pass start and flush messages to transform nodes.
by Alexandre Julliard 13 Mar '20

13 Mar '20

Module: wine Branch: master Commit: c6f0124e840b98fa9b4d6ebe84780b3e21faea04 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c6f0124e840b98fa9b4d6ebe… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Mar 13 15:34:35 2020 +0300 mf: Pass start and flush messages to transform nodes. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/session.c | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/dlls/mf/session.c b/dlls/mf/session.c index e1e7753a1c..64988579f4 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -1827,6 +1827,12 @@ static HRESULT session_start_clock(struct media_session *session) struct topo_node *node; HRESULT hr; + LIST_FOR_EACH_ENTRY(node, &session->presentation.nodes, struct topo_node, entry) + { + if (node->type == MF_TOPOLOGY_TRANSFORM_NODE) + IMFTransform_ProcessMessage(node->object.transform, MFT_MESSAGE_NOTIFY_START_OF_STREAM, 0); + } + if (!(session->presentation.flags & SESSION_FLAG_SINKS_SUBSCRIBED)) { LIST_FOR_EACH_ENTRY(sink, &session->presentation.sinks, struct media_sink, entry) @@ -1968,8 +1974,17 @@ static void session_set_source_object_state(struct media_session *session, IUnkn LIST_FOR_EACH_ENTRY(node, &session->presentation.nodes, struct topo_node, entry) { - if (node->type == MF_TOPOLOGY_OUTPUT_NODE) - IMFStreamSink_Flush(node->object.sink_stream); + switch (node->type) + { + case MF_TOPOLOGY_OUTPUT_NODE: + IMFStreamSink_Flush(node->object.sink_stream); + break; + case MF_TOPOLOGY_TRANSFORM_NODE: + IMFTransform_ProcessMessage(node->object.transform, MFT_MESSAGE_COMMAND_FLUSH, 0); + break; + default: + ; + } } session_set_caps(session, session->caps & ~MFSESSIONCAP_PAUSE);

1 0

Nikolay Sivov : mf: Keep transform node input/output streams map.
by Alexandre Julliard 13 Mar '20

13 Mar '20

Module: wine Branch: master Commit: f45419d05a6eee84a7d30a605ae23f13cd276f06 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f45419d05a6eee84a7d30a60… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Mar 13 15:34:36 2020 +0300 mf: Keep transform node input/output streams map. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/session.c | 50 +++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 49 insertions(+), 1 deletion(-) diff --git a/dlls/mf/session.c b/dlls/mf/session.c index 64988579f4..62b2b4f0ec 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -136,6 +136,14 @@ struct topo_node { unsigned int requests; } sink; + struct + { + unsigned int *input_map; + unsigned int input_count; + + unsigned int *output_map; + unsigned int output_count; + } transform; } u; }; @@ -623,6 +631,10 @@ static void release_topo_node(struct topo_node *node) if (node->u.source.source) IMFMediaSource_Release(node->u.source.source); break; + case MF_TOPOLOGY_TRANSFORM_NODE: + heap_free(node->u.transform.input_map); + heap_free(node->u.transform.output_map); + break; default: ; } @@ -945,6 +957,40 @@ static HRESULT session_add_media_sink(struct media_session *session, IMFTopology return S_OK; } +static HRESULT session_set_transform_stream_info(struct topo_node *node) +{ + unsigned int *input_map = NULL, *output_map = NULL; + unsigned int input_count, output_count; + HRESULT hr; + + hr = IMFTransform_GetStreamCount(node->object.transform, &input_count, &output_count); + if (SUCCEEDED(hr) && (input_count > 1 || output_count > 1)) + { + unsigned int *input_map, *output_map; + + input_map = heap_calloc(input_count, sizeof(*input_map)); + output_map = heap_calloc(output_count, sizeof(*output_map)); + if (FAILED(IMFTransform_GetStreamIDs(node->object.transform, input_count, input_map, + output_count, output_map))) + { + /* Assume sequential identifiers. */ + heap_free(input_map); + heap_free(output_map); + input_map = output_map = NULL; + } + } + + if (SUCCEEDED(hr)) + { + node->u.transform.input_count = input_count; + node->u.transform.output_count = output_count; + node->u.transform.input_map = input_map; + node->u.transform.output_map = output_map; + } + + return hr; +} + static HRESULT session_append_node(struct media_session *session, IMFTopologyNode *node) { struct topo_node *topo_node; @@ -1010,7 +1056,9 @@ static HRESULT session_append_node(struct media_session *session, IMFTopologyNod IUnknown_Release(object); } - if (FAILED(hr)) + if (SUCCEEDED(hr)) + hr = session_set_transform_stream_info(topo_node); + else WARN("Failed to get IMFTransform for MFT node, hr %#x.\n", hr); break;

1 0

Nikolay Sivov : mf: Add support for requesting sample from transform nodes.
by Alexandre Julliard 13 Mar '20

13 Mar '20

Module: wine Branch: master Commit: 72d0c7e0a7ce398166bf62928842f9caf94b1745 URL: https://source.winehq.org/git/wine.git/?a=commit;h=72d0c7e0a7ce398166bf6292… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Mar 13 15:34:37 2020 +0300 mf: Add support for requesting sample from transform nodes. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/session.c | 225 +++++++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 180 insertions(+), 45 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=72d0c7e0a7ce398166bf…

1 0

Nikolay Sivov : mf: Implement sample delivering to transform nodes.
by Alexandre Julliard 13 Mar '20

13 Mar '20

Module: wine Branch: master Commit: 23757ca5139ca1ee2a617d207949edac5beb1e12 URL: https://source.winehq.org/git/wine.git/?a=commit;h=23757ca5139ca1ee2a617d20… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Mar 13 15:34:38 2020 +0300 mf: Implement sample delivering to transform nodes. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/session.c | 107 ++++++++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 87 insertions(+), 20 deletions(-) diff --git a/dlls/mf/session.c b/dlls/mf/session.c index 503948000e..e98be7c95f 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -119,6 +119,7 @@ struct sample struct transform_stream { struct list samples; + unsigned int requests; }; struct topo_node @@ -149,6 +150,7 @@ struct topo_node } sink; struct { + struct transform_stream *inputs; unsigned int *input_map; unsigned int input_count; @@ -659,8 +661,11 @@ static void release_topo_node(struct topo_node *node) IMFMediaSource_Release(node->u.source.source); break; case MF_TOPOLOGY_TRANSFORM_NODE: + for (i = 0; i < node->u.transform.input_count; ++i) + transform_stream_drop_samples(&node->u.transform.inputs[i]); for (i = 0; i < node->u.transform.output_count; ++i) transform_stream_drop_samples(&node->u.transform.outputs[i]); + heap_free(node->u.transform.inputs); heap_free(node->u.transform.outputs); heap_free(node->u.transform.input_map); heap_free(node->u.transform.output_map); @@ -1011,6 +1016,11 @@ static HRESULT session_set_transform_stream_info(struct topo_node *node) if (SUCCEEDED(hr)) { + streams = heap_calloc(input_count, sizeof(*streams)); + for (i = 0; i < input_count; ++i) + list_init(&streams[i].samples); + node->u.transform.inputs = streams; + streams = heap_calloc(output_count, sizeof(*streams)); for (i = 0; i < output_count; ++i) list_init(&streams[i].samples); @@ -2237,14 +2247,31 @@ static HRESULT transform_node_get_sample(struct topo_node *node, DWORD output, I buffers[i].pSample = NULL; buffers[i].dwStatus = 0; buffers[i].pEvents = NULL; + } - /* Buffer requirements. */ - memset(&stream_info, 0, sizeof(stream_info)); - if (FAILED(hr = IMFTransform_GetOutputStreamInfo(node->object.transform, buffers[i].dwStreamID, &stream_info))) - goto exit; + memset(&stream_info, 0, sizeof(stream_info)); + if (FAILED(hr = IMFTransform_GetOutputStreamInfo(node->object.transform, buffers[output].dwStreamID, &stream_info))) + goto exit; + + if (!(stream_info.dwFlags & MFT_OUTPUT_STREAM_PROVIDES_SAMPLES)) + { + IMFMediaBuffer *buffer = NULL; + + if (!stream_info.cbSize) + FIXME("Unhandled buffer size %u.\n", stream_info.cbSize); + + hr = MFCreateAlignedMemoryBuffer(stream_info.cbSize, stream_info.cbAlignment, &buffer); + if (SUCCEEDED(hr)) + hr = MFCreateSample(&buffers[output].pSample); + + if (SUCCEEDED(hr)) + hr = IMFSample_AddBuffer(buffers[output].pSample, buffer); - if (!(stream_info.dwFlags & MFT_OUTPUT_STREAM_PROVIDES_SAMPLES)) - FIXME("Allocate client sample for stream %u.\n", buffers[i].dwStreamID); + if (buffer) + IMFMediaBuffer_Release(buffer); + + if (FAILED(hr)) + goto exit; } hr = IMFTransform_ProcessOutput(node->object.transform, 0, node->u.transform.output_count, buffers, &status); @@ -2278,32 +2305,71 @@ exit: return hr; } -static void session_deliver_sample_to_node(struct media_session *session, IMFTopologyNode *downstream_node, - DWORD downstream_input, IMFSample *sample) +static void session_deliver_sample_to_node(struct media_session *session, IMFTopologyNode *node, DWORD input, + IMFSample *sample) { - MF_TOPOLOGY_TYPE downstream_type; - struct topo_node *node; - TOPOID downstream_id; + DWORD stream_id, downstream_input; + IMFTopologyNode *downstream_node; + struct topo_node *topo_node; + MF_TOPOLOGY_TYPE node_type; + TOPOID node_id; + unsigned int i; HRESULT hr; - IMFTopologyNode_GetNodeType(downstream_node, &downstream_type); - IMFTopologyNode_GetTopoNodeID(downstream_node, &downstream_id); + IMFTopologyNode_GetNodeType(node, &node_type); + IMFTopologyNode_GetTopoNodeID(node, &node_id); - node = session_get_node_by_id(session, downstream_id); + topo_node = session_get_node_by_id(session, node_id); - switch (downstream_type) + switch (node_type) { case MF_TOPOLOGY_OUTPUT_NODE: - if (node->u.sink.requests) + if (topo_node->u.sink.requests) { - if (FAILED(hr = IMFStreamSink_ProcessSample(node->object.sink_stream, sample))) + if (FAILED(hr = IMFStreamSink_ProcessSample(topo_node->object.sink_stream, sample))) WARN("Sample delivery failed, hr %#x.\n", hr); - node->u.sink.requests--; + topo_node->u.sink.requests--; } break; case MF_TOPOLOGY_TRANSFORM_NODE: + + stream_id = transform_node_get_stream_id(topo_node, FALSE, input); + + hr = IMFTransform_ProcessInput(topo_node->object.transform, stream_id, sample, 0); + if (hr == MF_E_NOTACCEPTING) + { + struct sample *sample_entry = heap_alloc(sizeof(*sample_entry)); + sample_entry->sample = sample; + list_add_tail(&topo_node->u.transform.inputs[input].samples, &sample_entry->entry); + } + else if (hr == S_OK) + { + /* Check if we need new output is available, push it down. */ + for (i = 0; i < topo_node->u.transform.output_count; ++i) + { + if (!topo_node->u.transform.outputs[i].requests) + continue; + + sample = NULL; + transform_node_get_sample(topo_node, i, &sample); + if (sample) + { + if (SUCCEEDED(hr = IMFTopologyNode_GetOutput(node, i, &downstream_node, &downstream_input))) + { + session_deliver_sample_to_node(session, downstream_node, downstream_input, sample); + topo_node->u.transform.outputs[i].requests--; + IMFTopologyNode_Release(downstream_node); + } + IMFSample_Release(sample); + } + } + } + else + WARN("Transform failed to process input sample, hr %#x.\n", hr); + + break; case MF_TOPOLOGY_TEE_NODE: - FIXME("Unhandled downstream node type %d.\n", downstream_type); + FIXME("Unhandled downstream node type %d.\n", node_type); break; default: ; @@ -2349,7 +2415,8 @@ static HRESULT session_request_sample_from_node(struct media_session *session, I { if (SUCCEEDED(hr = IMFTopologyNode_GetInput(node, 0 /* FIXME */, &upstream_node, &upstream_output))) { - hr = session_request_sample_from_node(session, upstream_node, upstream_output); + if (SUCCEEDED(hr = session_request_sample_from_node(session, upstream_node, upstream_output))) + topo_node->u.transform.outputs[output].requests++; IMFTopologyNode_Release(upstream_node); } }

1 0

Zebediah Figura : d3dcompiler/tests: Add some tests for d3d9 constant tables.
by Alexandre Julliard 13 Mar '20

13 Mar '20

Module: wine Branch: master Commit: 150aa985017299778bba606077b72c0d5f2f9bab URL: https://source.winehq.org/git/wine.git/?a=commit;h=150aa985017299778bba6060… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Mar 13 17:34:52 2020 +0100 d3dcompiler/tests: Add some tests for d3d9 constant tables. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_43/tests/hlsl_d3d9.c | 113 ++++++++++++++++++++++++++++++++++ 1 file changed, 113 insertions(+) diff --git a/dlls/d3dcompiler_43/tests/hlsl_d3d9.c b/dlls/d3dcompiler_43/tests/hlsl_d3d9.c index 7f391833f3..b16f6e3454 100644 --- a/dlls/d3dcompiler_43/tests/hlsl_d3d9.c +++ b/dlls/d3dcompiler_43/tests/hlsl_d3d9.c @@ -730,6 +730,118 @@ static void test_array_dimensions(void) release_test_context(&test_context); } +static void check_constant_desc(const char *prefix, const D3DXCONSTANT_DESC *desc, + const D3DXCONSTANT_DESC *expect, BOOL nonzero_defaultvalue) +{ + ok(!strcmp(desc->Name, expect->Name), "%s: got Name %s.\n", prefix, debugstr_a(desc->Name)); + ok(desc->RegisterSet == expect->RegisterSet, "%s: got RegisterSet %#x.\n", prefix, desc->RegisterSet); + ok(desc->RegisterCount == expect->RegisterCount, "%s: got RegisterCount %u.\n", prefix, desc->RegisterCount); + ok(desc->Class == expect->Class, "%s: got Class %#x.\n", prefix, desc->Class); + ok(desc->Type == expect->Type, "%s: got Type %#x.\n", prefix, desc->Type); + ok(desc->Rows == expect->Rows, "%s: got Rows %u.\n", prefix, desc->Rows); + ok(desc->Columns == expect->Columns, "%s: got Columns %u.\n", prefix, desc->Columns); + ok(desc->Elements == expect->Elements, "%s: got Elements %u.\n", prefix, desc->Elements); + ok(desc->StructMembers == expect->StructMembers, "%s: got StructMembers %u.\n", prefix, desc->StructMembers); + ok(desc->Bytes == expect->Bytes, "%s: got Bytes %u.\n", prefix, desc->Bytes); + ok(!!desc->DefaultValue == nonzero_defaultvalue, "%s: got DefaultValue %p.\n", prefix, desc->DefaultValue); +} + +static void test_constant_table(void) +{ + static const char *source = + "uniform float4 a;\n" + "uniform float b;\n" + "uniform float unused;\n" + "uniform float3x1 c;\n" + "uniform row_major float3x1 d;\n" + "uniform uint e;\n" + "uniform struct\n" + "{\n" + " float2x2 a;\n" + " float b;\n" + " float c;\n" + "} f;\n" + "uniform float g[5];\n" + "float4 main(uniform float4 h) : COLOR\n" + "{\n" + " return a + b + c._31 + d._31 + f.c + g[e] + h;\n" + "}"; + + D3DXCONSTANTTABLE_DESC table_desc; + ID3DXConstantTable *constants; + ID3D10Blob *ps_code = NULL; + D3DXHANDLE handle, field; + D3DXCONSTANT_DESC desc; + unsigned int i, j; + HRESULT hr; + UINT count; + + static const D3DXCONSTANT_DESC expect_constants[] = + { + {"$h", D3DXRS_FLOAT4, 0, 1, D3DXPC_VECTOR, D3DXPT_FLOAT, 1, 4, 1, 0, 16}, + {"a", D3DXRS_FLOAT4, 0, 1, D3DXPC_VECTOR, D3DXPT_FLOAT, 1, 4, 1, 0, 16}, + {"b", D3DXRS_FLOAT4, 0, 1, D3DXPC_SCALAR, D3DXPT_FLOAT, 1, 1, 1, 0, 4}, + {"c", D3DXRS_FLOAT4, 0, 1, D3DXPC_MATRIX_COLUMNS, D3DXPT_FLOAT, 3, 1, 1, 0, 12}, + {"d", D3DXRS_FLOAT4, 0, 3, D3DXPC_MATRIX_ROWS, D3DXPT_FLOAT, 3, 1, 1, 0, 12}, + {"e", D3DXRS_FLOAT4, 0, 1, D3DXPC_SCALAR, D3DXPT_INT, 1, 1, 1, 0, 4}, + {"f", D3DXRS_FLOAT4, 0, 4, D3DXPC_STRUCT, D3DXPT_VOID, 1, 6, 1, 3, 24}, + {"g", D3DXRS_FLOAT4, 0, 5, D3DXPC_SCALAR, D3DXPT_FLOAT, 1, 1, 5, 0, 20}, + }; + + static const D3DXCONSTANT_DESC expect_fields[] = + { + {"a", D3DXRS_FLOAT4, 0, 2, D3DXPC_MATRIX_COLUMNS, D3DXPT_FLOAT, 2, 2, 1, 0, 16}, + {"b", D3DXRS_FLOAT4, 0, 1, D3DXPC_SCALAR, D3DXPT_FLOAT, 1, 1, 1, 0, 4}, + {"c", D3DXRS_FLOAT4, 0, 1, D3DXPC_SCALAR, D3DXPT_FLOAT, 1, 1, 1, 0, 4}, + }; + + todo_wine ps_code = compile_shader(source, "ps_2_0"); + if (!ps_code) + return; + + hr = pD3DXGetShaderConstantTable(ID3D10Blob_GetBufferPointer(ps_code), &constants); + ok(hr == D3D_OK, "Got hr %#x.\n", hr); + + hr = ID3DXConstantTable_GetDesc(constants, &table_desc); + ok(hr == D3D_OK, "Got hr %#x.\n", hr); + ok(table_desc.Version == D3DPS_VERSION(2, 0), "Got Version %#x.\n", table_desc.Version); + ok(table_desc.Constants == 8, "Got %u constants.\n", table_desc.Constants); + + for (i = 0; i < table_desc.Constants; ++i) + { + char prefix[30]; + + handle = ID3DXConstantTable_GetConstant(constants, NULL, i); + ok(!!handle, "Failed to get constant.\n"); + memset(&desc, 0xcc, sizeof(desc)); + count = 1; + hr = ID3DXConstantTable_GetConstantDesc(constants, handle, &desc, &count); + ok(hr == D3D_OK, "Got hr %#x.\n", hr); + ok(count == 1, "Got count %u.\n", count); + sprintf(prefix, "Test %u", i); + check_constant_desc(prefix, &desc, &expect_constants[i], FALSE); + + if (!strcmp(desc.Name, "f")) + { + for (j = 0; j < ARRAY_SIZE(expect_fields); ++j) + { + field = ID3DXConstantTable_GetConstant(constants, handle, j); + ok(!!field, "Failed to get constant.\n"); + memset(&desc, 0xcc, sizeof(desc)); + count = 1; + hr = ID3DXConstantTable_GetConstantDesc(constants, field, &desc, &count); + ok(hr == D3D_OK, "Got hr %#x.\n", hr); + ok(count == 1, "Got count %u.\n", count); + sprintf(prefix, "Test %u, %u", i, j); + check_constant_desc(prefix, &desc, &expect_fields[j], !!j); + } + } + } + + ID3DXConstantTable_Release(constants); + ID3D10Blob_Release(ps_code); +} + static void test_fail(void) { static const char *tests[] = @@ -874,5 +986,6 @@ START_TEST(hlsl_d3d9) test_comma(); test_return(); test_array_dimensions(); + test_constant_table(); test_fail(); }

1 0