Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-cw
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-cw
Commits
60bf1b25
Commit
60bf1b25
authored
Oct 19, 2020
by
Nikolay Sivov
Committed by
Alexandre Julliard
Oct 19, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
evr/mixer: Keep one input sample per stream.
Signed-off-by:
Nikolay Sivov
<
nsivov@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
16430c45
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
47 additions
and
2 deletions
+47
-2
mixer.c
dlls/evr/mixer.c
+30
-2
evr.c
dlls/evr/tests/evr.c
+17
-0
No files found.
dlls/evr/mixer.c
View file @
60bf1b25
...
...
@@ -43,6 +43,7 @@ struct input_stream
IMFMediaType
*
media_type
;
MFVideoNormalizedRect
rect
;
unsigned
int
zorder
;
IMFSample
*
sample
;
};
struct
output_stream
...
...
@@ -172,6 +173,9 @@ static void video_mixer_clear_types(struct video_mixer *mixer)
if
(
mixer
->
inputs
[
i
].
media_type
)
IMFMediaType_Release
(
mixer
->
inputs
[
i
].
media_type
);
mixer
->
inputs
[
i
].
media_type
=
NULL
;
if
(
mixer
->
inputs
[
i
].
sample
)
IMFSample_Release
(
mixer
->
inputs
[
i
].
sample
);
mixer
->
inputs
[
i
].
sample
=
NULL
;
}
for
(
i
=
0
;
i
<
mixer
->
output
.
type_count
;
++
i
)
{
...
...
@@ -899,9 +903,33 @@ static HRESULT WINAPI video_mixer_transform_ProcessMessage(IMFTransform *iface,
static
HRESULT
WINAPI
video_mixer_transform_ProcessInput
(
IMFTransform
*
iface
,
DWORD
id
,
IMFSample
*
sample
,
DWORD
flags
)
{
FIXME
(
"%p, %u, %p, %#x.
\n
"
,
iface
,
id
,
sample
,
flags
);
struct
video_mixer
*
mixer
=
impl_from_IMFTransform
(
iface
);
struct
input_stream
*
input
;
HRESULT
hr
;
return
E_NOTIMPL
;
TRACE
(
"%p, %u, %p, %#x.
\n
"
,
iface
,
id
,
sample
,
flags
);
if
(
!
sample
)
return
E_POINTER
;
EnterCriticalSection
(
&
mixer
->
cs
);
if
(
SUCCEEDED
(
hr
=
video_mixer_get_input
(
mixer
,
id
,
&
input
)))
{
if
(
!
input
->
media_type
||
!
mixer
->
output
.
media_type
)
hr
=
MF_E_TRANSFORM_TYPE_NOT_SET
;
else
if
(
input
->
sample
)
hr
=
MF_E_NOTACCEPTING
;
else
{
input
->
sample
=
sample
;
IMFSample_AddRef
(
input
->
sample
);
}
}
LeaveCriticalSection
(
&
mixer
->
cs
);
return
hr
;
}
static
HRESULT
WINAPI
video_mixer_transform_ProcessOutput
(
IMFTransform
*
iface
,
DWORD
flags
,
DWORD
count
,
...
...
dlls/evr/tests/evr.c
View file @
60bf1b25
...
...
@@ -2154,6 +2154,23 @@ todo_wine
todo_wine
ok
(
!
color
,
"Unexpected color %#x.
\n
"
,
color
);
IMFDesiredSample_Clear
(
desired
);
hr
=
IMFTransform_ProcessInput
(
mixer
,
0
,
NULL
,
0
);
ok
(
hr
==
E_POINTER
,
"Unexpected hr %#x.
\n
"
,
hr
);
hr
=
IMFTransform_ProcessInput
(
mixer
,
5
,
NULL
,
0
);
ok
(
hr
==
E_POINTER
,
"Unexpected hr %#x.
\n
"
,
hr
);
hr
=
IMFTransform_ProcessInput
(
mixer
,
0
,
sample
,
0
);
ok
(
hr
==
S_OK
,
"Unexpected hr %#x.
\n
"
,
hr
);
hr
=
IMFTransform_ProcessInput
(
mixer
,
0
,
sample
,
0
);
ok
(
hr
==
MF_E_NOTACCEPTING
,
"Unexpected hr %#x.
\n
"
,
hr
);
hr
=
IMFTransform_ProcessInput
(
mixer
,
5
,
sample
,
0
);
ok
(
hr
==
MF_E_INVALIDSTREAMNUMBER
,
"Unexpected hr %#x.
\n
"
,
hr
);
IMFSample_Release
(
sample
);
IDirect3DSurface9_Release
(
surface
);
...
...
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