Nikolay Sivov : mfplay: Shutdown sources when media items are released.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 3e4f4c020ac1942876c4cb696440bc21964dd50f
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=3e4f4c020ac1942876c4cb696...

Author: Nikolay Sivov 
Date:   Wed Feb 16 11:53:53 2022 +0300

mfplay: Shutdown sources when media items are released.

Signed-off-by: Nikolay Sivov 
Signed-off-by: Alexandre Julliard

---

dlls/mfplay/player.c | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/dlls/mfplay/player.c b/dlls/mfplay/player.c
index d36bde8fec7..7d9a4da8649 100644
--- a/dlls/mfplay/player.c
+++ b/dlls/mfplay/player.c
@@ -61,6 +61,11 @@ static inline const char *debugstr_normalized_rect(const MFVideoNormalizedRect *

struct media_player;

+enum media_item_flags
+{
+    MEDIA_ITEM_SOURCE_NEEDS_SHUTDOWN = 0x1,
+};
+
 struct media_item
 {
     IMFPMediaItem IMFPMediaItem_iface;
@@ -73,6 +78,7 @@ struct media_item
     IUnknown *object;
     LONGLONG start_position;
     LONGLONG stop_position;
+    unsigned int flags;
 };

struct media_player
@@ -359,7 +365,11 @@ static ULONG WINAPI media_item_Release(IMFPMediaItem *iface)
         if (item->player)
             IMFPMediaPlayer_Release(&item->player->IMFPMediaPlayer_iface);
         if (item->source)
+        {
+            if (item->flags & MEDIA_ITEM_SOURCE_NEEDS_SHUTDOWN)
+                IMFMediaSource_Shutdown(item->source);
             IMFMediaSource_Release(item->source);
+        }
         if (item->pd)
             IMFPresentationDescriptor_Release(item->pd);
         if (item->object)
@@ -1189,6 +1199,7 @@ static HRESULT media_player_create_item_from_url(struct media_player *player,
         IMFPMediaItem_Release(&item->IMFPMediaItem_iface);
         return E_OUTOFMEMORY;
     }
+    item->flags |= MEDIA_ITEM_SOURCE_NEEDS_SHUTDOWN;

if (sync)
     {
@@ -1244,11 +1255,11 @@ static HRESULT WINAPI media_player_CreateMediaItemFromURL(IMFPMediaPlayer *iface
 static HRESULT media_player_create_item_from_object(struct media_player *player,
         IUnknown *object, BOOL sync, DWORD_PTR user_data, IMFPMediaItem **ret)
 {
+    IMFMediaSource *source = NULL;
+    IMFByteStream *stream = NULL;
     struct media_item *item;
     MF_OBJECT_TYPE obj_type;
     HRESULT hr;
-    IMFByteStream *stream = NULL;
-    IMFMediaSource *source = NULL;

*ret = NULL;

@@ -1268,6 +1279,9 @@ static HRESULT media_player_create_item_from_object(struct media_player *player,
         return E_UNEXPECTED;
     }

+    if (source)
+        item->flags |= MEDIA_ITEM_SOURCE_NEEDS_SHUTDOWN;
+
     if (sync)
     {
         if (stream)