Nikolay Sivov : mf/samplegrabber: Cancel pending sample timer.
Alexandre Julliard
julliard at winehq.org
Thu Jan 20 15:44:48 CST 2022
Module: wine
Branch: master
Commit: 8679255eccd57e2a1a785a7efac04e0c84cb9055
URL: https://source.winehq.org/git/wine.git/?a=commit;h=8679255eccd57e2a1a785a7efac04e0c84cb9055
Author: Nikolay Sivov <nsivov at codeweavers.com>
Date: Thu Jan 20 13:46:55 2022 +0300
mf/samplegrabber: Cancel pending sample timer.
Signed-off-by: Nikolay Sivov <nsivov at codeweavers.com>
Signed-off-by: Giovanni Mascellani <gmascellani at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
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. */
More information about the wine-cvs
mailing list