[PATCH 0/1] MR5219: mfreadwrite/reader: Handle MF_E_TRANSFORM_STREAM_CHANGE results.

[Rémi Bernon]

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

[PATCH 1/1] mfreadwrite/reader: Handle MF_E_TRANSFORM_STREAM_CHANGE results.

[Rémi Bernon]

From: Rémi Bernon <rbernon(a)codeweavers.com>

---
 dlls/mfreadwrite/reader.c | 48 +++++++++++++++++++++++++++++++++++----
 1 file changed, 43 insertions(+), 5 deletions(-)

diff --git a/dlls/mfreadwrite/reader.c b/dlls/mfreadwrite/reader.c
index 58de40c772b..359c15e8ee4 100644
--- a/dlls/mfreadwrite/reader.c
+++ b/dlls/mfreadwrite/reader.c
@@ -76,6 +76,7 @@ struct transform_entry
     struct list entry;
     IMFTransform *transform;
     unsigned int min_buffer_size;
+    UINT32 pending_flags;
     GUID category;
     BOOL hidden;
 };
@@ -484,14 +485,14 @@ static HRESULT source_reader_queue_response(struct source_reader *reader, struct
 }
 
 static HRESULT source_reader_queue_sample(struct source_reader *reader, struct media_stream *stream,
-        IMFSample *sample)
+        UINT flags, IMFSample *sample)
 {
     LONGLONG timestamp = 0;
 
     if (FAILED(IMFSample_GetSampleTime(sample, ×tamp)))
         WARN("Sample time wasn't set.\n");
 
-    return source_reader_queue_response(reader, stream, S_OK, 0, timestamp, sample);
+    return source_reader_queue_response(reader, stream, S_OK, flags, timestamp, sample);
 }
 
 static HRESULT source_reader_request_sample(struct source_reader *reader, struct media_stream *stream)
@@ -785,6 +786,7 @@ static HRESULT source_reader_pull_transform_samples(struct source_reader *reader
     while (SUCCEEDED(hr))
     {
         MFT_OUTPUT_DATA_BUFFER out_buffer = {0};
+        IMFMediaType *output_type, *media_type;
 
         if (!(stream_info.dwFlags & (MFT_OUTPUT_STREAM_PROVIDES_SAMPLES | MFT_OUTPUT_STREAM_CAN_PROVIDE_SAMPLES))
                 && FAILED(hr = source_reader_allocate_stream_sample(&stream_info, &out_buffer.pSample)))
@@ -792,10 +794,46 @@ static HRESULT source_reader_pull_transform_samples(struct source_reader *reader
 
         if (SUCCEEDED(hr = IMFTransform_ProcessOutput(entry->transform, 0, 1, &out_buffer, &status)))
         {
-            if (next)
+            if ((entry->pending_flags & MF_SOURCE_READERF_CURRENTMEDIATYPECHANGED)
+                    && SUCCEEDED(hr = IMFTransform_GetOutputCurrentType(entry->transform, 0, &output_type)))
+            {
+                if (!next)
+                    hr = IMFMediaType_CopyAllItems(output_type, (IMFAttributes *)stream->current);
+                else if (SUCCEEDED(hr = IMFTransform_SetInputType(next->transform, 0, output_type, 0)))
+                {
+                    /* check if transform output type is still valid or if we need to reset it as well */
+                    if (FAILED(hr = IMFTransform_GetOutputCurrentType(next->transform, 0, &media_type))
+                            && SUCCEEDED(hr = IMFTransform_GetOutputAvailableType(next->transform, 0, 0, &output_type)))
+                    {
+                        next->pending_flags |= MF_SOURCE_READERF_CURRENTMEDIATYPECHANGED;
+                        hr = IMFTransform_SetOutputType(entry->transform, 0, media_type, 0);
+                        IMFMediaType_Release(media_type);
+                    }
+                }
+                IMFMediaType_Release(output_type);
+            }
+
+            if (FAILED(hr))
+                source_reader_queue_response(reader, stream, hr, MF_SOURCE_READERF_ERROR, 0, NULL);
+            else if (next)
                 hr = source_reader_push_transform_samples(reader, stream, next, out_buffer.pSample);
             else
-                hr = source_reader_queue_sample(reader, stream, out_buffer.pSample);
+                hr = source_reader_queue_sample(reader, stream, entry->pending_flags, out_buffer.pSample);
+
+            entry->pending_flags = 0;
+        }
+
+        if (hr == MF_E_TRANSFORM_STREAM_CHANGE && SUCCEEDED(hr = IMFTransform_GetOutputAvailableType(entry->transform, 0, 0, &output_type)))
+        {
+            hr = IMFTransform_SetOutputType(entry->transform, 0, output_type, 0);
+            IMFMediaType_Release(output_type);
+
+            if (SUCCEEDED(hr))
+            {
+                hr = IMFTransform_GetOutputStreamInfo(entry->transform, 0, &stream_info);
+                stream_info.cbSize = max(stream_info.cbSize, entry->min_buffer_size);
+                entry->pending_flags |= MF_SOURCE_READERF_CURRENTMEDIATYPECHANGED;
+            }
         }
 
         if (out_buffer.pSample)
@@ -850,7 +888,7 @@ static HRESULT source_reader_process_sample(struct source_reader *reader, struct
     HRESULT hr;
 
     if (!(ptr = list_head(&stream->transforms)))
-        return source_reader_queue_sample(reader, stream, sample);
+        return source_reader_queue_sample(reader, stream, 0, sample);
     entry = LIST_ENTRY(ptr, struct transform_entry, entry);
 
     /* It's assumed that decoder has 1 input and 1 output, both id's are 0. */
-- 
GitLab

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

[PATCH 1/1] mfreadwrite/reader: Handle MF_E_TRANSFORM_STREAM_CHANGE results.

[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=143658

Your paranoid android.


=== debian11 (32 bit report) ===

mfreadwrite:
Unhandled exception: assertion failed in 32-bit code (0xf7f95559).
mfplat: Timeout

Report validation errors:
mfreadwrite:mfplat prints too much data (51939 bytes)

[Nikolay Sivov (＠nsivov)]

Are we going to have an actual transform that does type changes?

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/5219#note_63349

[Rémi Bernon]

Yes, the H264 decoder does that all the time. It reports a type change right before the first frame is output.

Most of the time this is because native decoder has some 16-byte alignment requirements which always changes the 1920x1080 default frame size to 1920x1088 with 1920x1080 MF_MT_MINIMUM_DISPLAY_APERTURE attribute, but it also does if H264 streams are concatenated.

Note that this can in theory cause some transform connections to fail, if the downstream elements cannot accept the new upstream type, and I believe that there's more events and statuses that can come into play (for instance MF_SOURCE_READERF_ALLEFFECTSREMOVED is documented to happen when custom downstream transforms are dropped because of this), but it's not needed right now.

In practice, with the H264 decoder and a 1920x1080 requested source reader current media type, when the decoder reports its new type with a display aperture, the video processor still accepts that new input without changing its output type, by automatically cropping the buffer padding. This is currently broken in Wine, and the video processor will refuse that input type, and we will need https://gitlab.winehq.org/wine/wine/-/merge_requests/5055 to fix that.

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/5219#note_63359

[Rémi Bernon]

Anything I should do here?

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/5219#note_64611

[PATCH 0/1] MR5219: mfreadwrite/reader: Handle MF_E_TRANSFORM_STREAM_CHANGE results. - approved

[Nikolay Sivov (＠nsivov)]

This merge request was approved by Nikolay Sivov.
-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/5219