mfreadwrite/reader: Unset sample allocator callbacks while destroying the source reader.

The sample allocator callbacks own a reference to the source reader, which creates a reference loop and prevents the source reader from being properly destroyed. Signed-off-by: Giovanni Mascellani <gmascellani@codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

mfreadwrite/reader: Unset sample allocator callbacks while destroying the source reader.
a233c495 · Giovanni Mascellani · Alexandre Julliard · cdb0471e · a233c495
Commit a233c495 authored Apr 09, 2022 by Giovanni Mascellani Committed by Alexandre Julliard Apr 11, 2022
Hide whitespace changes
Inline Side-by-side

Showing with 18 additions and 0 deletions

reader.c dlls/mfreadwrite/reader.c +18 -0

No files found.
--- a/dlls/mfreadwrite/reader.c
+++ b/dlls/mfreadwrite/reader.c
@@ -1412,6 +1412,7 @@ static ULONG WINAPI src_reader_Release(IMFSourceReader *iface)
 {
    struct source_reader *reader = impl_from_IMFSourceReader(iface);
    ULONG refcount = InterlockedDecrement(&reader->public_refcount);
+    unsigned int i;

    TRACE("%p, refcount %lu.\n", iface, refcount);

@@ -1430,6 +1431,23 @@ static ULONG WINAPI src_reader_Release(IMFSourceReader *iface)

            LeaveCriticalSection(&reader->cs);
        }
+
+        for (i = 0; i < reader->stream_count; ++i)
+        {
+            struct media_stream *stream = &reader->streams[i];
+            IMFVideoSampleAllocatorCallback *callback;
+
+            if (!stream->allocator)
+                continue;
+
+            if (SUCCEEDED(IMFVideoSampleAllocatorEx_QueryInterface(stream->allocator, &IID_IMFVideoSampleAllocatorCallback,
+                    (void **)&callback)))
+            {
+                IMFVideoSampleAllocatorCallback_SetCallback(callback, NULL);
+                IMFVideoSampleAllocatorCallback_Release(callback);
+            }
+        }
+
        source_reader_release(reader);
    }