Commit ae3c9e32 authored by Bernhard Kölbl's avatar Bernhard Kölbl Committed by Alexandre Julliard

mf: Set media types for output nodes in the media session.

Instead of the topology loader.
parent f1b9c9a4
...@@ -117,3 +117,4 @@ extern BOOL mf_is_sample_copier_transform(IMFTransform *transform) DECLSPEC_HIDD ...@@ -117,3 +117,4 @@ extern BOOL mf_is_sample_copier_transform(IMFTransform *transform) DECLSPEC_HIDD
extern BOOL mf_is_sar_sink(IMFMediaSink *sink) DECLSPEC_HIDDEN; extern BOOL mf_is_sar_sink(IMFMediaSink *sink) DECLSPEC_HIDDEN;
extern HRESULT topology_node_get_object(IMFTopologyNode *node, REFIID riid, void **obj) DECLSPEC_HIDDEN; extern HRESULT topology_node_get_object(IMFTopologyNode *node, REFIID riid, void **obj) DECLSPEC_HIDDEN;
extern HRESULT topology_node_get_type_handler(IMFTopologyNode *node, DWORD stream, BOOL output, IMFMediaTypeHandler **handler) DECLSPEC_HIDDEN; extern HRESULT topology_node_get_type_handler(IMFTopologyNode *node, DWORD stream, BOOL output, IMFMediaTypeHandler **handler) DECLSPEC_HIDDEN;
extern HRESULT topology_node_init_media_type(IMFTopologyNode *node, DWORD stream, BOOL output, IMFMediaType **type) DECLSPEC_HIDDEN;
...@@ -596,6 +596,60 @@ static HRESULT session_bind_output_nodes(IMFTopology *topology) ...@@ -596,6 +596,60 @@ static HRESULT session_bind_output_nodes(IMFTopology *topology)
return hr; return hr;
} }
static HRESULT session_init_media_types(IMFTopology *topology)
{
MF_TOPOLOGY_TYPE node_type;
WORD node_count, i, j;
IMFTopologyNode *node;
IMFMediaType *type;
DWORD input_count;
HRESULT hr;
if (FAILED(hr = IMFTopology_GetNodeCount(topology, &node_count)))
return hr;
for (i = 0; i < node_count; ++i)
{
if (FAILED(hr = IMFTopology_GetNode(topology, i, &node)))
break;
if (FAILED(hr = IMFTopologyNode_GetInputCount(node, &input_count))
|| FAILED(hr = IMFTopologyNode_GetNodeType(node, &node_type))
|| node_type != MF_TOPOLOGY_OUTPUT_NODE)
{
IMFTopologyNode_Release(node);
continue;
}
for (j = 0; j < input_count; ++j)
{
IMFMediaTypeHandler *handler;
IMFTopologyNode *up_node;
DWORD up_output;
if (SUCCEEDED(hr = IMFTopologyNode_GetInput(node, j, &up_node, &up_output)))
{
hr = topology_node_init_media_type(up_node, up_output, TRUE, &type);
IMFTopologyNode_Release(up_node);
}
if (FAILED(hr))
break;
if (SUCCEEDED(hr = topology_node_get_type_handler(node, j, FALSE, &handler)))
{
hr = IMFMediaTypeHandler_SetCurrentMediaType(handler, type);
IMFMediaTypeHandler_Release(handler);
}
IMFMediaType_Release(type);
}
IMFTopologyNode_Release(node);
}
return hr;
}
static void session_set_caps(struct media_session *session, DWORD caps) static void session_set_caps(struct media_session *session, DWORD caps)
{ {
DWORD delta = session->caps ^ caps; DWORD delta = session->caps ^ caps;
...@@ -1768,6 +1822,8 @@ static void session_set_topology(struct media_session *session, DWORD flags, IMF ...@@ -1768,6 +1822,8 @@ static void session_set_topology(struct media_session *session, DWORD flags, IMF
if (SUCCEEDED(hr)) if (SUCCEEDED(hr))
hr = IMFTopoLoader_Load(session->topo_loader, topology, &resolved_topology, NULL /* FIXME? */); hr = IMFTopoLoader_Load(session->topo_loader, topology, &resolved_topology, NULL /* FIXME? */);
if (SUCCEEDED(hr))
hr = session_init_media_types(resolved_topology);
if (SUCCEEDED(hr)) if (SUCCEEDED(hr))
{ {
......
...@@ -2263,7 +2263,6 @@ static void test_media_session_events(void) ...@@ -2263,7 +2263,6 @@ static void test_media_session_events(void)
PropVariantClear(&propvar); PropVariantClear(&propvar);
ok(handler.enum_count, "got %lu GetMediaTypeByIndex\n", handler.enum_count); ok(handler.enum_count, "got %lu GetMediaTypeByIndex\n", handler.enum_count);
todo_wine
ok(handler.set_current_count, "got %lu SetCurrentMediaType\n", handler.set_current_count); ok(handler.set_current_count, "got %lu SetCurrentMediaType\n", handler.set_current_count);
handler.enum_count = handler.set_current_count = 0; handler.enum_count = handler.set_current_count = 0;
...@@ -2342,7 +2341,6 @@ static void test_media_session_events(void) ...@@ -2342,7 +2341,6 @@ static void test_media_session_events(void)
PropVariantClear(&propvar); PropVariantClear(&propvar);
ok(!handler.enum_count, "got %lu GetMediaTypeByIndex\n", handler.enum_count); ok(!handler.enum_count, "got %lu GetMediaTypeByIndex\n", handler.enum_count);
todo_wine
ok(handler.set_current_count, "got %lu SetCurrentMediaType\n", handler.set_current_count); ok(handler.set_current_count, "got %lu SetCurrentMediaType\n", handler.set_current_count);
handler.enum_count = handler.set_current_count = 0; handler.enum_count = handler.set_current_count = 0;
...@@ -3431,8 +3429,6 @@ todo_wine { ...@@ -3431,8 +3429,6 @@ todo_wine {
ok(handler.enum_count, "got %lu GetMediaTypeByIndex\n", handler.enum_count); ok(handler.enum_count, "got %lu GetMediaTypeByIndex\n", handler.enum_count);
else else
ok(!handler.enum_count, "got %lu GetMediaTypeByIndex\n", handler.enum_count); ok(!handler.enum_count, "got %lu GetMediaTypeByIndex\n", handler.enum_count);
todo_wine_if(test->flags & LOADER_NO_CURRENT_OUTPUT)
ok(!handler.set_current_count, "got %lu SetCurrentMediaType\n", handler.set_current_count); ok(!handler.set_current_count, "got %lu SetCurrentMediaType\n", handler.set_current_count);
if (handler.current_type) if (handler.current_type)
......
...@@ -335,7 +335,7 @@ static HRESULT topology_branch_connect_indirect(IMFTopology *topology, MF_CONNEC ...@@ -335,7 +335,7 @@ static HRESULT topology_branch_connect_indirect(IMFTopology *topology, MF_CONNEC
return hr; return hr;
} }
static HRESULT topology_branch_get_current_type(IMFMediaTypeHandler *handler, IMFMediaType **type) static HRESULT get_first_supported_media_type(IMFMediaTypeHandler *handler, IMFMediaType **type)
{ {
IMFMediaType *media_type; IMFMediaType *media_type;
HRESULT hr; HRESULT hr;
...@@ -359,12 +359,28 @@ static HRESULT topology_branch_get_current_type(IMFMediaTypeHandler *handler, IM ...@@ -359,12 +359,28 @@ static HRESULT topology_branch_get_current_type(IMFMediaTypeHandler *handler, IM
return hr; return hr;
} }
HRESULT topology_node_init_media_type(IMFTopologyNode *node, DWORD stream, BOOL output, IMFMediaType **type)
{
IMFMediaTypeHandler *handler;
HRESULT hr;
if (SUCCEEDED(hr = topology_node_get_type_handler(node, stream, output, &handler)))
{
if (SUCCEEDED(hr = get_first_supported_media_type(handler, type)))
hr = IMFMediaTypeHandler_SetCurrentMediaType(handler, *type);
IMFMediaTypeHandler_Release(handler);
}
return hr;
}
static HRESULT topology_branch_connect_down(IMFTopology *topology, MF_CONNECT_METHOD method_mask, static HRESULT topology_branch_connect_down(IMFTopology *topology, MF_CONNECT_METHOD method_mask,
struct topology_branch *branch, IMFMediaType *up_type) struct topology_branch *branch, IMFMediaType *up_type)
{ {
IMFMediaTypeHandler *down_handler; IMFMediaTypeHandler *down_handler;
IMFMediaType *down_type = NULL; IMFMediaType *down_type = NULL;
MF_CONNECT_METHOD method; MF_CONNECT_METHOD method;
MF_TOPOLOGY_TYPE type;
DWORD flags; DWORD flags;
HRESULT hr; HRESULT hr;
...@@ -377,7 +393,7 @@ static HRESULT topology_branch_connect_down(IMFTopology *topology, MF_CONNECT_ME ...@@ -377,7 +393,7 @@ static HRESULT topology_branch_connect_down(IMFTopology *topology, MF_CONNECT_ME
if (FAILED(hr = topology_node_get_type_handler(branch->down.node, branch->down.stream, FALSE, &down_handler))) if (FAILED(hr = topology_node_get_type_handler(branch->down.node, branch->down.stream, FALSE, &down_handler)))
return hr; return hr;
if (SUCCEEDED(hr = topology_branch_get_current_type(down_handler, &down_type)) if (SUCCEEDED(hr = get_first_supported_media_type(down_handler, &down_type))
&& IMFMediaType_IsEqual(up_type, down_type, &flags) == S_OK) && IMFMediaType_IsEqual(up_type, down_type, &flags) == S_OK)
{ {
TRACE("Connecting branch %s with current type %p.\n", debugstr_topology_branch(branch), up_type); TRACE("Connecting branch %s with current type %p.\n", debugstr_topology_branch(branch), up_type);
...@@ -385,11 +401,16 @@ static HRESULT topology_branch_connect_down(IMFTopology *topology, MF_CONNECT_ME ...@@ -385,11 +401,16 @@ static HRESULT topology_branch_connect_down(IMFTopology *topology, MF_CONNECT_ME
goto done; goto done;
} }
if (SUCCEEDED(hr = IMFMediaTypeHandler_IsMediaTypeSupported(down_handler, up_type, NULL)) if (SUCCEEDED(hr = IMFMediaTypeHandler_IsMediaTypeSupported(down_handler, up_type, NULL)))
&& SUCCEEDED(hr = IMFMediaTypeHandler_SetCurrentMediaType(down_handler, up_type)))
{ {
TRACE("Connected branch %s with upstream type %p.\n", debugstr_topology_branch(branch), up_type); TRACE("Connected branch %s with upstream type %p.\n", debugstr_topology_branch(branch), up_type);
if (SUCCEEDED(IMFTopologyNode_GetNodeType(branch->down.node, &type)) && type == MF_TOPOLOGY_TRANSFORM_NODE
&& FAILED(hr = IMFMediaTypeHandler_SetCurrentMediaType(down_handler, up_type)))
WARN("Failed to set transform node media type, hr %#lx\n", hr);
hr = IMFTopologyNode_ConnectOutput(branch->up.node, branch->up.stream, branch->down.node, branch->down.stream); hr = IMFTopologyNode_ConnectOutput(branch->up.node, branch->up.stream, branch->down.node, branch->down.stream);
goto done; goto done;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment