From 0ae7315541c8847d902c9e458a928c4df5520ba6 Mon Sep 17 00:00:00 2001 From: Alistair Leslie-Hughes Date: Sun, 22 Nov 2020 17:57:20 +1100 Subject: [PATCH] Updated mfplat-streaming-support patchset Already handled upstream. --- ...down-media-sinks-on-session-shutdown.patch | 36 ------------------- patches/patchinstall.sh | 1 - 2 files changed, 37 deletions(-) delete mode 100644 patches/mfplat-streaming-support/0044-HACK-Shutdown-media-sinks-on-session-shutdown.patch diff --git a/patches/mfplat-streaming-support/0044-HACK-Shutdown-media-sinks-on-session-shutdown.patch b/patches/mfplat-streaming-support/0044-HACK-Shutdown-media-sinks-on-session-shutdown.patch deleted file mode 100644 index e26fd04b..00000000 --- a/patches/mfplat-streaming-support/0044-HACK-Shutdown-media-sinks-on-session-shutdown.patch +++ /dev/null @@ -1,36 +0,0 @@ -From dabbfa4c200fc70b497bed6a79840531e1ace2b0 Mon Sep 17 00:00:00 2001 -From: Derek Lesho -Date: Wed, 14 Oct 2020 11:07:34 -0500 -Subject: [PATCH] HACK: Shutdown media sinks on session shutdown. - -TODO: We should be doing this through IMFActivate. ---- - dlls/mf/session.c | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/dlls/mf/session.c b/dlls/mf/session.c -index fa6ed13db0c..ae5a600109c 100644 ---- a/dlls/mf/session.c -+++ b/dlls/mf/session.c -@@ -1845,6 +1845,7 @@ static HRESULT WINAPI mfsession_Close(IMFMediaSession *iface) - static HRESULT WINAPI mfsession_Shutdown(IMFMediaSession *iface) - { - struct media_session *session = impl_from_IMFMediaSession(iface); -+ struct media_sink *sink; - HRESULT hr = S_OK; - - TRACE("%p.\n", iface); -@@ -1856,6 +1857,10 @@ static HRESULT WINAPI mfsession_Shutdown(IMFMediaSession *iface) - IMFMediaEventQueue_Shutdown(session->event_queue); - if (session->quality_manager) - IMFQualityManager_Shutdown(session->quality_manager); -+ LIST_FOR_EACH_ENTRY(sink, &session->presentation.sinks, struct media_sink, entry) -+ { -+ IMFMediaSink_Shutdown(sink->sink); -+ } - MFShutdownObject((IUnknown *)session->clock); - IMFPresentationClock_Release(session->clock); - session->clock = NULL; --- -2.29.2 - diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index cafc0c77..04d7f052 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -2750,7 +2750,6 @@ if test "$enable_mfplat_streaming_support" -eq 1; then patch_apply mfplat-streaming-support/0041-mf-Miscelaneous-fixes-to-topology-resolution.patch patch_apply mfplat-streaming-support/0042-Rewrite-branch-resolver.patch patch_apply mfplat-streaming-support/0043-winegstreamer-Implement-audio-conversion-MFT.patch - patch_apply mfplat-streaming-support/0044-HACK-Shutdown-media-sinks-on-session-shutdown.patch patch_apply mfplat-streaming-support/0045-HACK-Flush-decoder-when-changing-times.patch patch_apply mfplat-streaming-support/0060-winegstreamer-Support-eAVEncH264VProfile_Constrained.patch fi