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
44c0e691
Commit
44c0e691
authored
Jul 13, 2020
by
Zebediah Figura
Committed by
Alexandre Julliard
Jul 14, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
quartz/vmr9: Auto-show the window when pausing, not when running.
Signed-off-by:
Zebediah Figura
<
z.figura12@gmail.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
4d580796
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
13 additions
and
6 deletions
+13
-6
vmr7.c
dlls/quartz/tests/vmr7.c
+2
-2
vmr9.c
dlls/quartz/tests/vmr9.c
+2
-2
vmr9.c
dlls/quartz/vmr9.c
+9
-2
No files found.
dlls/quartz/tests/vmr7.c
View file @
44c0e691
...
...
@@ -2130,14 +2130,14 @@ static void test_video_window_autoshow(IVideoWindow *window, IFilterGraph2 *grap
hr
=
IVideoWindow_get_Visible
(
window
,
&
l
);
ok
(
hr
==
S_OK
,
"Got hr %#x.
\n
"
,
hr
);
todo_wine
ok
(
l
==
OATRUE
,
"Got %d.
\n
"
,
l
);
ok
(
l
==
OATRUE
,
"Got %d.
\n
"
,
l
);
hr
=
IMediaControl_Stop
(
control
);
ok
(
hr
==
S_OK
,
"Got hr %#x.
\n
"
,
hr
);
hr
=
IVideoWindow_get_Visible
(
window
,
&
l
);
ok
(
hr
==
S_OK
,
"Got hr %#x.
\n
"
,
hr
);
todo_wine
ok
(
l
==
OATRUE
,
"Got %d.
\n
"
,
l
);
ok
(
l
==
OATRUE
,
"Got %d.
\n
"
,
l
);
hr
=
IVideoWindow_put_AutoShow
(
window
,
OAFALSE
);
ok
(
hr
==
S_OK
,
"Got hr %#x.
\n
"
,
hr
);
...
...
dlls/quartz/tests/vmr9.c
View file @
44c0e691
...
...
@@ -2376,14 +2376,14 @@ static void test_video_window_autoshow(IVideoWindow *window, IFilterGraph2 *grap
hr
=
IVideoWindow_get_Visible
(
window
,
&
l
);
ok
(
hr
==
S_OK
,
"Got hr %#x.
\n
"
,
hr
);
todo_wine
ok
(
l
==
OATRUE
,
"Got %d.
\n
"
,
l
);
ok
(
l
==
OATRUE
,
"Got %d.
\n
"
,
l
);
hr
=
IMediaControl_Stop
(
control
);
ok
(
hr
==
S_OK
,
"Got hr %#x.
\n
"
,
hr
);
hr
=
IVideoWindow_get_Visible
(
window
,
&
l
);
ok
(
hr
==
S_OK
,
"Got hr %#x.
\n
"
,
hr
);
todo_wine
ok
(
l
==
OATRUE
,
"Got %d.
\n
"
,
l
);
ok
(
l
==
OATRUE
,
"Got %d.
\n
"
,
l
);
hr
=
IVideoWindow_put_AutoShow
(
window
,
OAFALSE
);
ok
(
hr
==
S_OK
,
"Got hr %#x.
\n
"
,
hr
);
...
...
dlls/quartz/vmr9.c
View file @
44c0e691
...
...
@@ -477,13 +477,19 @@ static HRESULT allocate_surfaces(struct quartz_vmr *filter, const AM_MEDIA_TYPE
return
VFW_E_TYPE_NOT_ACCEPTED
;
}
static
void
vmr_
star
t_stream
(
struct
strmbase_renderer
*
iface
)
static
void
vmr_
ini
t_stream
(
struct
strmbase_renderer
*
iface
)
{
struct
quartz_vmr
*
filter
=
impl_from_IBaseFilter
(
&
iface
->
filter
.
IBaseFilter_iface
);
IVMRImagePresenter9_StartPresenting
(
filter
->
presenter
,
filter
->
cookie
);
if
(
filter
->
window
.
hwnd
&&
filter
->
window
.
AutoShow
)
ShowWindow
(
filter
->
window
.
hwnd
,
SW_SHOW
);
}
static
void
vmr_start_stream
(
struct
strmbase_renderer
*
iface
)
{
struct
quartz_vmr
*
filter
=
impl_from_IBaseFilter
(
&
iface
->
filter
.
IBaseFilter_iface
);
IVMRImagePresenter9_StartPresenting
(
filter
->
presenter
,
filter
->
cookie
);
SetEvent
(
filter
->
run_event
);
}
...
...
@@ -659,6 +665,7 @@ static const struct strmbase_renderer_ops renderer_ops =
{
.
pfnCheckMediaType
=
VMR9_CheckMediaType
,
.
pfnDoRenderSample
=
VMR9_DoRenderSample
,
.
renderer_init_stream
=
vmr_init_stream
,
.
renderer_start_stream
=
vmr_start_stream
,
.
renderer_stop_stream
=
vmr_stop_stream
,
.
pfnShouldDrawSampleNow
=
VMR9_ShouldDrawSampleNow
,
...
...
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