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
13dbe644
Commit
13dbe644
authored
Oct 21, 2019
by
Zebediah Figura
Committed by
Alexandre Julliard
Oct 22, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
quartz/filtergraph: Pause the graph even if AM_SEEKING_NoFlush is used.
Signed-off-by:
Zebediah Figura
<
z.figura12@gmail.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
facbd058
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
4 deletions
+12
-4
filtergraph.c
dlls/quartz/filtergraph.c
+2
-2
filtergraph.c
dlls/quartz/tests/filtergraph.c
+10
-2
No files found.
dlls/quartz/filtergraph.c
View file @
13dbe644
...
@@ -2583,7 +2583,7 @@ static HRESULT WINAPI MediaSeeking_SetPositions(IMediaSeeking *iface, LONGLONG *
...
@@ -2583,7 +2583,7 @@ static HRESULT WINAPI MediaSeeking_SetPositions(IMediaSeeking *iface, LONGLONG *
EnterCriticalSection
(
&
graph
->
cs
);
EnterCriticalSection
(
&
graph
->
cs
);
state
=
graph
->
state
;
state
=
graph
->
state
;
if
(
state
==
State_Running
&&
!
(
current_flags
&
AM_SEEKING_NoFlush
)
)
if
(
state
==
State_Running
)
IMediaControl_Pause
(
&
graph
->
IMediaControl_iface
);
IMediaControl_Pause
(
&
graph
->
IMediaControl_iface
);
LIST_FOR_EACH_ENTRY
(
filter
,
&
graph
->
filters
,
struct
filter
,
entry
)
LIST_FOR_EACH_ENTRY
(
filter
,
&
graph
->
filters
,
struct
filter
,
entry
)
...
@@ -2616,7 +2616,7 @@ static HRESULT WINAPI MediaSeeking_SetPositions(IMediaSeeking *iface, LONGLONG *
...
@@ -2616,7 +2616,7 @@ static HRESULT WINAPI MediaSeeking_SetPositions(IMediaSeeking *iface, LONGLONG *
if
((
current_flags
&
0x7
)
!=
AM_SEEKING_NoPositioning
)
if
((
current_flags
&
0x7
)
!=
AM_SEEKING_NoPositioning
)
graph
->
pause_time
=
graph
->
start_time
=
-
1
;
graph
->
pause_time
=
graph
->
start_time
=
-
1
;
if
(
state
==
State_Running
&&
!
(
current_flags
&
AM_SEEKING_NoFlush
)
)
if
(
state
==
State_Running
)
IMediaControl_Run
(
&
graph
->
IMediaControl_iface
);
IMediaControl_Run
(
&
graph
->
IMediaControl_iface
);
LeaveCriticalSection
(
&
graph
->
cs
);
LeaveCriticalSection
(
&
graph
->
cs
);
...
...
dlls/quartz/tests/filtergraph.c
View file @
13dbe644
...
@@ -3917,6 +3917,14 @@ static void test_graph_seeking(void)
...
@@ -3917,6 +3917,14 @@ static void test_graph_seeking(void)
"Expected about 1234ms, got %s.
\n
"
,
wine_dbgstr_longlong
(
current
));
"Expected about 1234ms, got %s.
\n
"
,
wine_dbgstr_longlong
(
current
));
ok
(
stop
==
9000
*
10000
,
"Got time %s.
\n
"
,
wine_dbgstr_longlong
(
stop
));
ok
(
stop
==
9000
*
10000
,
"Got time %s.
\n
"
,
wine_dbgstr_longlong
(
stop
));
/* This remains true even if NoFlush is specified. */
current
=
1000
*
10000
;
stop
=
8000
*
10000
;
hr
=
IMediaSeeking_SetPositions
(
seeking
,
&
current
,
AM_SEEKING_AbsolutePositioning
|
AM_SEEKING_NoFlush
,
&
stop
,
AM_SEEKING_AbsolutePositioning
|
AM_SEEKING_NoFlush
);
ok
(
hr
==
S_OK
,
"Got hr %#x.
\n
"
,
hr
);
Sleep
(
100
);
Sleep
(
100
);
hr
=
IMediaSeeking_GetCurrentPosition
(
seeking
,
&
time
);
hr
=
IMediaSeeking_GetCurrentPosition
(
seeking
,
&
time
);
...
@@ -3928,7 +3936,7 @@ static void test_graph_seeking(void)
...
@@ -3928,7 +3936,7 @@ static void test_graph_seeking(void)
ok
(
hr
==
S_OK
,
"Got hr %#x.
\n
"
,
hr
);
ok
(
hr
==
S_OK
,
"Got hr %#x.
\n
"
,
hr
);
ok
(
abs
(
current
-
1334
*
10000
)
<
40
*
10000
,
ok
(
abs
(
current
-
1334
*
10000
)
<
40
*
10000
,
"Expected about 1334ms, got %s.
\n
"
,
wine_dbgstr_longlong
(
current
));
"Expected about 1334ms, got %s.
\n
"
,
wine_dbgstr_longlong
(
current
));
ok
(
stop
==
9
000
*
10000
,
"Got time %s.
\n
"
,
wine_dbgstr_longlong
(
stop
));
ok
(
stop
==
8
000
*
10000
,
"Got time %s.
\n
"
,
wine_dbgstr_longlong
(
stop
));
hr
=
IMediaControl_Pause
(
control
);
hr
=
IMediaControl_Pause
(
control
);
todo_wine
ok
(
hr
==
S_OK
,
"Got hr %#x.
\n
"
,
hr
);
todo_wine
ok
(
hr
==
S_OK
,
"Got hr %#x.
\n
"
,
hr
);
...
@@ -3946,7 +3954,7 @@ static void test_graph_seeking(void)
...
@@ -3946,7 +3954,7 @@ static void test_graph_seeking(void)
ok
(
hr
==
S_OK
,
"Got hr %#x.
\n
"
,
hr
);
ok
(
hr
==
S_OK
,
"Got hr %#x.
\n
"
,
hr
);
todo_wine
ok
(
abs
(
current
-
1334
*
10000
)
<
40
*
10000
,
todo_wine
ok
(
abs
(
current
-
1334
*
10000
)
<
40
*
10000
,
"Expected about 1334ms, got %s.
\n
"
,
wine_dbgstr_longlong
(
current
));
"Expected about 1334ms, got %s.
\n
"
,
wine_dbgstr_longlong
(
current
));
ok
(
stop
==
9
000
*
10000
,
"Got time %s.
\n
"
,
wine_dbgstr_longlong
(
stop
));
ok
(
stop
==
8
000
*
10000
,
"Got time %s.
\n
"
,
wine_dbgstr_longlong
(
stop
));
hr
=
IMediaControl_Stop
(
control
);
hr
=
IMediaControl_Stop
(
control
);
ok
(
hr
==
S_OK
,
"Got hr %#x.
\n
"
,
hr
);
ok
(
hr
==
S_OK
,
"Got 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