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
fd0d79c6
Commit
fd0d79c6
authored
Apr 21, 2021
by
Nikolay Sivov
Committed by
Alexandre Julliard
Apr 21, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
mfplay: Forward GetNativeVideoSize() to the session.
Signed-off-by:
Nikolay Sivov
<
nsivov@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
7ce6ff3c
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
18 additions
and
3 deletions
+18
-3
Makefile.in
dlls/mfplay/Makefile.in
+1
-1
player.c
dlls/mfplay/player.c
+13
-2
mfplay.c
dlls/mfplay/tests/mfplay.c
+4
-0
No files found.
dlls/mfplay/Makefile.in
View file @
fd0d79c6
MODULE
=
mfplay.dll
IMPORTLIB
=
mfplay
IMPORTS
=
mfplat mf ole32 user32 uuid mfuuid
IMPORTS
=
mfplat mf ole32 user32 uuid mfuuid
strmiids
EXTRADLLFLAGS
=
-mno-cygwin
-Wb
,--prefer-native
...
...
dlls/mfplay/player.c
View file @
fd0d79c6
...
...
@@ -1251,9 +1251,20 @@ static HRESULT WINAPI media_player_GetNativeVideoSize(IMFPMediaPlayer *iface,
static
HRESULT
WINAPI
media_player_GetIdealVideoSize
(
IMFPMediaPlayer
*
iface
,
SIZE
*
min_size
,
SIZE
*
max_size
)
{
FIXME
(
"%p, %p, %p.
\n
"
,
iface
,
min_size
,
max_size
);
struct
media_player
*
player
=
impl_from_IMFPMediaPlayer
(
iface
);
IMFVideoDisplayControl
*
display_control
;
HRESULT
hr
;
return
E_NOTIMPL
;
TRACE
(
"%p, %p, %p.
\n
"
,
iface
,
min_size
,
max_size
);
if
(
SUCCEEDED
(
hr
=
MFGetService
((
IUnknown
*
)
player
->
session
,
&
MR_VIDEO_RENDER_SERVICE
,
&
IID_IMFVideoDisplayControl
,
(
void
**
)
&
display_control
)))
{
hr
=
IMFVideoDisplayControl_GetIdealVideoSize
(
display_control
,
min_size
,
max_size
);
IMFVideoDisplayControl_Release
(
display_control
);
}
return
hr
;
}
static
HRESULT
WINAPI
media_player_SetVideoSourceRect
(
IMFPMediaPlayer
*
iface
,
...
...
dlls/mfplay/tests/mfplay.c
View file @
fd0d79c6
...
...
@@ -122,6 +122,7 @@ static void test_create_player(void)
static
void
test_shutdown
(
void
)
{
SIZE
min_size
,
max_size
;
IMFPMediaPlayer
*
player
;
float
slowest
,
fastest
;
HRESULT
hr
;
...
...
@@ -156,6 +157,9 @@ static void test_shutdown(void)
ok
(
hr
==
S_OK
,
"Unexpected hr %#x.
\n
"
,
hr
);
ok
(
state
==
MFP_MEDIAPLAYER_STATE_SHUTDOWN
,
"Unexpected state %d.
\n
"
,
state
);
hr
=
IMFPMediaPlayer_GetIdealVideoSize
(
player
,
&
min_size
,
&
max_size
);
ok
(
hr
==
MF_E_SHUTDOWN
,
"Unexpected hr %#x.
\n
"
,
hr
);
hr
=
IMFPMediaPlayer_CreateMediaItemFromURL
(
player
,
L"url"
,
TRUE
,
0
,
&
item
);
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