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
b8507acf
Commit
b8507acf
authored
Oct 23, 2020
by
Nikolay Sivov
Committed by
Alexandre Julliard
Oct 23, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
evr/mixer: Request more sample on successful ProcessOutput().
Signed-off-by:
Nikolay Sivov
<
nsivov@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
2d879816
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
22 additions
and
2 deletions
+22
-2
mixer.c
dlls/evr/mixer.c
+22
-2
No files found.
dlls/evr/mixer.c
View file @
b8507acf
...
...
@@ -1038,6 +1038,7 @@ static HRESULT WINAPI video_mixer_transform_ProcessMessage(IMFTransform *iface,
{
IMFSample_Release
(
mixer
->
inputs
[
i
].
sample
);
mixer
->
inputs
[
i
].
sample
=
NULL
;
mixer
->
inputs
[
i
].
sample_requested
=
0
;
}
}
...
...
@@ -1150,6 +1151,7 @@ static HRESULT WINAPI video_mixer_transform_ProcessOutput(IMFTransform *iface, D
struct
video_mixer
*
mixer
=
impl_from_IMFTransform
(
iface
);
IDirect3DSurface9
*
surface
;
IDirect3DDevice9
*
device
;
unsigned
int
i
;
HRESULT
hr
;
TRACE
(
"%p, %#x, %u, %p, %p.
\n
"
,
iface
,
flags
,
count
,
buffers
,
status
);
...
...
@@ -1168,8 +1170,26 @@ static HRESULT WINAPI video_mixer_transform_ProcessOutput(IMFTransform *iface, D
{
if
(
mixer
->
is_streaming
)
{
FIXME
(
"Streaming state is not handled.
\n
"
);
hr
=
E_NOTIMPL
;
for
(
i
=
0
;
i
<
mixer
->
input_count
;
++
i
)
{
if
(
!
mixer
->
inputs
[
i
].
sample
)
{
hr
=
MF_E_TRANSFORM_NEED_MORE_INPUT
;
break
;
}
}
/* FIXME: for now discard input */
if
(
SUCCEEDED
(
hr
))
{
for
(
i
=
0
;
i
<
mixer
->
input_count
;
++
i
)
{
IMFSample_Release
(
mixer
->
inputs
[
i
].
sample
);
mixer
->
inputs
[
i
].
sample
=
NULL
;
video_mixer_request_sample
(
mixer
,
i
);
}
}
}
else
{
...
...
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