[PATCH v3 09/12] mf: Always queue a sample unless stopped.

[Brendan McGrath]

From: Brendan McGrath

---
 dlls/mf/samplegrabber.c | 10 +---------
 dlls/mf/tests/mf.c      |  1 +
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/dlls/mf/samplegrabber.c b/dlls/mf/samplegrabber.c
index 160125e5910..88da642b25e 100644
--- a/dlls/mf/samplegrabber.c
+++ b/dlls/mf/samplegrabber.c
@@ -432,7 +432,7 @@ static HRESULT WINAPI sample_grabber_stream_ProcessSample(IMFStreamSink *iface,

if (grabber->is_shut_down)
         hr = MF_E_STREAMSINK_REMOVED;
-    else if (grabber->state == SINK_STATE_RUNNING || (grabber->state == SINK_STATE_PAUSED && grabber->ignore_clock))
+    else if (grabber->state != SINK_STATE_STOPPED)
     {
         hr = IMFSample_GetSampleTime(sample, &sampletime);

@@ -450,14 +450,6 @@ static HRESULT WINAPI sample_grabber_stream_ProcessSample(IMFStreamSink *iface,
                 hr = stream_queue_sample(grabber, sample);
         }
     }
-    else if (grabber->state == SINK_STATE_PAUSED)
-    {
-        if (grabber->sample_count < MAX_SAMPLE_QUEUE_LENGTH)
-        {
-            IMFSample_AddRef(sample);
-            grabber->samples[grabber->sample_count++] = sample;
-        }
-    }

LeaveCriticalSection(&grabber->cs);

diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c
index f167d6e184e..ba34ac5c287 100644
--- a/dlls/mf/tests/mf.c
+++ b/dlls/mf/tests/mf.c
@@ -4857,6 +4857,7 @@ 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 */