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
7ab646ad
Commit
7ab646ad
authored
Oct 12, 2020
by
Nikolay Sivov
Committed by
Alexandre Julliard
Oct 12, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
evr/mixer: Use regular media type interface for input streams.
Signed-off-by:
Nikolay Sivov
<
nsivov@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
14d2b044
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
9 deletions
+3
-9
mixer.c
dlls/evr/mixer.c
+3
-9
No files found.
dlls/evr/mixer.c
View file @
7ab646ad
...
...
@@ -40,7 +40,7 @@ struct input_stream
{
unsigned
int
id
;
IMFAttributes
*
attributes
;
IMF
Video
MediaType
*
media_type
;
IMFMediaType
*
media_type
;
MFVideoNormalizedRect
rect
;
unsigned
int
zorder
;
};
...
...
@@ -170,7 +170,7 @@ static void video_mixer_clear_types(struct video_mixer *mixer)
for
(
i
=
0
;
i
<
mixer
->
input_count
;
++
i
)
{
if
(
mixer
->
inputs
[
i
].
media_type
)
IMF
Video
MediaType_Release
(
mixer
->
inputs
[
i
].
media_type
);
IMFMediaType_Release
(
mixer
->
inputs
[
i
].
media_type
);
mixer
->
inputs
[
i
].
media_type
=
NULL
;
}
for
(
i
=
0
;
i
<
mixer
->
output
.
type_count
;
++
i
)
...
...
@@ -714,14 +714,8 @@ static HRESULT WINAPI video_mixer_transform_SetInputType(IMFTransform *iface, DW
if
(
SUCCEEDED
(
hr
=
video_mixer_collect_output_types
(
mixer
,
&
video_desc
,
service
,
count
,
guids
,
flags
))
&&
!
(
flags
&
MFT_SET_TYPE_TEST_ONLY
))
{
GUID
subtype
=
{
0
};
if
(
FAILED
(
hr
=
IMFMediaType_GetGUID
(
media_type
,
&
MF_MT_SUBTYPE
,
&
subtype
)))
WARN
(
"Failed to get subtype %#x.
\n
"
,
hr
);
if
(
SUCCEEDED
(
hr
=
MFCreateVideoMediaTypeFromSubtype
(
&
subtype
,
&
mixer
->
inputs
[
0
].
media_type
)))
if
(
SUCCEEDED
(
hr
=
MFCreateMediaType
(
&
mixer
->
inputs
[
0
].
media_type
)))
hr
=
IMFMediaType_CopyAllItems
(
media_type
,
(
IMFAttributes
*
)
mixer
->
inputs
[
0
].
media_type
);
}
CoTaskMemFree
(
guids
);
}
...
...
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