[PATCH 0/3] MR4881: mf/topology_loader: Fix indirect connection when decoder *and* converter must be added.

[PATCH 1/3] mf/topology_loader: Use a local variable for the indirect connection method.

[Rémi Bernon]

From: Rémi Bernon

Instead of modifying the method_mask parameter, in case we need to retry
with another transform.
---
 dlls/mf/topology_loader.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/dlls/mf/topology_loader.c b/dlls/mf/topology_loader.c
index 6b6d39d76d1..e482807e777 100644
--- a/dlls/mf/topology_loader.c
+++ b/dlls/mf/topology_loader.c
@@ -296,6 +296,7 @@ static HRESULT topology_branch_connect_indirect(IMFTopology *topology, MF_CONNEC
     {
         struct topology_branch down_branch = {.up.node = node, .down = branch->down};
         struct topology_branch up_branch = {.up = branch->up, .down.node = node};
+        MF_CONNECT_METHOD method = method_mask;

if (FAILED(IMFActivate_ActivateObject(activates[i], &IID_IMFTransform, (void **)&transform)))
             continue;
@@ -313,12 +314,12 @@ static HRESULT topology_branch_connect_indirect(IMFTopology *topology, MF_CONNEC
             if (SUCCEEDED(hr))
                 hr = IMFTransform_SetOutputType(transform, 0, down_type, 0);
             if (SUCCEEDED(hr))
-                method_mask = MF_CONNECT_DIRECT;
+                method = MF_CONNECT_DIRECT;
         }
         IMFTransform_Release(transform);

if (SUCCEEDED(hr))
-            hr = topology_branch_connect(topology, method_mask, &down_branch, !down_type);
+            hr = topology_branch_connect(topology, method, &down_branch, !down_type);
         if (SUCCEEDED(hr))
             hr = IMFTopology_AddNode(topology, node);
         if (SUCCEEDED(hr))

[PATCH 2/3] mf/topology_loader: Ignore SetOutputType errors when doing indirect connect.

[Rémi Bernon]

From: Rémi Bernon

It only succeeds with converters, or if a decoder can directly output
the downstream media type.

If it fails we may have to add a converter after the decoder, and we
will call topology_branch_connect on the downstream branch for that.
---
 dlls/mf/topology_loader.c | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/dlls/mf/topology_loader.c b/dlls/mf/topology_loader.c
index e482807e777..57f9cfa9bf6 100644
--- a/dlls/mf/topology_loader.c
+++ b/dlls/mf/topology_loader.c
@@ -309,11 +309,8 @@ static HRESULT topology_branch_connect_indirect(IMFTopology *topology, MF_CONNEC
         hr = topology_branch_connect_down(topology, MF_CONNECT_DIRECT, &up_branch, up_type);
         if (down_type)
         {
-            if (SUCCEEDED(hr))
-                hr = topology_branch_fill_media_type(up_type, down_type);
-            if (SUCCEEDED(hr))
-                hr = IMFTransform_SetOutputType(transform, 0, down_type, 0);
-            if (SUCCEEDED(hr))
+            if (SUCCEEDED(topology_branch_fill_media_type(up_type, down_type))
+                    && SUCCEEDED(IMFTransform_SetOutputType(transform, 0, down_type, 0)))
                 method = MF_CONNECT_DIRECT;
         }
         IMFTransform_Release(transform);

[PATCH 3/3] mf/topology_loader: Initialize transform output type before adding converter.

[Rémi Bernon]

From: Rémi Bernon

Otherwise the next topology_branch_connect call will fail when it will
try to lookup the upstream element media type.
---
 dlls/mf/topology_loader.c | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/dlls/mf/topology_loader.c b/dlls/mf/topology_loader.c
index 57f9cfa9bf6..83398dbb12f 100644
--- a/dlls/mf/topology_loader.c
+++ b/dlls/mf/topology_loader.c
@@ -297,6 +297,7 @@ static HRESULT topology_branch_connect_indirect(IMFTopology *topology, MF_CONNEC
         struct topology_branch down_branch = {.up.node = node, .down = branch->down};
         struct topology_branch up_branch = {.up = branch->up, .down.node = node};
         MF_CONNECT_METHOD method = method_mask;
+        IMFMediaType *media_type;

if (FAILED(IMFActivate_ActivateObject(activates[i], &IID_IMFTransform, (void **)&transform)))
             continue;
@@ -315,6 +316,14 @@ static HRESULT topology_branch_connect_indirect(IMFTopology *topology, MF_CONNEC
         }
         IMFTransform_Release(transform);

+        if (SUCCEEDED(hr) && method != MF_CONNECT_DIRECT
+                && SUCCEEDED(IMFTransform_GetOutputAvailableType(transform, 0, 0, &media_type)))
+        {
+            if (SUCCEEDED(topology_branch_fill_media_type(up_type, media_type)))
+                IMFTransform_SetOutputType(transform, 0, media_type, 0);
+            IMFMediaType_Release(media_type);
+        }
+
         if (SUCCEEDED(hr))
             hr = topology_branch_connect(topology, method, &down_branch, !down_type);
         if (SUCCEEDED(hr))