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
186ed57b
Commit
186ed57b
authored
Jun 17, 2020
by
Nikolay Sivov
Committed by
Alexandre Julliard
Jun 17, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
evr: Add IMFTopologyServiceLookupClient stub for default mixer.
Signed-off-by:
Nikolay Sivov
<
nsivov@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
8d791562
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
55 additions
and
3 deletions
+55
-3
mixer.c
dlls/evr/mixer.c
+54
-0
evr.c
dlls/evr/tests/evr.c
+1
-3
No files found.
dlls/evr/mixer.c
View file @
186ed57b
...
...
@@ -30,6 +30,7 @@ struct video_mixer
{
IMFTransform
IMFTransform_iface
;
IMFVideoDeviceID
IMFVideoDeviceID_iface
;
IMFTopologyServiceLookupClient
IMFTopologyServiceLookupClient_iface
;
LONG
refcount
;
};
...
...
@@ -43,6 +44,11 @@ static struct video_mixer *impl_from_IMFVideoDeviceID(IMFVideoDeviceID *iface)
return
CONTAINING_RECORD
(
iface
,
struct
video_mixer
,
IMFVideoDeviceID_iface
);
}
static
struct
video_mixer
*
impl_from_IMFTopologyServiceLookupClient
(
IMFTopologyServiceLookupClient
*
iface
)
{
return
CONTAINING_RECORD
(
iface
,
struct
video_mixer
,
IMFTopologyServiceLookupClient_iface
);
}
static
HRESULT
WINAPI
video_mixer_transform_QueryInterface
(
IMFTransform
*
iface
,
REFIID
riid
,
void
**
obj
)
{
struct
video_mixer
*
mixer
=
impl_from_IMFTransform
(
iface
);
...
...
@@ -58,6 +64,10 @@ static HRESULT WINAPI video_mixer_transform_QueryInterface(IMFTransform *iface,
{
*
obj
=
&
mixer
->
IMFVideoDeviceID_iface
;
}
else
if
(
IsEqualIID
(
riid
,
&
IID_IMFTopologyServiceLookupClient
))
{
*
obj
=
&
mixer
->
IMFTopologyServiceLookupClient_iface
;
}
else
{
WARN
(
"Unsupported interface %s.
\n
"
,
debugstr_guid
(
riid
));
...
...
@@ -328,6 +338,49 @@ static const IMFVideoDeviceIDVtbl video_mixer_device_id_vtbl =
video_mixer_device_id_GetDeviceID
,
};
static
HRESULT
WINAPI
video_mixer_service_client_QueryInterface
(
IMFTopologyServiceLookupClient
*
iface
,
REFIID
riid
,
void
**
obj
)
{
struct
video_mixer
*
mixer
=
impl_from_IMFTopologyServiceLookupClient
(
iface
);
return
IMFTransform_QueryInterface
(
&
mixer
->
IMFTransform_iface
,
riid
,
obj
);
}
static
ULONG
WINAPI
video_mixer_service_client_AddRef
(
IMFTopologyServiceLookupClient
*
iface
)
{
struct
video_mixer
*
mixer
=
impl_from_IMFTopologyServiceLookupClient
(
iface
);
return
IMFTransform_AddRef
(
&
mixer
->
IMFTransform_iface
);
}
static
ULONG
WINAPI
video_mixer_service_client_Release
(
IMFTopologyServiceLookupClient
*
iface
)
{
struct
video_mixer
*
mixer
=
impl_from_IMFTopologyServiceLookupClient
(
iface
);
return
IMFTransform_Release
(
&
mixer
->
IMFTransform_iface
);
}
static
HRESULT
WINAPI
video_mixer_service_client_InitServicePointers
(
IMFTopologyServiceLookupClient
*
iface
,
IMFTopologyServiceLookup
*
service_lookup
)
{
FIXME
(
"%p, %p.
\n
"
,
iface
,
service_lookup
);
return
E_NOTIMPL
;
}
static
HRESULT
WINAPI
video_mixer_service_client_ReleaseServicePointers
(
IMFTopologyServiceLookupClient
*
iface
)
{
FIXME
(
"%p.
\n
"
,
iface
);
return
E_NOTIMPL
;
}
static
const
IMFTopologyServiceLookupClientVtbl
video_mixer_service_client_vtbl
=
{
video_mixer_service_client_QueryInterface
,
video_mixer_service_client_AddRef
,
video_mixer_service_client_Release
,
video_mixer_service_client_InitServicePointers
,
video_mixer_service_client_ReleaseServicePointers
,
};
HRESULT
WINAPI
MFCreateVideoMixer
(
IUnknown
*
owner
,
REFIID
riid_device
,
REFIID
riid
,
void
**
obj
)
{
TRACE
(
"%p, %s, %s, %p.
\n
"
,
owner
,
debugstr_guid
(
riid_device
),
debugstr_guid
(
riid
),
obj
);
...
...
@@ -352,6 +405,7 @@ HRESULT evr_mixer_create(IUnknown *outer, void **out)
object
->
IMFTransform_iface
.
lpVtbl
=
&
video_mixer_transform_vtbl
;
object
->
IMFVideoDeviceID_iface
.
lpVtbl
=
&
video_mixer_device_id_vtbl
;
object
->
IMFTopologyServiceLookupClient_iface
.
lpVtbl
=
&
video_mixer_service_client_vtbl
;
object
->
refcount
=
1
;
*
out
=
&
object
->
IMFTransform_iface
;
...
...
dlls/evr/tests/evr.c
View file @
186ed57b
...
...
@@ -350,10 +350,8 @@ static void test_default_mixer(void)
ok
(
hr
==
S_OK
,
"Failed to create default mixer, hr %#x.
\n
"
,
hr
);
hr
=
IMFTransform_QueryInterface
(
transform
,
&
IID_IMFTopologyServiceLookupClient
,
(
void
**
)
&
unk
);
todo_wine
ok
(
hr
==
S_OK
,
"Unexpected hr %#x.
\n
"
,
hr
);
if
(
SUCCEEDED
(
hr
))
IUnknown_Release
(
unk
);
IUnknown_Release
(
unk
);
hr
=
IMFTransform_QueryInterface
(
transform
,
&
IID_IMFVideoDeviceID
,
(
void
**
)
&
deviceid
);
ok
(
hr
==
S_OK
,
"Unexpected hr %#x.
\n
"
,
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