marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mf: Always queue set topologies. 

Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
feature/deterministic
Nikolay Sivov 2020-04-10 17:06:23 +03:00 committed by Alexandre Julliard
parent 5d09f46150
commit 4aafa3c38d
1 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
dlls/mf/session.c
View File

@ -1240,6 +1240,7 @@ static HRESULT session_set_current_topology(struct media_session *session, IMFTo
static void session_set_topology(struct media_session *session, DWORD flags, IMFTopology *topology)
{
IMFTopology *resolved_topology = NULL;
HRESULT hr = S_OK;
/* Resolve unless claimed to be full. */
@ -1247,8 +1248,6 @@ static void session_set_topology(struct media_session *session, DWORD flags, IMF
{
if (!(flags & MFSESSION_SETTOPOLOGY_NORESOLUTION))
{
IMFTopology *resolved_topology = NULL;
hr = session_bind_output_nodes(topology);
if (SUCCEEDED(hr))
@ -1286,27 +1285,27 @@ static void session_set_topology(struct media_session *session, DWORD flags, IMF
/* With no current topology set it right away, otherwise queue. */
if (topology)
{
struct queued_topology *queued_topology;
if ((queued_topology = heap_alloc_zero(sizeof(*queued_topology))))
{
queued_topology->topology = topology;
IMFTopology_AddRef(queued_topology->topology);
list_add_tail(&session->topologies, &queued_topology->entry);
}
if (session->presentation.topo_status == MF_TOPOSTATUS_INVALID)
{
hr = session_set_current_topology(session, topology);
}
else
{
struct queued_topology *queued_topology;
if ((queued_topology = heap_alloc_zero(sizeof(*queued_topology))))
{
queued_topology->topology = topology;
IMFTopology_AddRef(queued_topology->topology);
list_add_tail(&session->topologies, &queued_topology->entry);
}
session_set_topo_status(session, hr, MF_TOPOSTATUS_READY);
}
}
session_set_topo_status(session, hr, MF_TOPOSTATUS_READY);
LeaveCriticalSection(&session->cs);
if (resolved_topology)
IMFTopology_Release(resolved_topology);
}
static HRESULT WINAPI mfsession_QueryInterface(IMFMediaSession *iface, REFIID riid, void **out)