Rémi Bernon : mfreadwrite/reader: Look for a matching output type if setting it failed.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 017317ce6628cd19ce8c148ba9425087d7f07a96
URL:    https://gitlab.winehq.org/wine/wine/-/commit/017317ce6628cd19ce8c148ba942508...

Author: Rémi Bernon 
Date:   Mon Jul  1 10:03:21 2024 +0200

mfreadwrite/reader: Look for a matching output type if setting it failed.

The source reader accepts incomplete output types that decoders don't.

This is for instance the case with audio types with only a subtype but
no MF_MT_AUDIO_BITS_PER_SAMPLE attribute specified.

---

dlls/mfreadwrite/reader.c | 23 +++++++++++++++++------
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/dlls/mfreadwrite/reader.c b/dlls/mfreadwrite/reader.c
index 0e0ba10b076..0defc5a22e2 100644
--- a/dlls/mfreadwrite/reader.c
+++ b/dlls/mfreadwrite/reader.c
@@ -771,8 +771,8 @@ static HRESULT source_reader_push_transform_samples(struct source_reader *reader
     return hr;
 }

-/* update the transform output type while keeping subtype which matches the old output type */
-static HRESULT transform_entry_update_output_type(struct transform_entry *entry, IMFMediaType *old_output_type)
+/* update the transform output type while keeping subtype which matches the desired type */
+static HRESULT set_matching_transform_output_type(IMFTransform *transform, IMFMediaType *old_output_type)
 {
     IMFMediaType *new_output_type;
     GUID subtype, desired;
@@ -782,12 +782,11 @@ static HRESULT transform_entry_update_output_type(struct transform_entry *entry,
     IMFMediaType_GetGUID(old_output_type, &MF_MT_SUBTYPE, &desired);

/* find an available output type matching the desired subtype */
-    while (SUCCEEDED(hr = IMFTransform_GetOutputAvailableType(entry->transform, 0, i++, &new_output_type)))
+    while (SUCCEEDED(hr = IMFTransform_GetOutputAvailableType(transform, 0, i++, &new_output_type)))
     {
         IMFMediaType_GetGUID(new_output_type, &MF_MT_SUBTYPE, &subtype);
-        if (IsEqualGUID(&subtype, &desired) && SUCCEEDED(hr = IMFTransform_SetOutputType(entry->transform, 0, new_output_type, 0)))
+        if (IsEqualGUID(&subtype, &desired) && SUCCEEDED(hr = IMFTransform_SetOutputType(transform, 0, new_output_type, 0)))
         {
-            entry->pending_flags |= MF_SOURCE_READERF_CURRENTMEDIATYPECHANGED;
             IMFMediaType_Release(new_output_type);
             return S_OK;
         }
@@ -797,6 +796,17 @@ static HRESULT transform_entry_update_output_type(struct transform_entry *entry,
     return hr;
 }

+/* update the transform output type while keeping subtype which matches the old output type */
+static HRESULT transform_entry_update_output_type(struct transform_entry *entry, IMFMediaType *old_output_type)
+{
+    HRESULT hr;
+
+    if (SUCCEEDED(hr = set_matching_transform_output_type(entry->transform, old_output_type)))
+        entry->pending_flags |= MF_SOURCE_READERF_CURRENTMEDIATYPECHANGED;
+
+    return hr;
+}
+
 /* update the transform input type while keeping an output type which matches the current output subtype */
 static HRESULT transform_entry_update_input_type(struct transform_entry *entry, IMFMediaType *input_type)
 {
@@ -2091,7 +2101,8 @@ static HRESULT source_reader_create_transform(struct source_reader *reader, BOOL
                     && SUCCEEDED(hr = IMFTransform_GetInputCurrentType(transform, 0, &media_type)))
             {
                 if (SUCCEEDED(hr = update_media_type_from_upstream(output_type, media_type))
-                        && FAILED(hr = IMFTransform_SetOutputType(transform, 0, output_type, 0)) && allow_processor
+                        && FAILED(hr = IMFTransform_SetOutputType(transform, 0, output_type, 0))
+                        && FAILED(hr = set_matching_transform_output_type(transform, output_type)) && allow_processor
                         && SUCCEEDED(hr = IMFTransform_GetOutputAvailableType(transform, 0, 0, &media_type)))
                 {
                     struct transform_entry *converter;