[PATCH v4 5/5] mfreadwrite/reader: Fixup MFVideoFormat_ABGR32 subtype to enumerate the video processor.

[Rémi Bernon]

From: Rémi Bernon

---
 dlls/mfreadwrite/reader.c       | 13 +++++++++++++
 dlls/mfreadwrite/tests/mfplat.c |  5 +----
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/dlls/mfreadwrite/reader.c b/dlls/mfreadwrite/reader.c
index a9d25848e7b..f4491438e3d 100644
--- a/dlls/mfreadwrite/reader.c
+++ b/dlls/mfreadwrite/reader.c
@@ -41,6 +41,8 @@

WINE_DEFAULT_DEBUG_CHANNEL(mfplat);

+DEFINE_MEDIATYPE_GUID(MFVideoFormat_ABGR32, D3DFMT_A8B8G8R8);
+
 struct stream_response
 {
     struct list entry;
@@ -2036,6 +2038,17 @@ static HRESULT source_reader_create_transform(struct source_reader *reader, BOOL
             entry->min_buffer_size = max(entry->min_buffer_size, bytes_per_second);
     }

+    if (IsEqualGUID(&out_type.guidMajorType, &MFMediaType_Video) && IsEqualGUID(&out_type.guidSubtype, &MFVideoFormat_ABGR32)
+            && IsEqualGUID(&category, &MFT_CATEGORY_VIDEO_PROCESSOR))
+    {
+        /* The video processor isn't registered for MFVideoFormat_ABGR32, and native even only supports that format when
+         * D3D-enabled, we still want to instantiate a video processor in such case, so fixup the subtype for MFTEnumEx.
+         */
+        WARN("Fixing up MFVideoFormat_ABGR32 subtype for the video processor\n");
+        out_type.guidSubtype = MFVideoFormat_RGB32;
+    }
+
+
     count = 0;
     if (SUCCEEDED(hr = MFTEnumEx(category, 0, &in_type, allow_processor ? NULL : &out_type, &activates, &count)))
     {
diff --git a/dlls/mfreadwrite/tests/mfplat.c b/dlls/mfreadwrite/tests/mfplat.c
index 8df7b4a13f9..6b050552e8f 100644
--- a/dlls/mfreadwrite/tests/mfplat.c
+++ b/dlls/mfreadwrite/tests/mfplat.c
@@ -3417,16 +3417,13 @@ static void test_source_reader_transforms_d3d11(void)
     ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
     init_media_type(media_type, abgr32_stream_type_desc, -1);
     hr = IMFSourceReader_SetCurrentMediaType(reader, 0, NULL, media_type);
-    todo_wine ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
     IMFMediaType_Release(media_type);

-    if (hr == S_OK)
-    {
     hr = IMFSourceReader_GetCurrentMediaType(reader, 0, &media_type);
     ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
     check_media_type(media_type, abgr32_expect_desc, -1);
     IMFMediaType_Release(media_type);
-    }

hr = MFCreateMediaType(&media_type);
     ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);