marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mf: Return presentation clock properties. 

Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
stable
Nikolay Sivov 2019-05-31 13:11:31 +03:00 committed by Alexandre Julliard
parent 34ffec67a7
commit bd2e2141b0
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
dlls/mf/session.c
View File

@ -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;

9
dlls/mf/tests/mf.c
View File

@ -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)
{