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
14d2b044
Commit
14d2b044
authored
Oct 12, 2020
by
Nikolay Sivov
Committed by
Alexandre Julliard
Oct 12, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
evr/mixer: Add SetOutputBounds().
Signed-off-by:
Nikolay Sivov
<
nsivov@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
ad65d030
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
23 additions
and
2 deletions
+23
-2
mixer.c
dlls/evr/mixer.c
+15
-2
evr.c
dlls/evr/tests/evr.c
+3
-0
basetsd.h
include/basetsd.h
+2
-0
mftransform.idl
include/mftransform.idl
+3
-0
No files found.
dlls/evr/mixer.c
View file @
14d2b044
...
...
@@ -79,6 +79,8 @@ struct video_mixer
IMFAttributes
*
attributes
;
IMFAttributes
*
internal_attributes
;
unsigned
int
mixing_flags
;
LONGLONG
lower_bound
;
LONGLONG
upper_bound
;
CRITICAL_SECTION
cs
;
};
...
...
@@ -814,9 +816,18 @@ static HRESULT WINAPI video_mixer_transform_GetOutputStatus(IMFTransform *iface,
static
HRESULT
WINAPI
video_mixer_transform_SetOutputBounds
(
IMFTransform
*
iface
,
LONGLONG
lower
,
LONGLONG
upper
)
{
FIXME
(
"%p, %s, %s.
\n
"
,
iface
,
wine_dbgstr_longlong
(
lower
),
wine_dbgstr_longlong
(
upper
)
);
struct
video_mixer
*
mixer
=
impl_from_IMFTransform
(
iface
);
return
E_NOTIMPL
;
TRACE
(
"%p, %s, %s.
\n
"
,
iface
,
wine_dbgstr_longlong
(
lower
),
wine_dbgstr_longlong
(
upper
));
EnterCriticalSection
(
&
mixer
->
cs
);
mixer
->
lower_bound
=
lower
;
mixer
->
upper_bound
=
upper
;
LeaveCriticalSection
(
&
mixer
->
cs
);
return
S_OK
;
}
static
HRESULT
WINAPI
video_mixer_transform_ProcessEvent
(
IMFTransform
*
iface
,
DWORD
id
,
IMFMediaEvent
*
event
)
...
...
@@ -1879,6 +1890,8 @@ HRESULT evr_mixer_create(IUnknown *outer, void **out)
object
->
outer_unk
=
outer
?
outer
:
&
object
->
IUnknown_inner
;
object
->
refcount
=
1
;
object
->
input_count
=
1
;
object
->
lower_bound
=
MFT_OUTPUT_BOUND_LOWER_UNBOUNDED
;
object
->
upper_bound
=
MFT_OUTPUT_BOUND_UPPER_UNBOUNDED
;
video_mixer_init_input
(
&
object
->
inputs
[
0
]);
InitializeCriticalSection
(
&
object
->
cs
);
if
(
FAILED
(
hr
=
MFCreateAttributes
(
&
object
->
attributes
,
0
)))
...
...
dlls/evr/tests/evr.c
View file @
14d2b044
...
...
@@ -531,6 +531,9 @@ todo_wine
ok
(
hr
==
S_OK
,
"Unexpected hr %#x.
\n
"
,
hr
);
IUnknown_Release
(
unk
);
hr
=
IMFTransform_SetOutputBounds
(
transform
,
100
,
10
);
ok
(
hr
==
S_OK
,
"Unexpected hr %#x.
\n
"
,
hr
);
hr
=
IMFTransform_QueryInterface
(
transform
,
&
IID_IMFVideoDeviceID
,
(
void
**
)
&
deviceid
);
ok
(
hr
==
S_OK
,
"Unexpected hr %#x.
\n
"
,
hr
);
...
...
include/basetsd.h
View file @
14d2b044
...
...
@@ -265,6 +265,8 @@ typedef ULONG_PTR SIZE_T, *PSIZE_T;
typedef
ULONG_PTR
KAFFINITY
,
*
PKAFFINITY
;
#define MINLONGLONG ((LONGLONG)~MAXLONGLONG)
/* Some Wine-specific definitions */
/* Architecture dependent settings. */
...
...
include/mftransform.idl
View file @
14d2b044
...
...
@@ -18,6 +18,9 @@
import
"mfobjects.idl"
;
cpp_quote
(
"#define MFT_OUTPUT_BOUND_LOWER_UNBOUNDED MINLONGLONG"
)
cpp_quote
(
"#define MFT_OUTPUT_BOUND_UPPER_UNBOUNDED MAXLONGLONG"
)
typedef
[
v1_enum
]
enum
_MFT_MESSAGE_TYPE
{
MFT_MESSAGE_COMMAND_FLUSH
=
0
x00000000
,
...
...
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