Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-winehq
Commits
113a4c4f
Commit
113a4c4f
authored
Nov 02, 2020
by
Nikolay Sivov
Committed by
Alexandre Julliard
Nov 02, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
mfmediaengine: Keep "preload" property.
Signed-off-by:
Nikolay Sivov
<
nsivov@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
abb88520
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
24 additions
and
7 deletions
+24
-7
main.c
dlls/mfmediaengine/main.c
+18
-4
mfmediaengine.c
dlls/mfmediaengine/tests/mfmediaengine.c
+6
-3
No files found.
dlls/mfmediaengine/main.c
View file @
113a4c4f
...
...
@@ -87,6 +87,7 @@ struct media_engine
MF_MEDIA_ENGINE_ERR
error_code
;
HRESULT
extended_code
;
MF_MEDIA_ENGINE_READY
ready_state
;
MF_MEDIA_ENGINE_PRELOAD
preload
;
IMFMediaSession
*
session
;
IMFSourceResolver
*
resolver
;
BSTR
current_source
;
...
...
@@ -717,16 +718,29 @@ static USHORT WINAPI media_engine_GetNetworkState(IMFMediaEngine *iface)
static
MF_MEDIA_ENGINE_PRELOAD
WINAPI
media_engine_GetPreload
(
IMFMediaEngine
*
iface
)
{
FIXME
(
"(%p): stub.
\n
"
,
iface
);
struct
media_engine
*
engine
=
impl_from_IMFMediaEngine
(
iface
);
MF_MEDIA_ENGINE_PRELOAD
preload
;
TRACE
(
"%p.
\n
"
,
iface
);
EnterCriticalSection
(
&
engine
->
cs
);
preload
=
engine
->
preload
;
LeaveCriticalSection
(
&
engine
->
cs
);
return
MF_MEDIA_ENGINE_PRELOAD_NONE
;
return
preload
;
}
static
HRESULT
WINAPI
media_engine_SetPreload
(
IMFMediaEngine
*
iface
,
MF_MEDIA_ENGINE_PRELOAD
preload
)
{
FIXME
(
"(%p, %d): stub.
\n
"
,
iface
,
preload
);
struct
media_engine
*
engine
=
impl_from_IMFMediaEngine
(
iface
);
return
E_NOTIMPL
;
TRACE
(
"%p, %d.
\n
"
,
iface
,
preload
);
EnterCriticalSection
(
&
engine
->
cs
);
engine
->
preload
=
preload
;
LeaveCriticalSection
(
&
engine
->
cs
);
return
S_OK
;
}
static
HRESULT
WINAPI
media_engine_GetBuffered
(
IMFMediaEngine
*
iface
,
IMFMediaTimeRange
**
buffered
)
...
...
dlls/mfmediaengine/tests/mfmediaengine.c
View file @
113a4c4f
...
...
@@ -265,17 +265,20 @@ todo_wine
/* Preload mode is still accessible. */
state
=
IMFMediaEngine_GetPreload
(
media_engine
);
todo_wine
ok
(
!
state
,
"Unexpected state %d.
\n
"
,
state
);
hr
=
IMFMediaEngine_SetPreload
(
media_engine
,
MF_MEDIA_ENGINE_PRELOAD_AUTOMATIC
);
todo_wine
ok
(
hr
==
S_OK
,
"Unexpected hr %#x.
\n
"
,
hr
);
state
=
IMFMediaEngine_GetPreload
(
media_engine
);
todo_wine
ok
(
state
==
MF_MEDIA_ENGINE_PRELOAD_AUTOMATIC
,
"Unexpected state %d.
\n
"
,
state
);
hr
=
IMFMediaEngine_SetPreload
(
media_engine
,
100
);
ok
(
hr
==
S_OK
,
"Unexpected hr %#x.
\n
"
,
hr
);
state
=
IMFMediaEngine_GetPreload
(
media_engine
);
ok
(
state
==
100
,
"Unexpected state %d.
\n
"
,
state
);
hr
=
IMFMediaEngine_GetBuffered
(
media_engine
,
&
time_range
);
todo_wine
ok
(
hr
==
MF_E_SHUTDOWN
,
"Unexpected hr %#x.
\n
"
,
hr
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment