diff options
| author | André de la Rocha <andre.rocha@qt.io> | 2022-01-31 22:47:11 +0100 |
|---|---|---|
| committer | André de la Rocha <andre.rocha@qt.io> | 2022-02-02 00:05:28 +0100 |
| commit | 1233123d729556b20b3907cf6530c6274304776b (patch) | |
| tree | 1f3ea2ce5db451f73819254e0ebdf8dd3e740a5b | |
| parent | cdc989254ae6f2120e9433ecaa09b31e42d19d98 (diff) | |
Windows: Fix texture leak on media player
Textures were being created in D3DPresentEngine::createVideoSamples()
and never released.
Fixes: QTBUG-100341
Change-Id: I31c9bbfa5a6a6b626685c45980adcbf23a473582
Reviewed-by: Piotr Srebrny <piotr.srebrny@qt.io>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
(cherry picked from commit 7fa8e78cc2417ab245c2e662dc2ece77329fed31)
Reviewed-by: André de la Rocha <andre.rocha@qt.io>
| -rw-r--r-- | src/multimedia/platform/windows/evr/evrd3dpresentengine.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/multimedia/platform/windows/evr/evrd3dpresentengine.cpp b/src/multimedia/platform/windows/evr/evrd3dpresentengine.cpp index 6090be6d6..c3c6bac1a 100644 --- a/src/multimedia/platform/windows/evr/evrd3dpresentengine.cpp +++ b/src/multimedia/platform/windows/evr/evrd3dpresentengine.cpp @@ -534,9 +534,11 @@ HRESULT D3DPresentEngine::createVideoSamples(IMFMediaType *format, QList<IMFSamp d3dFormat = D3DFMT_A8B8G8R8; for (int i = 0; i < PRESENTER_BUFFER_COUNT; i++) { - IDirect3DTexture9 *texture = nullptr; + // texture ref cnt is increased by GetSurfaceLevel()/MFCreateVideoSampleFromSurface() + // below, so it will be destroyed only when the sample pool is released. + QWindowsIUPointer<IDirect3DTexture9> texture; HANDLE sharedHandle = nullptr; - hr = m_device->CreateTexture(width, height, 1, D3DUSAGE_RENDERTARGET, (D3DFORMAT)d3dFormat, D3DPOOL_DEFAULT, &texture, &sharedHandle); + hr = m_device->CreateTexture(width, height, 1, D3DUSAGE_RENDERTARGET, (D3DFORMAT)d3dFormat, D3DPOOL_DEFAULT, texture.address(), &sharedHandle); if (FAILED(hr)) break; |