From 1233123d729556b20b3907cf6530c6274304776b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20de=20la=20Rocha?= <andre.rocha@qt.io>
Date: Mon, 31 Jan 2022 22:47:11 +0100
Subject: Windows: Fix texture leak on media player
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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>
---
 src/multimedia/platform/windows/evr/evrd3dpresentengine.cpp | 6 ++++--
 1 file 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;
 
-- 
cgit v1.2.3