Rémi Bernon : mf: Notify quality manager of topology change in session_set_topology.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: e741f49aa3e34c462bf28d4c9d511ac31b74dc9a
URL:    https://gitlab.winehq.org/wine/wine/-/commit/e741f49aa3e34c462bf28d4c9d511ac...

Author: Rémi Bernon 
Date:   Fri Sep  2 00:37:08 2022 +0200

mf: Notify quality manager of topology change in session_set_topology.

---

dlls/mf/session.c | 24 ++----------------------
 1 file changed, 2 insertions(+), 22 deletions(-)

diff --git a/dlls/mf/session.c b/dlls/mf/session.c
index 4d052efc85e..8be3ffcd7f3 100644
--- a/dlls/mf/session.c
+++ b/dlls/mf/session.c
@@ -47,8 +47,6 @@ enum session_command
     SESSION_CMD_PAUSE,
     SESSION_CMD_STOP,
     SESSION_CMD_SET_RATE,
-    /* Internally used commands. */
-    SESSION_CMD_QM_NOTIFY_TOPOLOGY,
 };

struct session_op
@@ -414,10 +412,6 @@ static ULONG WINAPI session_op_Release(IUnknown *iface)
             case SESSION_CMD_START:
                 PropVariantClear(&op->start.start_position);
                 break;
-            case SESSION_CMD_QM_NOTIFY_TOPOLOGY:
-                if (op->notify_topology.topology)
-                    IMFTopology_Release(op->notify_topology.topology);
-                break;
             default:
                 ;
         }
@@ -1680,21 +1674,9 @@ static HRESULT session_set_current_topology(struct media_session *session, IMFTo
     DWORD caps, object_flags;
     struct media_sink *sink;
     struct topo_node *node;
-    struct session_op *op;
     IMFMediaEvent *event;
     HRESULT hr;

-    if (session->quality_manager)
-    {
-        if (SUCCEEDED(create_session_op(SESSION_CMD_QM_NOTIFY_TOPOLOGY, &op)))
-        {
-            op->notify_topology.topology = topology;
-            IMFTopology_AddRef(op->notify_topology.topology);
-            session_submit_command(session, op);
-            IUnknown_Release(&op->IUnknown_iface);
-        }
-    }
-
     if (FAILED(hr = IMFTopology_CloneFrom(session->presentation.current_topology, topology)))
     {
         WARN("Failed to clone topology, hr %#lx.\n", hr);
@@ -1826,6 +1808,8 @@ static void session_set_topology(struct media_session *session, DWORD flags, IMF
         {
             hr = session_set_current_topology(session, topology);
             session_set_topo_status(session, hr, MF_TOPOSTATUS_READY);
+            if (session->quality_manager)
+                IMFQualityManager_NotifyTopology(session->quality_manager, topology);
         }
     }

@@ -2396,10 +2380,6 @@ static HRESULT WINAPI session_commands_callback_Invoke(IMFAsyncCallback *iface,
         case SESSION_CMD_CLOSE:
             session_close(session);
             break;
-        case SESSION_CMD_QM_NOTIFY_TOPOLOGY:
-            IMFQualityManager_NotifyTopology(session->quality_manager, op->notify_topology.topology);
-            session_command_complete(session);
-            break;
         case SESSION_CMD_SET_RATE:
             session_set_rate(session, op->set_rate.thin, op->set_rate.rate);
             break;