[PATCH v5 3/3] mfmediaengine: Add a fallback when the set engine format cannot be used to init samplegrabber.

[Bernhard Kölbl]

From: Bernhard Kölbl

Some games try to use DXGI formats for MfMediaEngine, which are not converable
to DX9 (e.g. DXGI_FORMAT_R32G32B32_FLOAT). This works on Windows, so in this case
use DXGI_FORMAT_B8G8R8A8_UNORM as a fallback.
---
 dlls/mfmediaengine/main.c                | 6 +++---
 dlls/mfmediaengine/tests/mfmediaengine.c | 5 ++---
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/dlls/mfmediaengine/main.c b/dlls/mfmediaengine/main.c
index 68696d328e9..4833a3ea2e5 100644
--- a/dlls/mfmediaengine/main.c
+++ b/dlls/mfmediaengine/main.c
@@ -1067,10 +1067,10 @@ static HRESULT media_engine_create_video_renderer(struct media_engine *engine, I
     media_engine_unlock_d3d_device(engine, device);

memcpy(&subtype, &MFVideoFormat_Base, sizeof(subtype));
-    if (!(subtype.Data1 = MFMapDXGIFormatToDX9Format(output_format)))
+    while (!(subtype.Data1 = MFMapDXGIFormatToDX9Format(output_format)))
     {
-        WARN("Unrecognized output format %#x.\n", output_format);
-        return E_FAIL;
+        FIXME("Output format %#x cannot be converted to DX9, using DXGI_FORMAT_B8G8R8A8_UNORM as fallback.\n", output_format);
+        output_format = DXGI_FORMAT_B8G8R8A8_UNORM;
     }

if (FAILED(hr = MFCreateMediaType(&media_type)))
diff --git a/dlls/mfmediaengine/tests/mfmediaengine.c b/dlls/mfmediaengine/tests/mfmediaengine.c
index d1a8fdb8a87..792db04a4c3 100644
--- a/dlls/mfmediaengine/tests/mfmediaengine.c
+++ b/dlls/mfmediaengine/tests/mfmediaengine.c
@@ -226,7 +226,6 @@ static struct media_engine_notify *create_callback(void)
     struct media_engine_notify *object;

object = calloc(1, sizeof(*object));
-
     object->IMFMediaEngineNotify_iface.lpVtbl = &media_engine_notify_vtbl;
     object->refcount = 1;

@@ -1421,7 +1420,7 @@ static void test_formats(void)
     {
         /* Some supported media engine and output texture formats. */
         {
-            .engine_fmt = DXGI_FORMAT_R32G32B32_FLOAT, .engine_todo = TRUE,
+            .engine_fmt = DXGI_FORMAT_R32G32B32_FLOAT,
             .output_fmt = DXGI_FORMAT_B8G8R8A8_UNORM, .exp_hr = S_OK,
         },
         {
@@ -1429,7 +1428,7 @@ static void test_formats(void)
             .output_fmt = DXGI_FORMAT_R10G10B10A2_UNORM, .exp_hr = S_OK,
         },
         {
-            .engine_fmt = DXGI_FORMAT_R16G16B16A16_UINT, .engine_todo = TRUE,
+            .engine_fmt = DXGI_FORMAT_R16G16B16A16_UINT,
             .output_fmt = DXGI_FORMAT_B8G8R8X8_UNORM, .exp_hr = S_OK,
         },
         {