[PATCH v2 2/2] mfreadwrite/reader: Unset sample allocator callbacks while destroying the source reader.
Giovanni Mascellani
gmascellani at codeweavers.com
Fri Apr 8 08:58:48 CDT 2022
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 at codeweavers.com>
---
v2:
* Declare variable i
* Fix printf formatter for HRESULT
---
dlls/mfreadwrite/reader.c | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)
diff --git a/dlls/mfreadwrite/reader.c b/dlls/mfreadwrite/reader.c
index 2d3da19db10..61d413f8fd3 100644
--- 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,25 @@ 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)))
+ {
+ HRESULT hr;
+
+ if (FAILED(hr = IMFVideoSampleAllocatorCallback_SetCallback(callback, NULL)))
+ WARN("Cannot unset allocator callback, hr %#lx.\n", hr);
+ IMFVideoSampleAllocatorCallback_Release(callback);
+ }
+ }
+
source_reader_release(reader);
}
--
2.35.1
More information about the wine-devel
mailing list