From: Brendan McGrath bmcgrath@codeweavers.com
This switches the order of the RequestSample and Marker events to match the order on Windows. --- dlls/mf/samplegrabber.c | 4 ++-- dlls/mf/tests/mf.c | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/dlls/mf/samplegrabber.c b/dlls/mf/samplegrabber.c index 7d6ccde533b..621151127fb 100644 --- a/dlls/mf/samplegrabber.c +++ b/dlls/mf/samplegrabber.c @@ -751,6 +751,8 @@ static HRESULT WINAPI sample_grabber_stream_timer_callback_Invoke(IMFAsyncCallba WARN("Failed to report a sample, hr %#lx.\n", hr); stream_release_pending_item(grabber, item); sample_reported = TRUE; + if (sample_delivered) + sample_grabber_stream_request_sample(grabber); } else { @@ -760,8 +762,6 @@ static HRESULT WINAPI sample_grabber_stream_timer_callback_Invoke(IMFAsyncCallba } } } - if (sample_delivered) - sample_grabber_stream_request_sample(grabber);
LeaveCriticalSection(&grabber->cs);
diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 0190adfc819..79acccd7cd9 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -4818,7 +4818,6 @@ static void test_sample_grabber_seek(void)
SET_EXPECT(MEStreamSinkMarker); samples_requested = count_samples_requested(stream); - todo_wine ok(samples_requested == 1, "Unexpected number of samples requested %d\n", samples_requested); CHECK_CALLED(MEStreamSinkMarker); CHECK_CALLED(timer_SetTimer); @@ -4835,7 +4834,6 @@ static void test_sample_grabber_seek(void) CHECK_CALLED(timer_CancelTimer);
samples_requested = count_samples_requested(stream); - todo_wine ok(samples_requested == 4, "Unexpected number of samples requested %d\n", samples_requested);
/* test number of new sample requests on seek whilst paused and no samples provided */