system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-09-15 02:04:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

mf: Always enumerate branch source types for transform nodes.

Browse source
This commit is contained in:
Rémi Bernon 2022-09-03 17:34:14 +02:00 committed by Alexandre Julliard
parent 08ec06da54
commit 616ae1e38d
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2986,13 +2986,13 @@ static void test_topology_loader(void)
/* Float -> PCM, refuse input type, add converter */
.input_type = &audio_float_44100, .output_type = &audio_pcm_48000, .sink_method = MF_CONNECT_DIRECT, .source_method = -1,
.expected_result = MF_E_NO_MORE_TYPES,
.flags = LOADER_SET_INVALID_INPUT | LOADER_ADD_RESAMPLER_MFT | LOADER_EXPECTED_CONVERTER | LOADER_TODO,
.flags = LOADER_SET_INVALID_INPUT | LOADER_ADD_RESAMPLER_MFT | LOADER_EXPECTED_CONVERTER,
},
{
/* Float -> PCM, refuse input type, add converter, allow resampler output type */
.input_type = &audio_float_44100, .output_type = &audio_pcm_48000_resampler, .sink_method = MF_CONNECT_DIRECT, .source_method = -1,
.expected_result = S_OK,
.flags = LOADER_SET_INVALID_INPUT | LOADER_ADD_RESAMPLER_MFT | LOADER_EXPECTED_CONVERTER | LOADER_TODO,
.flags = LOADER_SET_INVALID_INPUT | LOADER_ADD_RESAMPLER_MFT | LOADER_EXPECTED_CONVERTER,
},
{
@ -3449,7 +3449,7 @@ todo_wine {
else
ok(!handler.enum_count, "got %lu GetMediaTypeByIndex\n", handler.enum_count);
todo_wine_if((test->flags & LOADER_NO_CURRENT_OUTPUT) && !(test->flags & LOADER_SET_MEDIA_TYPES))
todo_wine_if(test->flags & LOADER_NO_CURRENT_OUTPUT)
ok(!handler.set_current_count, "got %lu SetCurrentMediaType\n", handler.set_current_count);
if (handler.current_type)

2
dlls/mf/topology_loader.c
View file

@ -498,7 +498,7 @@ static HRESULT topology_loader_resolve_branches(struct topoloader_context *conte
WARN("Failed to clone nodes for branch %s\n", debugstr_topology_branch(branch));
else
hr = topology_branch_connect(context->output_topology, MF_CONNECT_ALLOW_DECODER,
branch, enumerate_source_types);
branch, enumerate_source_types || node_type == MF_TOPOLOGY_TRANSFORM_NODE);
topology_branch_destroy(branch);
if (FAILED(hr))