From f414ee56173e63afe954db9da46b44cfcb8bb4e4 Mon Sep 17 00:00:00 2001 From: Francois Gouget Date: Fri, 13 Nov 2020 14:59:22 +0100 Subject: [PATCH 1/3] mmdevapi:render: Trace the position in milliseconds too. To: Wine Devel The position is always compared to the wall time since the stream started which is in milliseconds. So it makes sense to trace the position in the same unit so it can be readily compared. Signed-off-by: Francois Gouget --- dlls/mmdevapi/tests/render.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/mmdevapi/tests/render.c b/dlls/mmdevapi/tests/render.c index acb39393f8d..839cca4ab80 100644 --- a/dlls/mmdevapi/tests/render.c +++ b/dlls/mmdevapi/tests/render.c @@ -1105,7 +1105,7 @@ static void test_clock(int share) ok(hr == S_OK, "GetPosition failed: %08x\n", hr); ok(pos > 0, "Position %u vs. last %u\n", (UINT)pos,0); /* in rare cases is slept*1.1 not enough with dmix */ - ok(pos*1000/freq <= slept*1.4, "Position %u too far after playing %ums\n", (UINT)pos, slept); + ok(pos*1000/freq <= slept*1.4, "Position %u (%ums) too far after playing %ums\n", (UINT)pos, (UINT)(pos*1000/freq), slept); last = pos; hr = IAudioClient_Stop(ac); @@ -1116,7 +1116,7 @@ static void test_clock(int share) ok(pos >= last, "Position %u vs. last %u\n", (UINT)pos,(UINT)last); last = pos; if(/*share &&*/ winetest_debug>1) - ok(pos*1000/freq <= slept*1.1, "Position %u too far after stop %ums\n", (UINT)pos, slept); + ok(pos*1000/freq <= slept*1.1, "Position %u (%ums) too far after stop %ums\n", (UINT)pos, (UINT)(pos*1000/freq), slept); hr = IAudioClient_Start(ac); /* #2 */ ok(hr == S_OK, "Start failed: %08x\n", hr); @@ -1151,7 +1151,7 @@ static void test_clock(int share) /* Prove that Stop must not drop frames (in shared mode). */ ok(pad ? pos > last : pos >= last, "Position %u vs. last %u\n", (UINT)pos,(UINT)last); if (share && pad > 0 && winetest_debug>1) - ok(pos*1000/freq <= slept*1.1, "Position %u too far after playing %ums\n", (UINT)pos, slept); + ok(pos*1000/freq <= slept*1.1, "Position %u (%ums) too far after playing %ums\n", (UINT)pos, (UINT)(pos*1000/freq), slept); /* in exclusive mode, testbot's w7 machines yield pos > sum-pad */ if(/*share &&*/ winetest_debug>1) ok(pos * pwfx->nSamplesPerSec == (sum-pad) * freq, @@ -1209,7 +1209,7 @@ static void test_clock(int share) ok(pos > last, "Position %u vs. last %u\n", (UINT)pos,(UINT)last); ok(pos * pwfx->nSamplesPerSec <= sum * freq, "Position %u > written %u\n", (UINT)pos, sum); if (winetest_debug>1) - ok(pos*1000/freq <= slept*1.1, "Position %u too far after playing %ums\n", (UINT)pos, slept); + ok(pos*1000/freq <= slept*1.1, "Position %u (%ums) too far after playing %ums\n", (UINT)pos, (UINT)(pos*1000/freq), slept); else skip("Rerun with WINETEST_DEBUG=2 for GetPosition tests.\n"); last = pos; @@ -1230,7 +1230,7 @@ static void test_clock(int share) ok(pcpos > pcpos0, "pcpos should increase\n"); ok(pos * pwfx->nSamplesPerSec <= sum * freq, "Position %u > written %u\n", (UINT)pos, sum); if (pad > 0 && winetest_debug>1) - ok(pos*1000/freq <= slept*1.1, "Position %u too far after stop %ums\n", (UINT)pos, slept); + ok(pos*1000/freq <= slept*1.1, "Position %u (%ums) too far after stop %ums\n", (UINT)pos, (UINT)(pos*1000/freq), slept); if(winetest_debug>1) ok(pos * pwfx->nSamplesPerSec == (sum-pad) * freq, "Position %u after stop vs. %u padding\n", (UINT)pos, pad); @@ -1319,7 +1319,7 @@ static void test_clock(int share) if (winetest_debug>1) { /* Padding does not lag behind by much */ ok(pos * pwfx->nSamplesPerSec <= (sum-pad+fragment) * freq, "Position %u > written %u\n", (UINT)pos, sum); - ok(pos*1000/freq <= slept*1.1, "Position %u too far after %ums\n", (UINT)pos, slept); + ok(pos*1000/freq <= slept*1.1, "Position %u (%ums) too far after %ums\n", (UINT)pos, (UINT)(pos*1000/freq), slept); if (pad) /* not in case of underrun */ ok((pos-last)*1000/freq >= 90 && 110 >= (pos-last)*1000/freq, "Position delta %ld not regular: %ld ms\n", (long)(pos-last), (long)((pos-last)*1000/freq)); -- 2.20.1