ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mf/session: Fix pause command handling from invalid states. 

Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Nikolay Sivov 2021-06-23 14:03:03 +03:00 committed by Alexandre Julliard
parent cba7616d1a
commit 04a26628d1
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
dlls/mf/session.c
View File

@ -903,9 +903,12 @@ static void session_set_started(struct media_session *session)
session_command_complete(session); session_command_complete(session);
} }
static void session_set_paused(struct media_session *session, HRESULT status) static void session_set_paused(struct media_session *session, unsigned int state, HRESULT status)
{ {
session->state = SESSION_STATE_PAUSED; /* Failed event status could indicate a failure during normal transition to paused state,
or an attempt to pause from invalid initial state. To finalize failed transition in the former case,
state is still forced to PAUSED, otherwise previous state is retained. */
if (state != ~0u) session->state = state;
if (SUCCEEDED(status)) if (SUCCEEDED(status))
session_set_caps(session, session->caps & ~MFSESSIONCAP_PAUSE); session_set_caps(session, session->caps & ~MFSESSIONCAP_PAUSE);
IMFMediaEventQueue_QueueEventParamVar(session->event_queue, MESessionPaused, &GUID_NULL, status, NULL); IMFMediaEventQueue_QueueEventParamVar(session->event_queue, MESessionPaused, &GUID_NULL, status, NULL);
@ -923,6 +926,7 @@ static void session_set_closed(struct media_session *session, HRESULT status)
static void session_pause(struct media_session *session) static void session_pause(struct media_session *session)
{ {
unsigned int state = ~0u;
HRESULT hr; HRESULT hr;
switch (session->state) switch (session->state)
@ -932,14 +936,19 @@ static void session_pause(struct media_session *session)
/* Transition in two steps - pause the clock, wait for sinks, then pause sources. */ /* Transition in two steps - pause the clock, wait for sinks, then pause sources. */
if (SUCCEEDED(hr = IMFPresentationClock_Pause(session->clock))) if (SUCCEEDED(hr = IMFPresentationClock_Pause(session->clock)))
session->state = SESSION_STATE_PAUSING_SINKS; session->state = SESSION_STATE_PAUSING_SINKS;
state = SESSION_STATE_PAUSED;
break; break;
case SESSION_STATE_STOPPED:
hr = MF_E_SESSION_PAUSEWHILESTOPPED;
break;
default: default:
hr = MF_E_INVALIDREQUEST; hr = MF_E_INVALIDREQUEST;
} }
if (FAILED(hr)) if (FAILED(hr))
session_set_paused(session, hr); session_set_paused(session, state, hr);
} }
static void session_clear_end_of_presentation(struct media_session *session) static void session_clear_end_of_presentation(struct media_session *session)
@ -2502,7 +2511,7 @@ static void session_set_source_object_state(struct media_session *session, IUnkn
if (!session_is_source_nodes_state(session, OBJ_STATE_PAUSED)) if (!session_is_source_nodes_state(session, OBJ_STATE_PAUSED))
break; break;
session_set_paused(session, S_OK); session_set_paused(session, SESSION_STATE_PAUSED, S_OK);
break; break;
case SESSION_STATE_STOPPING_SOURCES: case SESSION_STATE_STOPPING_SOURCES:
if (!session_is_source_nodes_state(session, OBJ_STATE_STOPPED)) if (!session_is_source_nodes_state(session, OBJ_STATE_STOPPED))
@ -2578,7 +2587,7 @@ static void session_set_sink_stream_state(struct media_session *session, IMFStre
} }
if (FAILED(hr)) if (FAILED(hr))
session_set_paused(session, hr); session_set_paused(session, SESSION_STATE_PAUSED, hr);
break; break;
case SESSION_STATE_STOPPING_SINKS: case SESSION_STATE_STOPPING_SINKS: