[PATCH v9 0/2] MR6059: mf: Retry PROCESSINPUTNOTIFY if TRANSFORM_TYPE_NOT_SET is returned.

[Brendan McGrath (＠redmcg)]

Send INVALIDATEMEDIATYPE to allow the transform type to be set before
retrying PROCESSINPUTNOTIFY.

--
  v9: mf: Send MEError when IMFStreamSink_ProcessSample fails.

https://gitlab.winehq.org/wine/wine/-/merge_requests/6059

[PATCH v9 1/2] mf: Retry PROCESSINPUTNOTIFY if TRANSFORM_TYPE_NOT_SET is returned.

[Brendan McGrath]

From: Brendan McGrath

Send INVALIDATEMEDIATYPE to allow the transform type to be set before
retrying PROCESSINPUTNOTIFY.
---
 dlls/mf/evr.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/dlls/mf/evr.c b/dlls/mf/evr.c
index db7053a1405..a13c2d7e89b 100644
--- a/dlls/mf/evr.c
+++ b/dlls/mf/evr.c
@@ -416,7 +416,10 @@ static HRESULT WINAPI video_stream_sink_ProcessSample(IMFStreamSink *iface, IMFS
         }

if (SUCCEEDED(IMFTransform_ProcessInput(stream->parent->mixer, stream->id, sample, 0)))
-            IMFVideoPresenter_ProcessMessage(stream->parent->presenter, MFVP_MESSAGE_PROCESSINPUTNOTIFY, 0);
+        {
+            while (hr == S_OK && (hr = IMFVideoPresenter_ProcessMessage(stream->parent->presenter, MFVP_MESSAGE_PROCESSINPUTNOTIFY, 0)) == MF_E_TRANSFORM_TYPE_NOT_SET)
+                hr = IMFVideoPresenter_ProcessMessage(stream->parent->presenter, MFVP_MESSAGE_INVALIDATEMEDIATYPE, 0);
+        }

if (stream->flags & EVR_STREAM_PREROLLING)
         {

[PATCH v9 2/2] mf: Send MEError when IMFStreamSink_ProcessSample fails.

[Brendan McGrath]

From: Brendan McGrath

---
 dlls/mf/evr.c     | 7 +++++--
 dlls/mf/session.c | 3 +++
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/dlls/mf/evr.c b/dlls/mf/evr.c
index a13c2d7e89b..eb366ea599a 100644
--- a/dlls/mf/evr.c
+++ b/dlls/mf/evr.c
@@ -417,8 +417,11 @@ static HRESULT WINAPI video_stream_sink_ProcessSample(IMFStreamSink *iface, IMFS

if (SUCCEEDED(IMFTransform_ProcessInput(stream->parent->mixer, stream->id, sample, 0)))
         {
-            while (hr == S_OK && (hr = IMFVideoPresenter_ProcessMessage(stream->parent->presenter, MFVP_MESSAGE_PROCESSINPUTNOTIFY, 0)) == MF_E_TRANSFORM_TYPE_NOT_SET)
-                hr = IMFVideoPresenter_ProcessMessage(stream->parent->presenter, MFVP_MESSAGE_INVALIDATEMEDIATYPE, 0);
+            while ((hr = IMFVideoPresenter_ProcessMessage(stream->parent->presenter, MFVP_MESSAGE_PROCESSINPUTNOTIFY, 0)) == MF_E_TRANSFORM_TYPE_NOT_SET)
+            {
+                if (FAILED(hr = IMFVideoPresenter_ProcessMessage(stream->parent->presenter, MFVP_MESSAGE_INVALIDATEMEDIATYPE, 0)))
+                    break;
+            }
         }

if (stream->flags & EVR_STREAM_PREROLLING)
diff --git a/dlls/mf/session.c b/dlls/mf/session.c
index 3c989249229..e24cc6376b4 100644
--- a/dlls/mf/session.c
+++ b/dlls/mf/session.c
@@ -3706,7 +3706,10 @@ static void session_deliver_sample_to_node(struct media_session *session, struct
                 if (sample)
                 {
                     if (FAILED(hr = IMFStreamSink_ProcessSample(topo_node->object.sink_stream, sample)))
+                    {
                         WARN("Stream sink failed to process sample, hr %#lx.\n", hr);
+                        IMFMediaEventQueue_QueueEventParamVar(session->event_queue, MEError, &GUID_NULL, hr, NULL);
+                    }
                 }
                 else if (FAILED(hr = IMFStreamSink_PlaceMarker(topo_node->object.sink_stream, MFSTREAMSINK_MARKER_ENDOFSEGMENT,
                         NULL, NULL)))

[PATCH v9 2/2] mf: Send MEError when IMFStreamSink_ProcessSample fails.

[Marvin]

Hi,

It looks like your patch introduced the new failures shown below.
Please investigate and fix them before resubmitting your patch.
If they are not new, fixing them anyway would help a lot. Otherwise
please ask for the known failures list to be updated.

The tests also ran into some preexisting test failures. If you know how
to fix them that would be helpful. See the TestBot job for the details:

The full results can be found at:
https://testbot.winehq.org/JobDetails.pl?Key=149822

Your paranoid android.

=== debian11b (64 bit WoW report) ===

user32:
win.c:4070: Test failed: Expected active window 0000000002B50192, got 0000000000000000.
win.c:4071: Test failed: Expected focus window 0000000002B50192, got 0000000000000000.

[Brendan McGrath (＠redmcg)]

On Thu Nov 21 04:00:36 2024 +0000, Nikolay Sivov wrote:
> If it works like that, sure. But could we turn "hr == S_OK" to a loop
> break condition, after ProcessMessage. Or simply as "if ((hr ==
> ProcessMessage()) != S_OK) break;. I think that would be more readable
> and easy to follow.

Thanks @nsivov, I've made that change

[PATCH v9 0/2] MR6059: mf: Retry PROCESSINPUTNOTIFY if TRANSFORM_TYPE_NOT_SET is returned. - approved

[Nikolay Sivov (＠nsivov)]

This merge request was approved by Nikolay Sivov.