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
729ed419
Commit
729ed419
authored
Oct 31, 2023
by
Nikolay Sivov
Committed by
Alexandre Julliard
Oct 31, 2023
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
mf/samplegrabber: Use OnSetPresentationClock() on shutdown as well.
Signed-off-by:
Nikolay Sivov
<
nsivov@codeweavers.com
>
parent
09d94949
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
13 additions
and
6 deletions
+13
-6
samplegrabber.c
dlls/mf/samplegrabber.c
+13
-6
No files found.
dlls/mf/samplegrabber.c
View file @
729ed419
...
...
@@ -1019,8 +1019,13 @@ static void sample_grabber_cancel_timer(struct sample_grabber *grabber)
}
}
static
void
sample_grabber_set_presentation_clock
(
struct
sample_grabber
*
grabber
,
IMFPresentationClock
*
clock
)
static
HRESULT
sample_grabber_set_presentation_clock
(
struct
sample_grabber
*
grabber
,
IMFPresentationClock
*
clock
)
{
HRESULT
hr
;
if
(
FAILED
(
hr
=
IMFSampleGrabberSinkCallback_OnSetPresentationClock
(
sample_grabber_get_callback
(
grabber
),
clock
)))
return
hr
;
if
(
grabber
->
clock
)
{
sample_grabber_cancel_timer
(
grabber
);
...
...
@@ -1043,6 +1048,8 @@ static void sample_grabber_set_presentation_clock(struct sample_grabber *grabber
grabber
->
timer
=
NULL
;
}
}
return
hr
;
}
static
HRESULT
WINAPI
sample_grabber_sink_SetPresentationClock
(
IMFMediaSink
*
iface
,
IMFPresentationClock
*
clock
)
...
...
@@ -1058,10 +1065,9 @@ static HRESULT WINAPI sample_grabber_sink_SetPresentationClock(IMFMediaSink *ifa
{
hr
=
MF_E_SHUTDOWN
;
}
else
if
(
SUCCEEDED
(
hr
=
IMFSampleGrabberSinkCallback_OnSetPresentationClock
(
sample_grabber_get_callback
(
grabber
),
clock
)))
else
{
sample_grabber_set_presentation_clock
(
grabber
,
clock
);
hr
=
sample_grabber_set_presentation_clock
(
grabber
,
clock
);
}
LeaveCriticalSection
(
&
grabber
->
cs
);
...
...
@@ -1109,8 +1115,9 @@ static HRESULT WINAPI sample_grabber_sink_Shutdown(IMFMediaSink *iface)
{
grabber
->
is_shut_down
=
TRUE
;
sample_grabber_release_pending_items
(
grabber
);
sample_grabber_set_presentation_clock
(
grabber
,
NULL
);
if
(
SUCCEEDED
(
hr
=
IMFSampleGrabberSinkCallback_OnShutdown
(
sample_grabber_get_callback
(
grabber
))))
if
(
SUCCEEDED
(
hr
=
sample_grabber_set_presentation_clock
(
grabber
,
NULL
)))
hr
=
IMFSampleGrabberSinkCallback_OnShutdown
(
sample_grabber_get_callback
(
grabber
));
if
(
SUCCEEDED
(
hr
))
{
IMFMediaType_Release
(
grabber
->
current_media_type
);
grabber
->
current_media_type
=
NULL
;
...
...
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