Nikolay Sivov : mfmediaengine: Set "ended" state when session presentation ends.
Alexandre Julliard
julliard at winehq.org
Fri Jan 29 15:10:21 CST 2021
Module: wine
Branch: master
Commit: 67815c2f6236b65656eb8500cbd11d4b4c9eedff
URL: https://source.winehq.org/git/wine.git/?a=commit;h=67815c2f6236b65656eb8500cbd11d4b4c9eedff
Author: Nikolay Sivov <nsivov at codeweavers.com>
Date: Fri Jan 29 15:09:59 2021 +0300
mfmediaengine: Set "ended" state when session presentation ends.
Signed-off-by: Nikolay Sivov <nsivov at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/mfmediaengine/main.c | 17 +++++++++++++----
1 file changed, 13 insertions(+), 4 deletions(-)
diff --git a/dlls/mfmediaengine/main.c b/dlls/mfmediaengine/main.c
index f9872f43a3b..42aa8a6e92a 100644
--- a/dlls/mfmediaengine/main.c
+++ b/dlls/mfmediaengine/main.c
@@ -96,6 +96,7 @@ enum media_engine_flags
FLAGS_ENGINE_HAS_AUDIO = 0x800,
FLAGS_ENGINE_HAS_VIDEO = 0x1000,
FLAGS_ENGINE_FIRST_FRAME = 0x2000,
+ FLAGS_ENGINE_IS_ENDED = 0x4000,
};
struct video_frame
@@ -634,6 +635,7 @@ static HRESULT WINAPI media_engine_session_events_Invoke(IMFAsyncCallback *iface
EnterCriticalSection(&engine->cs);
media_engine_set_flag(engine, FLAGS_ENGINE_FIRST_FRAME, FALSE);
+ media_engine_set_flag(engine, FLAGS_ENGINE_IS_ENDED, TRUE);
engine->video_frame.pts = MINLONGLONG;
LeaveCriticalSection(&engine->cs);
@@ -1347,9 +1349,16 @@ static HRESULT WINAPI media_engine_GetSeekable(IMFMediaEngine *iface, IMFMediaTi
static BOOL WINAPI media_engine_IsEnded(IMFMediaEngine *iface)
{
- FIXME("(%p): stub.\n", iface);
+ struct media_engine *engine = impl_from_IMFMediaEngine(iface);
+ BOOL value;
- return FALSE;
+ TRACE("%p.\n", iface);
+
+ EnterCriticalSection(&engine->cs);
+ value = !!(engine->flags & FLAGS_ENGINE_IS_ENDED);
+ LeaveCriticalSection(&engine->cs);
+
+ return value;
}
static BOOL WINAPI media_engine_GetAutoPlay(IMFMediaEngine *iface)
@@ -1419,7 +1428,7 @@ static HRESULT WINAPI media_engine_Play(IMFMediaEngine *iface)
if (!(engine->flags & FLAGS_ENGINE_WAITING))
{
- media_engine_set_flag(engine, FLAGS_ENGINE_PAUSED, FALSE);
+ media_engine_set_flag(engine, FLAGS_ENGINE_PAUSED | FLAGS_ENGINE_IS_ENDED, FALSE);
IMFMediaEngineNotify_EventNotify(engine->callback, MF_MEDIA_ENGINE_EVENT_PLAY, 0, 0);
var.vt = VT_EMPTY;
@@ -1445,7 +1454,7 @@ static HRESULT WINAPI media_engine_Pause(IMFMediaEngine *iface)
if (!(engine->flags & FLAGS_ENGINE_PAUSED))
{
- media_engine_set_flag(engine, FLAGS_ENGINE_WAITING, FALSE);
+ media_engine_set_flag(engine, FLAGS_ENGINE_WAITING | FLAGS_ENGINE_IS_ENDED, FALSE);
media_engine_set_flag(engine, FLAGS_ENGINE_PAUSED, TRUE);
IMFMediaEngineNotify_EventNotify(engine->callback, MF_MEDIA_ENGINE_EVENT_TIMEUPDATE, 0, 0);
More information about the wine-cvs
mailing list