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
7a2dc025
Commit
7a2dc025
authored
Jun 29, 2020
by
Nikolay Sivov
Committed by
Alexandre Julliard
Jun 29, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
evr: Store background color property for the mixer.
Signed-off-by:
Nikolay Sivov
<
nsivov@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
43eebcd3
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
26 additions
and
9 deletions
+26
-9
mixer.c
dlls/evr/mixer.c
+21
-4
evr.c
dlls/evr/tests/evr.c
+5
-5
No files found.
dlls/evr/mixer.c
View file @
7a2dc025
...
...
@@ -67,6 +67,8 @@ struct video_mixer
unsigned
int
input_count
;
struct
output_stream
output
;
COLORREF
bkgnd_color
;
IDirect3DDeviceManager9
*
device_manager
;
CRITICAL_SECTION
cs
;
...
...
@@ -1187,16 +1189,31 @@ static HRESULT WINAPI video_mixer_processor_SetFilteringValue(IMFVideoProcessor
static
HRESULT
WINAPI
video_mixer_processor_GetBackgroundColor
(
IMFVideoProcessor
*
iface
,
COLORREF
*
color
)
{
FIXME
(
"%p, %p.
\n
"
,
iface
,
color
);
struct
video_mixer
*
mixer
=
impl_from_IMFVideoProcessor
(
iface
);
return
E_NOTIMPL
;
TRACE
(
"%p, %p.
\n
"
,
iface
,
color
);
if
(
!
color
)
return
E_POINTER
;
EnterCriticalSection
(
&
mixer
->
cs
);
*
color
=
mixer
->
bkgnd_color
;
LeaveCriticalSection
(
&
mixer
->
cs
);
return
S_OK
;
}
static
HRESULT
WINAPI
video_mixer_processor_SetBackgroundColor
(
IMFVideoProcessor
*
iface
,
COLORREF
color
)
{
FIXME
(
"%p, %#x.
\n
"
,
iface
,
color
);
struct
video_mixer
*
mixer
=
impl_from_IMFVideoProcessor
(
iface
);
return
E_NOTIMPL
;
TRACE
(
"%p, %#x.
\n
"
,
iface
,
color
);
EnterCriticalSection
(
&
mixer
->
cs
);
mixer
->
bkgnd_color
=
color
;
LeaveCriticalSection
(
&
mixer
->
cs
);
return
S_OK
;
}
static
const
IMFVideoProcessorVtbl
video_mixer_processor_vtbl
=
...
...
dlls/evr/tests/evr.c
View file @
7a2dc025
...
...
@@ -413,21 +413,21 @@ static void test_default_mixer(void)
hr
=
IMFGetService_GetService
(
gs
,
&
MR_VIDEO_MIXER_SERVICE
,
&
IID_IMFVideoProcessor
,
(
void
**
)
&
processor
);
ok
(
hr
==
S_OK
,
"Unexpected hr %#x.
\n
"
,
hr
);
hr
=
IMFVideoProcessor_GetBackgroundColor
(
processor
,
NULL
);
ok
(
hr
==
E_POINTER
,
"Unexpected hr %#x.
\n
"
,
hr
);
color
=
1
;
hr
=
IMFVideoProcessor_GetBackgroundColor
(
processor
,
&
color
);
todo_wine
{
ok
(
hr
==
S_OK
,
"Unexpected hr %#x.
\n
"
,
hr
);
ok
(
!
color
,
"Unexpected color %#x.
\n
"
,
color
);
}
hr
=
IMFVideoProcessor_SetBackgroundColor
(
processor
,
0x00121212
);
todo_wine
ok
(
hr
==
S_OK
,
"Unexpected hr %#x.
\n
"
,
hr
);
hr
=
IMFVideoProcessor_GetBackgroundColor
(
processor
,
&
color
);
todo_wine
{
ok
(
hr
==
S_OK
,
"Unexpected hr %#x.
\n
"
,
hr
);
ok
(
color
==
0x121212
,
"Unexpected color %#x.
\n
"
,
color
);
}
hr
=
IMFVideoProcessor_GetFilteringRange
(
processor
,
DXVA2_DetailFilterChromaLevel
,
&
range
);
todo_wine
ok
(
hr
==
MF_E_TRANSFORM_TYPE_NOT_SET
,
"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