Commit 616ae1e3 authored by Rémi Bernon's avatar Rémi Bernon Committed by Alexandre Julliard

mf: Always enumerate branch source types for transform nodes.

parent 08ec06da
...@@ -2986,13 +2986,13 @@ static void test_topology_loader(void) ...@@ -2986,13 +2986,13 @@ static void test_topology_loader(void)
/* Float -> PCM, refuse input type, add converter */ /* 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, .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, .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 */ /* 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, .input_type = &audio_float_44100, .output_type = &audio_pcm_48000_resampler, .sink_method = MF_CONNECT_DIRECT, .source_method = -1,
.expected_result = S_OK, .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 { ...@@ -3449,7 +3449,7 @@ todo_wine {
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) && !(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); ok(!handler.set_current_count, "got %lu SetCurrentMediaType\n", handler.set_current_count);
if (handler.current_type) if (handler.current_type)
......
...@@ -498,7 +498,7 @@ static HRESULT topology_loader_resolve_branches(struct topoloader_context *conte ...@@ -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)); WARN("Failed to clone nodes for branch %s\n", debugstr_topology_branch(branch));
else else
hr = topology_branch_connect(context->output_topology, MF_CONNECT_ALLOW_DECODER, 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); topology_branch_destroy(branch);
if (FAILED(hr)) if (FAILED(hr))
......
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