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
2bc81c53
Commit
2bc81c53
authored
May 31, 2019
by
Nikolay Sivov
Committed by
Alexandre Julliard
May 31, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
mf: Forward GetCorrelatedTime() to time source.
Signed-off-by:
Nikolay Sivov
<
nsivov@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
f8537c5a
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
20 additions
and
3 deletions
+20
-3
session.c
dlls/mf/session.c
+10
-2
mf.c
dlls/mf/tests/mf.c
+10
-1
No files found.
dlls/mf/session.c
View file @
2bc81c53
...
...
@@ -857,9 +857,17 @@ static HRESULT WINAPI present_clock_GetClockCharacteristics(IMFPresentationClock
static
HRESULT
WINAPI
present_clock_GetCorrelatedTime
(
IMFPresentationClock
*
iface
,
DWORD
reserved
,
LONGLONG
*
clock_time
,
MFTIME
*
system_time
)
{
FIXME
(
"%p, %#x, %p, %p.
\n
"
,
iface
,
reserved
,
clock_time
,
system_time
);
struct
presentation_clock
*
clock
=
impl_from_IMFPresentationClock
(
iface
);
HRESULT
hr
=
MF_E_CLOCK_NO_TIME_SOURCE
;
return
E_NOTIMPL
;
TRACE
(
"%p, %#x, %p, %p.
\n
"
,
iface
,
reserved
,
clock_time
,
system_time
);
EnterCriticalSection
(
&
clock
->
cs
);
if
(
clock
->
time_source
)
hr
=
IMFPresentationTimeSource_GetCorrelatedTime
(
clock
->
time_source
,
reserved
,
clock_time
,
system_time
);
LeaveCriticalSection
(
&
clock
->
cs
);
return
hr
;
}
static
HRESULT
WINAPI
present_clock_GetContinuityKey
(
IMFPresentationClock
*
iface
,
DWORD
*
key
)
...
...
dlls/mf/tests/mf.c
View file @
2bc81c53
...
...
@@ -1476,7 +1476,12 @@ static void test_presentation_clock(void)
ok
(
state
==
MFCLOCK_STATE_INVALID
,
"Unexpected state %d.
\n
"
,
state
);
hr
=
IMFPresentationClock_GetCorrelatedTime
(
clock
,
0
,
&
clock_time
,
&
systime
);
todo_wine
ok
(
hr
==
MF_E_CLOCK_NO_TIME_SOURCE
,
"Unexpected hr %#x.
\n
"
,
hr
);
hr
=
IMFPresentationClock_GetCorrelatedTime
(
clock
,
0
,
NULL
,
&
systime
);
ok
(
hr
==
MF_E_CLOCK_NO_TIME_SOURCE
,
"Unexpected hr %#x.
\n
"
,
hr
);
hr
=
IMFPresentationClock_GetCorrelatedTime
(
clock
,
0
,
&
time
,
NULL
);
ok
(
hr
==
MF_E_CLOCK_NO_TIME_SOURCE
,
"Unexpected hr %#x.
\n
"
,
hr
);
/* Sinks. */
...
...
@@ -1564,6 +1569,10 @@ todo_wine
ok
(
hr
==
S_OK
,
"Failed to get time source time, hr %#x.
\n
"
,
hr
);
ok
(
time
==
clock_time
,
"Unexpected clock time.
\n
"
);
hr
=
IMFPresentationClock_GetCorrelatedTime
(
clock
,
0
,
&
time
,
&
systime
);
ok
(
hr
==
S_OK
,
"Failed to get clock time, hr %#x.
\n
"
,
hr
);
ok
(
time
==
clock_time
,
"Unexpected clock time.
\n
"
);
IMFPresentationTimeSource_Release
(
time_source
);
hr
=
IMFPresentationClock_QueryInterface
(
clock
,
&
IID_IMFRateControl
,
(
void
**
)
&
rate_control
);
...
...
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