[PATCH v2 01/13] mf/tests: Wait for sample delivery before checking the frame size.

[Conor McCarthy]

From: Conor McCarthy

The size update always occurs before sample delivery, but not always
before MESessionStarted.
---
 dlls/mf/tests/mf.c | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c
index fab0e4e86e1..f3093293d6b 100644
--- a/dlls/mf/tests/mf.c
+++ b/dlls/mf/tests/mf.c
@@ -3048,6 +3048,12 @@ static HRESULT WINAPI test_grabber_callback_OnProcessSample(IMFSampleGrabberSink
     HRESULT hr;
     DWORD res;

+    if (grabber->ready_event && !grabber->done_event)
+    {
+        SetEvent(grabber->ready_event);
+        return S_OK;
+    }
+
     if (!grabber->ready_event)
         return E_NOTIMPL;

@@ -6698,6 +6704,7 @@ static void test_h264_output_alignment(void)
     UINT64 frame_size;
     UINT32 status;
     HRESULT hr;
+    DWORD ret;

hr = MFStartup(MF_VERSION, MFSTARTUP_FULL);
     ok(hr == S_OK, "Failed to start up, hr %#lx.\n", hr);
@@ -6711,6 +6718,8 @@ static void test_h264_output_alignment(void)
     }

grabber_callback = impl_from_IMFSampleGrabberSinkCallback(create_test_grabber_callback());
+    grabber_callback->ready_event = CreateEventW(NULL, FALSE, FALSE, NULL);
+    ok(!!grabber_callback->ready_event, "CreateEventW failed, error %lu\n", GetLastError());

hr = MFCreateMediaType(&output_type);
     ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
@@ -6767,9 +6776,9 @@ static void test_h264_output_alignment(void)
     hr = IMFMediaSession_Start(session, &GUID_NULL, &propvar);
     ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);

-    /* frame size change occurs before MESessionStarted */
-    hr = wait_media_event(session, callback, MESessionStarted, 5000, &propvar);
-    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+    /* frame size change occurs before the first sample is delivered */
+    ret = WaitForSingleObject(grabber_callback->ready_event, 1000);
+    ok(ret == WAIT_OBJECT_0, "WaitForSingleObject returned %lu\n", ret);
     frame_size = get_current_media_type_frame_size(transform);
     todo_wine
     ok(frame_size == (((UINT64)64 << 32) | 80), "Unexpected frame size %#llx\n", frame_size);