Module: wine Branch: master Commit: ead0e8e5cfcfa3a56217c4f535e960ba99b2485b URL: https://source.winehq.org/git/wine.git/?a=commit;h=ead0e8e5cfcfa3a56217c4f53...
Author: Zebediah Figura z.figura12@gmail.com Date: Wed Jul 22 18:29:22 2020 -0500
quartz: Correctly convert reference time to REFTIME in IBasicVideo::get_AvgTimePerFrame().
Signed-off-by: Zebediah Figura z.figura12@gmail.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/quartz/tests/videorenderer.c | 2 +- dlls/quartz/tests/vmr9.c | 2 +- dlls/quartz/window.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/dlls/quartz/tests/videorenderer.c b/dlls/quartz/tests/videorenderer.c index ac2cadc4b1..9e6a618a36 100644 --- a/dlls/quartz/tests/videorenderer.c +++ b/dlls/quartz/tests/videorenderer.c @@ -2702,7 +2702,7 @@ static void test_basic_video(void) reftime = 0.0; hr = IBasicVideo_get_AvgTimePerFrame(video, &reftime); ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(reftime == 0.02, "Got frame rate %.16e.\n", reftime); + ok(reftime == 0.02, "Got frame rate %.16e.\n", reftime);
l = 0xdeadbeef; hr = IBasicVideo_get_BitRate(video, &l); diff --git a/dlls/quartz/tests/vmr9.c b/dlls/quartz/tests/vmr9.c index 092ee87132..789c5e429a 100644 --- a/dlls/quartz/tests/vmr9.c +++ b/dlls/quartz/tests/vmr9.c @@ -3717,7 +3717,7 @@ static void test_basic_video(void) reftime = 0.0; hr = IBasicVideo_get_AvgTimePerFrame(video, &reftime); ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(compare_double(reftime, 0.02, 1 << 28), "Got frame rate %.16e.\n", reftime); + ok(compare_double(reftime, 0.02, 1 << 28), "Got frame rate %.16e.\n", reftime);
l = 0xdeadbeef; hr = IBasicVideo_get_BitRate(video, &l); diff --git a/dlls/quartz/window.c b/dlls/quartz/window.c index a5ff4979ef..07e042eccd 100644 --- a/dlls/quartz/window.c +++ b/dlls/quartz/window.c @@ -755,7 +755,7 @@ static HRESULT WINAPI basic_video_get_AvgTimePerFrame(IBasicVideo *iface, REFTIM
TRACE("window %p, reftime %p.\n", window, reftime);
- *reftime = get_video_format(window)->AvgTimePerFrame; + *reftime = (double)get_video_format(window)->AvgTimePerFrame / 1e7; return S_OK; }