[PATCH 1/6] mf/samplegrabber: Always release cancellation key when timer is invoked.

[Nikolay Sivov]

On 1/5/22 21:38, Nikolay Sivov wrote:
>
>
> On 1/5/22 18:52, Derek Lesho wrote:
>> On 1/5/22 06:01, Nikolay Sivov wrote:
>>
>>>
>>>
>>> On 1/4/22 20:35, Derek Lesho wrote:
>>>> The sample grabber currently leaks the key on the last invokation 
>>>> of the timer, as it is only released when stream_schedule_sample is 
>>>> called.
>>> It's also released when sample grabber sink is released. Is that not 
>>> always enough? Or is that useful when sink is reused for next topology?
>>>
>>>
>> The problem is that it introduces a circular dependency, the cancel 
>> key holds a reference to the timer callback, which contributes to the 
>> reference count of the sample grabber stream sink and media sink.
> I see, so this could be solved by releasing this key on shutdown, and 
> ensuring that shutdown actually happens. I'll take a look at what's 
> going on with its special IMFActivate vs normal shutdown method.
>
This better matches what I see from experimenting with the timer. I'll 
send it after 7.0. Question about properly shutting the sink down still 
remains.
-------------- next part --------------
From b415bce051be5dd094cbc3ab7c6b4981d1b6d441 Mon Sep 17 00:00:00 2001
From: Nikolay Sivov <nsivov at codeweavers.com>
Date: Thu, 6 Jan 2022 19:16:20 +0300
Subject: [PATCH] mf/samplegrabber: Cancel pending sample timer.

Signed-off-by: Nikolay Sivov <nsivov at codeweavers.com>
---
 dlls/mf/samplegrabber.c | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/dlls/mf/samplegrabber.c b/dlls/mf/samplegrabber.c
index e0287e1e1db..e7d3be68df3 100644
--- a/dlls/mf/samplegrabber.c
+++ b/dlls/mf/samplegrabber.c
@@ -849,11 +849,7 @@ static ULONG WINAPI sample_grabber_sink_Release(IMFMediaSink *iface)
         if (grabber->clock)
             IMFPresentationClock_Release(grabber->clock);
         if (grabber->timer)
-        {
-            if (grabber->cancel_key)
-                IMFTimer_CancelTimer(grabber->timer, grabber->cancel_key);
             IMFTimer_Release(grabber->timer);
-        }
         if (grabber->cancel_key)
             IUnknown_Release(grabber->cancel_key);
         if (grabber->stream_event_queue)
@@ -973,10 +969,21 @@ static HRESULT WINAPI sample_grabber_sink_GetStreamSinkById(IMFMediaSink *iface,
     return hr;
 }
 
+static void sample_grabber_cancel_timer(struct sample_grabber *grabber)
+{
+    if (grabber->timer && grabber->cancel_key)
+    {
+        IMFTimer_CancelTimer(grabber->timer, grabber->cancel_key);
+        IUnknown_Release(grabber->cancel_key);
+        grabber->cancel_key = NULL;
+    }
+}
+
 static void sample_grabber_set_presentation_clock(struct sample_grabber *grabber, IMFPresentationClock *clock)
 {
     if (grabber->clock)
     {
+        sample_grabber_cancel_timer(grabber);
         IMFPresentationClock_RemoveClockStateSink(grabber->clock, &grabber->IMFClockStateSink_iface);
         IMFPresentationClock_Release(grabber->clock);
         if (grabber->timer)
@@ -1122,6 +1129,9 @@ static HRESULT sample_grabber_set_state(struct sample_grabber *grabber, enum sin
             hr = MF_E_INVALID_STATE_TRANSITION;
         else
         {
+            if (state == SINK_STATE_STOPPED)
+                sample_grabber_cancel_timer(grabber);
+
             if (state == SINK_STATE_RUNNING && grabber->state == SINK_STATE_STOPPED)
             {
                 /* Every transition to running state sends a bunch requests to build up initial queue. */
-- 
2.34.1