Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-cw
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-cw
Commits
bd2e2141
Commit
bd2e2141
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: Return presentation clock properties.
Signed-off-by:
Nikolay Sivov
<
nsivov@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
34ffec67
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
7 deletions
+9
-7
session.c
dlls/mf/session.c
+1
-6
mf.c
dlls/mf/tests/mf.c
+8
-1
No files found.
dlls/mf/session.c
View file @
bd2e2141
...
...
@@ -894,15 +894,10 @@ static HRESULT WINAPI present_clock_GetProperties(IMFPresentationClock *iface, M
TRACE
(
"%p, %p.
\n
"
,
iface
,
props
);
EnterCriticalSection
(
&
clock
->
cs
);
if
(
clock
->
time_source
)
{
FIXME
(
"%p, %p.
\n
"
,
iface
,
props
);
hr
=
E_NOTIMPL
;
}
hr
=
IMFPresentationTimeSource_GetProperties
(
clock
->
time_source
,
props
);
else
hr
=
MF_E_CLOCK_NO_TIME_SOURCE
;
LeaveCriticalSection
(
&
clock
->
cs
);
return
hr
;
...
...
dlls/mf/tests/mf.c
View file @
bd2e2141
...
...
@@ -1427,9 +1427,9 @@ static void test_presentation_clock(void)
};
IMFClockStateSink
test_sink
=
{
&
test_clock_sink_vtbl
};
IMFPresentationTimeSource
*
time_source
;
MFCLOCK_PROPERTIES
props
,
props2
;
IMFRateControl
*
rate_control
;
IMFPresentationClock
*
clock
;
MFCLOCK_PROPERTIES
props
;
IMFShutdown
*
shutdown
;
LONGLONG
clock_time
;
MFCLOCK_STATE
state
;
...
...
@@ -1498,11 +1498,18 @@ todo_wine
hr
=
IMFPresentationClock_SetTimeSource
(
clock
,
time_source
);
ok
(
hr
==
S_OK
,
"Failed to set time source, hr %#x.
\n
"
,
hr
);
hr
=
IMFPresentationTimeSource_GetProperties
(
time_source
,
&
props2
);
ok
(
hr
==
S_OK
,
"Failed to get time source properties, hr %#x.
\n
"
,
hr
);
hr
=
IMFPresentationClock_GetClockCharacteristics
(
clock
,
&
value
);
ok
(
hr
==
S_OK
,
"Failed to get clock flags, hr %#x.
\n
"
,
hr
);
ok
(
value
==
(
MFCLOCK_CHARACTERISTICS_FLAG_FREQUENCY_10MHZ
|
MFCLOCK_CHARACTERISTICS_FLAG_IS_SYSTEM_CLOCK
),
"Unexpected clock flags %#x.
\n
"
,
value
);
hr
=
IMFPresentationClock_GetProperties
(
clock
,
&
props
);
ok
(
hr
==
S_OK
,
"Failed to get clock properties, hr %#x.
\n
"
,
hr
);
ok
(
!
memcmp
(
&
props
,
&
props2
,
sizeof
(
props
)),
"Unexpected clock properties.
\n
"
);
/* State changes. */
for
(
i
=
0
;
i
<
ARRAY_SIZE
(
clock_state_change
);
++
i
)
{
...
...
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