rtsp14

patches/protonprep-valve-staging.sh

@@ -346,10 +346,10 @@
     patch -Np1 < ../patches/wine-gst/0033-winegstreamer-Also-flush-token-queue-on-seek.patch
     patch -Np1 < ../patches/wine-gst/0034-mf-session-Fix-pausing-a-media-session-when-the-medi.patch
     patch -Np1 < ../patches/wine-gst/0035-winegstreamer-Do-not-force-uridecodebin-to-expose-un.patch
-    patch -Np1 < ../patches/wine-gst/0036-HACK-winegstreamer-Add-a-resampler-to-wg_parser-for-.patch
-    patch -Np1 < ../patches/wine-gst/0037-HACK-winegstreamer-Add-a-videoscale-element-to-wg_pa.patch
-    patch -Np1 < ../patches/wine-gst/0038-HACK-mfmediaengine-Do-not-send-MF_MEDIA_ENGINE_EVENT.patch
-    patch -Np1 < ../patches/wine-gst/0039-HACK-mfmediaengine-Never-report-INFINITY-duration.patch
+    patch -Np1 < ../patches/wine-gst/0036-mfmediaengine-Unstub-IMFMediaEngine-SetAutoPlay.patch
+    patch -Np1 < ../patches/wine-gst/0037-HACK-winegstreamer-Add-a-resampler-to-wg_parser-for-.patch
+    patch -Np1 < ../patches/wine-gst/0038-HACK-winegstreamer-Add-a-videoscale-element-to-wg_pa.patch
+    patch -Np1 < ../patches/wine-gst/0039-HACK-mfmediaengine-Do-not-send-MF_MEDIA_ENGINE_EVENT.patch
     patch -Np1 < ../patches/wine-gst/0040-Marker-commit-do-not-put-into-MR.patch
     patch -Np1 < ../patches/wine-gst/0041-DEBUG-winegstreamer-GST_LOG-GST_DEBUG.patch
     patch -Np1 < ../patches/wine-gst/0042-HACK-kernelbase-yt-dlp.exe-redirection-and-cmdline-m.patch

patches/wine-gst/0032-mf-sar-Allow-starting-audio-renderer-again-after-pau.patch

@@ -1,18 +1,18 @@
-From cfcce02f2492ba9ea34c704caea062a883a75ddc Mon Sep 17 00:00:00 2001
+From 2f19878dd2d52c52e97f95b455427d4d7bb8f9b1 Mon Sep 17 00:00:00 2001
 From: Torge Matthies <[email protected]>
 Date: Mon, 29 Jul 2024 10:41:23 +0200
 Subject: [PATCH 32/46] mf/sar: Allow starting audio renderer again after
  pausing it.
 
 ---
- dlls/mf/sar.c | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
+ dlls/mf/sar.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/dlls/mf/sar.c b/dlls/mf/sar.c
-index 970063497b1..59a9300e573 100644
+index 970063497b1..d588aa68871 100644
 --- a/dlls/mf/sar.c
 +++ b/dlls/mf/sar.c
-@@ -636,12 +636,14 @@ static HRESULT WINAPI audio_renderer_clock_sink_OnClockStart(IMFClockStateSink *
+@@ -636,7 +636,7 @@ static HRESULT WINAPI audio_renderer_clock_sink_OnClockStart(IMFClockStateSink *
      EnterCriticalSection(&renderer->cs);
      if (renderer->audio_client)
      {
@@ -21,13 +21,6 @@ index 970063497b1..59a9300e573 100644
          {
              if (FAILED(hr = IAudioClient_Start(renderer->audio_client)))
                  WARN("Failed to start audio client, hr %#lx.\n", hr);
-             renderer->state = STREAM_STATE_RUNNING;
-         }
-+        else
-+            hr = MF_E_INVALID_STATE_TRANSITION;
-     }
-     else
-         hr = MF_E_NOT_INITIALIZED;
 -- 
 2.46.0
 

patches/wine-gst/0033-winegstreamer-Also-flush-token-queue-on-seek.patch

@@ -1,4 +1,4 @@
-From ca10d808f164603f7ca475c624373d5bd8257292 Mon Sep 17 00:00:00 2001
+From 65d5d5d7621ac9d0f2cd2d1d84ab4815dc9996cf Mon Sep 17 00:00:00 2001
 From: Torge Matthies <[email protected]>
 Date: Tue, 6 Aug 2024 23:53:39 +0200
 Subject: [PATCH 33/46] winegstreamer: Also flush token queue on seek.

patches/wine-gst/0034-mf-session-Fix-pausing-a-media-session-when-the-medi.patch

@@ -1,4 +1,4 @@
-From 81d0176cf13fe4d7bc8d0b8f6c4362efaefc0fbf Mon Sep 17 00:00:00 2001
+From 4f5346315b583d86ab895a77503f67b90a5debd7 Mon Sep 17 00:00:00 2001
 From: Torge Matthies <[email protected]>
 Date: Wed, 7 Aug 2024 02:09:31 +0200
 Subject: [PATCH 34/46] mf/session: Fix pausing a media session when the media

patches/wine-gst/0035-winegstreamer-Do-not-force-uridecodebin-to-expose-un.patch

@@ -1,4 +1,4 @@
-From d9aa4c5d19befc8d61524707447d7a4f1ea9e98a Mon Sep 17 00:00:00 2001
+From 6e0ed8f046e848ebfef445fcb7feb9315f4eb519 Mon Sep 17 00:00:00 2001
 From: Torge Matthies <[email protected]>
 Date: Wed, 10 Jul 2024 22:50:17 +0200
 Subject: [PATCH 35/46] winegstreamer: Do not force uridecodebin to expose

patches/wine-gst/0036-mfmediaengine-Unstub-IMFMediaEngine-SetAutoPlay.patch

@@ -0,0 +1,48 @@
+From 9e693363fe2066b7d39040d29c88c783c43fb51e Mon Sep 17 00:00:00 2001
+From: Torge Matthies <[email protected]>
+Date: Fri, 16 Aug 2024 02:29:05 +0200
+Subject: [PATCH 36/46] mfmediaengine: Unstub IMFMediaEngine::SetAutoPlay.
+
+---
+ dlls/mfmediaengine/main.c | 13 +++++++++----
+ 1 file changed, 9 insertions(+), 4 deletions(-)
+
+diff --git a/dlls/mfmediaengine/main.c b/dlls/mfmediaengine/main.c
+index fba338a8438..7bf51afcf82 100644
+--- a/dlls/mfmediaengine/main.c
++++ b/dlls/mfmediaengine/main.c
+@@ -1434,7 +1434,7 @@ static HRESULT WINAPI media_engine_load_handler_Invoke(IMFAsyncCallback *iface,
+     engine->network_state = MF_MEDIA_ENGINE_NETWORK_LOADING;
+     IMFMediaEngineNotify_EventNotify(engine->callback, MF_MEDIA_ENGINE_EVENT_LOADSTART, 0, 0);
+
+-    start_playback = engine->flags & FLAGS_ENGINE_PLAY_PENDING;
++    start_playback = (engine->flags & FLAGS_ENGINE_PLAY_PENDING) || (engine->flags & FLAGS_ENGINE_AUTO_PLAY);
+     media_engine_set_flag(engine, FLAGS_ENGINE_SOURCE_PENDING | FLAGS_ENGINE_PLAY_PENDING, FALSE);
+
+     if (SUCCEEDED(IMFAsyncResult_GetState(result, &state)))
+@@ -2050,14 +2050,19 @@ static BOOL WINAPI media_engine_GetAutoPlay(IMFMediaEngineEx *iface)
+ static HRESULT WINAPI media_engine_SetAutoPlay(IMFMediaEngineEx *iface, BOOL autoplay)
+ {
+     struct media_engine *engine = impl_from_IMFMediaEngineEx(iface);
++    HRESULT hr = S_OK;
+
+-    FIXME("(%p, %d): stub.\n", iface, autoplay);
++    TRACE("%p, %d.\n", iface, autoplay);
+
+     EnterCriticalSection(&engine->cs);
+-    media_engine_set_flag(engine, FLAGS_ENGINE_AUTO_PLAY, autoplay);
++    if (autoplay && !(engine->flags & FLAGS_ENGINE_SHUT_DOWN) &&
++        engine->network_state == MF_MEDIA_ENGINE_NETWORK_IDLE)
++        hr = IMFMediaEngineEx_Play(iface);
++    if (SUCCEEDED(hr))
++        media_engine_set_flag(engine, FLAGS_ENGINE_AUTO_PLAY, autoplay);
+     LeaveCriticalSection(&engine->cs);
+
+-    return S_OK;
++    return hr;
+ }
+
+ static BOOL WINAPI media_engine_GetLoop(IMFMediaEngineEx *iface)
+-- 
+2.46.0
+

patches/wine-gst/0036-HACK-winegstreamer-Add-a-resampler-to-wg_parser-for-.patch → patches/wine-gst/0037-HACK-winegstreamer-Add-a-resampler-to-wg_parser-for-.patch

@@ -1,7 +1,7 @@
-From 9b39d1bbd2ba6f114f83474c0022f96c78a9d503 Mon Sep 17 00:00:00 2001
+From 4d4ce8b73809fc67cea763a6525bd8d3b473902a Mon Sep 17 00:00:00 2001
 From: Torge Matthies <[email protected]>
 Date: Wed, 31 Jan 2024 17:42:54 +0100
-Subject: [PATCH 36/46] [HACK] winegstreamer: Add a resampler to wg_parser for
+Subject: [PATCH 37/46] [HACK] winegstreamer: Add a resampler to wg_parser for
  raw audio.
 
 ---

patches/wine-gst/0037-HACK-winegstreamer-Add-a-videoscale-element-to-wg_pa.patch → patches/wine-gst/0038-HACK-winegstreamer-Add-a-videoscale-element-to-wg_pa.patch

@@ -1,7 +1,7 @@
-From 923b0b63891a895477b4f2284a254a5571c05fd8 Mon Sep 17 00:00:00 2001
+From 114772429100b7664bdc3cc27dfe078375a28d76 Mon Sep 17 00:00:00 2001
 From: Torge Matthies <[email protected]>
 Date: Wed, 31 Jan 2024 17:42:54 +0100
-Subject: [PATCH 37/46] [HACK] winegstreamer: Add a videoscale element to
+Subject: [PATCH 38/46] [HACK] winegstreamer: Add a videoscale element to
  wg_parser for raw video.
 
 ---

patches/wine-gst/0038-HACK-mfmediaengine-Do-not-send-MF_MEDIA_ENGINE_EVENT.patch → patches/wine-gst/0039-HACK-mfmediaengine-Do-not-send-MF_MEDIA_ENGINE_EVENT.patch

@@ -1,7 +1,7 @@
-From 6ccebf2aacb0b2bcb3e4729b083fd81ce4ff53df Mon Sep 17 00:00:00 2001
+From 90db7696268497e51bcf961a1e5b77da65da946d Mon Sep 17 00:00:00 2001
 From: Torge Matthies <[email protected]>
 Date: Sat, 2 Mar 2024 21:19:25 +0100
-Subject: [PATCH 38/46] [HACK] mfmediaengine: Do not send
+Subject: [PATCH 39/46] [HACK] mfmediaengine: Do not send
  MF_MEDIA_ENGINE_EVENT_ERROR for VRChat.
 
 Breaks AVPro Video (used by VRChat) when a IMFMediaEngine::GetError call inside the event handler doesn't return an
@@ -15,7 +15,7 @@ properly. In the meantime, this hack works around the problem.
  1 file changed, 15 insertions(+), 5 deletions(-)
 
 diff --git a/dlls/mfmediaengine/main.c b/dlls/mfmediaengine/main.c
-index fba338a8438..2986c75902f 100644
+index 7bf51afcf82..4c15e133053 100644
 --- a/dlls/mfmediaengine/main.c
 +++ b/dlls/mfmediaengine/main.c
 @@ -1466,11 +1466,21 @@ static HRESULT WINAPI media_engine_load_handler_Invoke(IMFAsyncCallback *iface,

patches/wine-gst/0040-Marker-commit-do-not-put-into-MR.patch

@@ -1,4 +1,4 @@
-From e3c0c9a17f211bc56a58f0fbe19669ce56e2933f Mon Sep 17 00:00:00 2001
+From 719a2b7f8081ef949322841eef60658a0320adf6 Mon Sep 17 00:00:00 2001
 From: Torge Matthies <[email protected]>
 Date: Mon, 25 Mar 2024 09:58:04 +0100
 Subject: [PATCH 40/46] === Marker commit, do not put into MR ===

patches/wine-gst/0041-DEBUG-winegstreamer-GST_LOG-GST_DEBUG.patch

@@ -1,4 +1,4 @@
-From 62ef0a44da0d1e592137fa1475a68985d154e95b Mon Sep 17 00:00:00 2001
+From 1912edea5c9e3542b495fcdee7ca8b7932bea483 Mon Sep 17 00:00:00 2001
 From: Torge Matthies <[email protected]>
 Date: Tue, 19 Mar 2024 10:20:49 +0100
 Subject: [PATCH 41/46] [DEBUG] winegstreamer: GST_LOG -> GST_DEBUG.

patches/wine-gst/0042-HACK-kernelbase-yt-dlp.exe-redirection-and-cmdline-m.patch

@@ -1,4 +1,4 @@
-From aca03cdc8f6b24c06c3dfe5a3369f0ba5ce3c52e Mon Sep 17 00:00:00 2001
+From 152841cbdd14102620529a7accbc02bfec9731b5 Mon Sep 17 00:00:00 2001
 From: Torge Matthies <[email protected]>
 Date: Thu, 28 Mar 2024 16:43:07 +0100
 Subject: [PATCH 42/46] [HACK] kernelbase: yt-dlp.exe redirection and cmdline

patches/wine-gst/0043-mf-Schedule-stored-timers-for-the-original-time-inst.patch

@@ -1,4 +1,4 @@
-From c0ceff5ce2a352348981c02df7756f0166f04f5d Mon Sep 17 00:00:00 2001
+From 1fe3dd8e9558fee3bb18e94c320886475c9cf388 Mon Sep 17 00:00:00 2001
 From: Torge Matthies <[email protected]>
 Date: Fri, 23 Feb 2024 21:45:44 +0100
 Subject: [PATCH 43/46] mf: Schedule stored timers for the original time

patches/wine-gst/0044-mf-Start-forwarding-samples-only-at-the-PTS-of-the-f.patch

@@ -1,4 +1,4 @@
-From 86a9a2e595c8a71f3b651324537f9e25c831069f Mon Sep 17 00:00:00 2001
+From 2e09637d4741e98f8243886fe106ffcbcae7ffdf Mon Sep 17 00:00:00 2001
 From: Torge Matthies <[email protected]>
 Date: Fri, 23 Feb 2024 21:50:22 +0100
 Subject: [PATCH 44/46] mf: Start forwarding samples only at the PTS of the

patches/wine-gst/0045-ntdll-Use-unixcall-instead-of-syscall-for-QueryPerfo.patch

@@ -1,4 +1,4 @@
-From 2095a3e5d925831e904d32c5061400b9879f2805 Mon Sep 17 00:00:00 2001
+From 5048fc33b556e29dbbb45d1bbb1685bb157110be Mon Sep 17 00:00:00 2001
 From: Torge Matthies <[email protected]>
 Date: Wed, 24 Apr 2024 22:00:49 +0200
 Subject: [PATCH 45/46] ntdll: Use unixcall instead of syscall for

patches/wine-gst/0046-HACK-kernelbase-Replace-stderr-of-yt-dlp-process.patch

@@ -1,4 +1,4 @@
-From b86b8236a5d1e6eccc102dc135ab7896cf9612f9 Mon Sep 17 00:00:00 2001
+From 204b913a2943c173139028d2a81b3504f323df02 Mon Sep 17 00:00:00 2001
 From: Torge Matthies <[email protected]>
 Date: Thu, 25 Jul 2024 00:17:20 +0200
 Subject: [PATCH 46/46] [HACK] kernelbase: Replace stderr of yt-dlp process.