Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
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-winehq
Commits
c1c48562
Commit
c1c48562
authored
Sep 07, 2020
by
Nikolay Sivov
Committed by
Alexandre Julliard
Sep 07, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
mf/evr: Actually use custom mixer when available.
Signed-off-by:
Nikolay Sivov
<
nsivov@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
cc66d5de
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
22 additions
and
14 deletions
+22
-14
evr.c
dlls/mf/evr.c
+22
-14
No files found.
dlls/mf/evr.c
View file @
c1c48562
...
@@ -734,7 +734,7 @@ static HRESULT video_renderer_create_mixer(struct video_renderer *renderer, IMFA
...
@@ -734,7 +734,7 @@ static HRESULT video_renderer_create_mixer(struct video_renderer *renderer, IMFA
CLSID
clsid
;
CLSID
clsid
;
HRESULT
hr
;
HRESULT
hr
;
if
(
SUCCEEDED
(
IMFAttributes_GetUnknown
(
attributes
,
&
MF_ACTIVATE_CUSTOM_VIDEO_MIXER_ACTIVATE
,
if
(
SUCCEEDED
(
hr
=
IMFAttributes_GetUnknown
(
attributes
,
&
MF_ACTIVATE_CUSTOM_VIDEO_MIXER_ACTIVATE
,
&
IID_IMFActivate
,
(
void
**
)
&
activate
)))
&
IID_IMFActivate
,
(
void
**
)
&
activate
)))
{
{
IMFAttributes_GetUINT32
(
attributes
,
&
MF_ACTIVATE_CUSTOM_VIDEO_MIXER_FLAGS
,
&
flags
);
IMFAttributes_GetUINT32
(
attributes
,
&
MF_ACTIVATE_CUSTOM_VIDEO_MIXER_FLAGS
,
&
flags
);
...
@@ -744,23 +744,31 @@ static HRESULT video_renderer_create_mixer(struct video_renderer *renderer, IMFA
...
@@ -744,23 +744,31 @@ static HRESULT video_renderer_create_mixer(struct video_renderer *renderer, IMFA
return
hr
;
return
hr
;
}
}
if
(
FAILED
(
IMFAttributes_GetGUID
(
attributes
,
&
MF_ACTIVATE_CUSTOM_VIDEO_MIXER_CLSID
,
&
clsid
)))
/* Activation object failed, use class activation. */
memcpy
(
&
clsid
,
&
CLSID_MFVideoMixer9
,
sizeof
(
clsid
));
if
(
FAILED
(
hr
))
{
if
(
FAILED
(
IMFAttributes_GetGUID
(
attributes
,
&
MF_ACTIVATE_CUSTOM_VIDEO_MIXER_CLSID
,
&
clsid
)))
memcpy
(
&
clsid
,
&
CLSID_MFVideoMixer9
,
sizeof
(
clsid
));
hr
=
CoCreateInstance
(
&
clsid
,
NULL
,
CLSCTX_INPROC_SERVER
,
&
IID_IMFTransform
,
(
void
**
)
out
);
}
if
(
SUCCEEDED
(
hr
=
CoCreateInstance
(
&
clsid
,
NULL
,
CLSCTX_INPROC_SERVER
,
&
IID_IMFTransform
,
(
void
**
)
out
)
))
if
(
FAILED
(
hr
))
{
{
if
(
SUCCEEDED
(
hr
=
IMFTransform_QueryInterface
(
*
out
,
&
IID_IMFTopologyServiceLookupClient
,
WARN
(
"Failed to create a mixer object, hr %#x.
\n
"
,
hr
);
(
void
**
)
&
lookup_client
)))
return
hr
;
}
if
(
SUCCEEDED
(
hr
=
IMFTransform_QueryInterface
(
*
out
,
&
IID_IMFTopologyServiceLookupClient
,
(
void
**
)
&
lookup_client
)))
{
renderer
->
flags
|=
EVR_INIT_SERVICES
;
if
(
SUCCEEDED
(
hr
=
IMFTopologyServiceLookupClient_InitServicePointers
(
lookup_client
,
&
renderer
->
IMFTopologyServiceLookup_iface
)))
{
{
renderer
->
flags
|=
EVR_INIT_SERVICES
;
renderer
->
flags
|=
EVR_MIXER_INITED_SERVICES
;
if
(
SUCCEEDED
(
hr
=
IMFTopologyServiceLookupClient_InitServicePointers
(
lookup_client
,
&
renderer
->
IMFTopologyServiceLookup_iface
)))
{
renderer
->
flags
|=
EVR_MIXER_INITED_SERVICES
;
}
renderer
->
flags
&=
~
EVR_INIT_SERVICES
;
IMFTopologyServiceLookupClient_Release
(
lookup_client
);
}
}
renderer
->
flags
&=
~
EVR_INIT_SERVICES
;
IMFTopologyServiceLookupClient_Release
(
lookup_client
);
}
}
return
hr
;
return
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