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
28423d79
Commit
28423d79
authored
Apr 11, 2022
by
Nikolay Sivov
Committed by
Alexandre Julliard
Apr 11, 2022
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
evr/mixer: Implement GetVideoProcessorCaps().
Signed-off-by:
Nikolay Sivov
<
nsivov@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
0289b9c2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
26 additions
and
3 deletions
+26
-3
mixer.c
dlls/evr/mixer.c
+23
-2
evr.c
dlls/evr/tests/evr.c
+3
-1
No files found.
dlls/evr/mixer.c
View file @
28423d79
...
...
@@ -1956,9 +1956,30 @@ static HRESULT WINAPI video_mixer_processor_GetAvailableVideoProcessorModes(IMFV
static
HRESULT
WINAPI
video_mixer_processor_GetVideoProcessorCaps
(
IMFVideoProcessor
*
iface
,
GUID
*
mode
,
DXVA2_VideoProcessorCaps
*
caps
)
{
FIXME
(
"%p, %s, %p.
\n
"
,
iface
,
debugstr_guid
(
mode
),
caps
);
struct
video_mixer
*
mixer
=
impl_from_IMFVideoProcessor
(
iface
);
IDirectXVideoProcessorService
*
service
;
DXVA2_VideoDesc
video_desc
;
GUID
subtype
=
{
0
};
HRESULT
hr
;
return
E_NOTIMPL
;
TRACE
(
"%p, %s, %p.
\n
"
,
iface
,
debugstr_guid
(
mode
),
caps
);
EnterCriticalSection
(
&
mixer
->
cs
);
if
(
!
mixer
->
inputs
[
0
].
media_type
||
!
mixer
->
output
.
media_type
)
hr
=
MF_E_TRANSFORM_TYPE_NOT_SET
;
else
if
(
SUCCEEDED
(
hr
=
video_mixer_get_processor_service
(
mixer
,
&
service
)))
{
video_mixer_init_dxva_videodesc
(
mixer
->
inputs
[
0
].
media_type
,
&
video_desc
);
IMFMediaType_GetGUID
(
mixer
->
output
.
media_type
,
&
MF_MT_SUBTYPE
,
&
subtype
);
hr
=
IDirectXVideoProcessorService_GetVideoProcessorCaps
(
service
,
mode
,
&
video_desc
,
subtype
.
Data1
,
caps
);
IDirectXVideoProcessorService_Release
(
service
);
}
LeaveCriticalSection
(
&
mixer
->
cs
);
return
hr
;
}
static
HRESULT
WINAPI
video_mixer_processor_GetVideoProcessorMode
(
IMFVideoProcessor
*
iface
,
GUID
*
mode
)
...
...
dlls/evr/tests/evr.c
View file @
28423d79
...
...
@@ -1292,7 +1292,6 @@ static void test_default_mixer_type_negotiation(void)
ok
(
hr
==
MF_E_TRANSFORM_TYPE_NOT_SET
,
"Unexpected hr %#lx.
\n
"
,
hr
);
hr
=
IMFVideoProcessor_GetVideoProcessorCaps
(
processor
,
(
GUID
*
)
&
DXVA2_VideoProcSoftwareDevice
,
&
caps
);
todo_wine
ok
(
hr
==
MF_E_TRANSFORM_TYPE_NOT_SET
,
"Unexpected hr %#lx.
\n
"
,
hr
);
hr
=
IMFTransform_GetInputCurrentType
(
transform
,
0
,
&
media_type
);
...
...
@@ -1324,6 +1323,9 @@ static void test_default_mixer_type_negotiation(void)
ok
(
count
>
0
&&
!!
guids
,
"Unexpected modes data.
\n
"
);
CoTaskMemFree
(
guids
);
hr
=
IMFVideoProcessor_GetVideoProcessorCaps
(
processor
,
(
GUID
*
)
&
DXVA2_VideoProcSoftwareDevice
,
&
caps
);
ok
(
hr
==
S_OK
,
"Unexpected hr %#lx.
\n
"
,
hr
);
hr
=
IMFTransform_GetOutputCurrentType
(
transform
,
0
,
&
media_type2
);
ok
(
hr
==
S_OK
,
"Unexpected hr %#lx.
\n
"
,
hr
);
ok
(
media_type
==
media_type2
,
"Unexpected media type instance.
\n
"
);
...
...
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