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
9d307bb3
Commit
9d307bb3
authored
May 06, 2021
by
Nikolay Sivov
Committed by
Alexandre Julliard
May 06, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
mf/evr: Pass stream start/end messages to the mixer.
Signed-off-by:
Nikolay Sivov
<
nsivov@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
60c8dfdd
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
31 additions
and
2 deletions
+31
-2
evr.c
dlls/mf/evr.c
+31
-2
No files found.
dlls/mf/evr.c
View file @
9d307bb3
...
@@ -48,6 +48,7 @@ enum video_stream_flags
...
@@ -48,6 +48,7 @@ enum video_stream_flags
EVR_STREAM_PREROLLING
=
0x1
,
EVR_STREAM_PREROLLING
=
0x1
,
EVR_STREAM_PREROLLED
=
0x2
,
EVR_STREAM_PREROLLED
=
0x2
,
EVR_STREAM_SAMPLE_NEEDED
=
0x4
,
EVR_STREAM_SAMPLE_NEEDED
=
0x4
,
EVR_STREAM_STARTED
=
0x8
,
};
};
struct
video_renderer
;
struct
video_renderer
;
...
@@ -406,6 +407,12 @@ static HRESULT WINAPI video_stream_sink_ProcessSample(IMFStreamSink *iface, IMFS
...
@@ -406,6 +407,12 @@ static HRESULT WINAPI video_stream_sink_ProcessSample(IMFStreamSink *iface, IMFS
}
}
else
if
(
stream
->
parent
->
state
==
EVR_STATE_RUNNING
||
stream
->
flags
&
EVR_STREAM_PREROLLING
)
else
if
(
stream
->
parent
->
state
==
EVR_STATE_RUNNING
||
stream
->
flags
&
EVR_STREAM_PREROLLING
)
{
{
if
(
!
(
stream
->
flags
&
EVR_STREAM_STARTED
))
{
IMFTransform_ProcessMessage
(
stream
->
parent
->
mixer
,
MFT_MESSAGE_NOTIFY_START_OF_STREAM
,
stream
->
id
);
stream
->
flags
|=
EVR_STREAM_STARTED
;
}
if
(
SUCCEEDED
(
IMFTransform_ProcessInput
(
stream
->
parent
->
mixer
,
stream
->
id
,
sample
,
0
)))
if
(
SUCCEEDED
(
IMFTransform_ProcessInput
(
stream
->
parent
->
mixer
,
stream
->
id
,
sample
,
0
)))
IMFVideoPresenter_ProcessMessage
(
stream
->
parent
->
presenter
,
MFVP_MESSAGE_PROCESSINPUTNOTIFY
,
0
);
IMFVideoPresenter_ProcessMessage
(
stream
->
parent
->
presenter
,
MFVP_MESSAGE_PROCESSINPUTNOTIFY
,
0
);
...
@@ -422,12 +429,34 @@ static HRESULT WINAPI video_stream_sink_ProcessSample(IMFStreamSink *iface, IMFS
...
@@ -422,12 +429,34 @@ static HRESULT WINAPI video_stream_sink_ProcessSample(IMFStreamSink *iface, IMFS
return
hr
;
return
hr
;
}
}
static
void
video_stream_end_of_stream
(
struct
video_stream
*
stream
)
{
if
(
!
(
stream
->
flags
&
EVR_STREAM_STARTED
))
return
;
IMFTransform_ProcessMessage
(
stream
->
parent
->
mixer
,
MFT_MESSAGE_NOTIFY_END_OF_STREAM
,
stream
->
id
);
stream
->
flags
&=
~
EVR_STREAM_STARTED
;
}
static
HRESULT
WINAPI
video_stream_sink_PlaceMarker
(
IMFStreamSink
*
iface
,
MFSTREAMSINK_MARKER_TYPE
marker_type
,
static
HRESULT
WINAPI
video_stream_sink_PlaceMarker
(
IMFStreamSink
*
iface
,
MFSTREAMSINK_MARKER_TYPE
marker_type
,
const
PROPVARIANT
*
marker_value
,
const
PROPVARIANT
*
context_value
)
const
PROPVARIANT
*
marker_value
,
const
PROPVARIANT
*
context_value
)
{
{
FIXME
(
"%p, %d, %p, %p.
\n
"
,
iface
,
marker_type
,
marker_value
,
context_value
);
struct
video_stream
*
stream
=
impl_from_IMFStreamSink
(
iface
);
HRESULT
hr
=
S_OK
;
return
E_NOTIMPL
;
TRACE
(
"%p, %d, %p, %p.
\n
"
,
iface
,
marker_type
,
marker_value
,
context_value
);
EnterCriticalSection
(
&
stream
->
cs
);
if
(
!
stream
->
parent
)
hr
=
MF_E_STREAMSINK_REMOVED
;
else
{
if
(
marker_type
==
MFSTREAMSINK_MARKER_ENDOFSEGMENT
)
video_stream_end_of_stream
(
stream
);
}
LeaveCriticalSection
(
&
stream
->
cs
);
return
hr
;
}
}
static
HRESULT
WINAPI
video_stream_sink_Flush
(
IMFStreamSink
*
iface
)
static
HRESULT
WINAPI
video_stream_sink_Flush
(
IMFStreamSink
*
iface
)
...
...
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