Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-cw
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-cw
Commits
616ae1e3
Commit
616ae1e3
authored
Sep 03, 2022
by
Rémi Bernon
Committed by
Alexandre Julliard
Nov 08, 2022
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
mf: Always enumerate branch source types for transform nodes.
parent
08ec06da
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
mf.c
dlls/mf/tests/mf.c
+3
-3
topology_loader.c
dlls/mf/topology_loader.c
+1
-1
No files found.
dlls/mf/tests/mf.c
View file @
616ae1e3
...
...
@@ -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
)
...
...
dlls/mf/topology_loader.c
View file @
616ae1e3
...
...
@@ -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
))
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment