niansa-misc/wine
1
0
Fork 0
mirror of synced 2025-03-07 03:53:26 +01:00
Code Issues Projects Releases Packages Wiki Activity

mf/topology_loader: Initialize transform output type before adding converter.

Browse source 
Otherwise the next topology_branch_connect call will fail when it will
try to lookup the upstream element media type.
This commit is contained in:
Rémi Bernon 2024-01-19 12:09:11 +01:00 • committed by Alexandre Julliard
parent 2a185126ca
commit d95d113230
2 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
dlls/mf/tests/mf.c
View file

@ -3633,10 +3633,7 @@ todo_wine {
}
hr = IMFTransform_GetOutputCurrentType(transform, 0, &media_type);
todo_wine
ok(hr == S_OK, "Failed to get transform input type, hr %#lx.\n", hr);
if (hr == S_OK)
{
if (IsEqualGUID(&test->converter_class, &GUID_NULL))
{
hr = IMFMediaType_Compare(output_type, (IMFAttributes *)media_type, MF_ATTRIBUTES_MATCH_OUR_ITEMS, &ret);
@ -3648,7 +3645,6 @@ todo_wine {
check_media_type(media_type, *test->decoded_type, -1);
}
IMFMediaType_Release(media_type);
}
IMFTransform_Release(transform);
}

9
dlls/mf/topology_loader.c
View file

@ -297,6 +297,7 @@ static HRESULT topology_branch_connect_indirect(IMFTopology *topology, MF_CONNEC
struct topology_branch down_branch = {.up.node = node, .down = branch->down};
struct topology_branch up_branch = {.up = branch->up, .down.node = node};
MF_CONNECT_METHOD method = method_mask;
IMFMediaType *media_type;
if (FAILED(IMFActivate_ActivateObject(activates[i], &IID_IMFTransform, (void **)&transform)))
continue;
@ -315,6 +316,14 @@ static HRESULT topology_branch_connect_indirect(IMFTopology *topology, MF_CONNEC
}
IMFTransform_Release(transform);
if (SUCCEEDED(hr) && method != MF_CONNECT_DIRECT
&& SUCCEEDED(IMFTransform_GetOutputAvailableType(transform, 0, 0, &media_type)))
{
if (SUCCEEDED(topology_branch_fill_media_type(up_type, media_type)))
IMFTransform_SetOutputType(transform, 0, media_type, 0);
IMFMediaType_Release(media_type);
}
if (SUCCEEDED(hr))
hr = topology_branch_connect(topology, method, &down_branch, !down_type);
if (SUCCEEDED(hr))