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
7a44796d
Commit
7a44796d
authored
May 15, 2020
by
Nikolay Sivov
Committed by
Alexandre Julliard
May 15, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
mf/samplegrabber: Remove now unnecessary shutdown state check.
Signed-off-by:
Nikolay Sivov
<
nsivov@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
51dcfe46
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
17 additions
and
20 deletions
+17
-20
samplegrabber.c
dlls/mf/samplegrabber.c
+17
-20
No files found.
dlls/mf/samplegrabber.c
View file @
7a44796d
...
...
@@ -717,35 +717,32 @@ static HRESULT WINAPI sample_grabber_stream_timer_callback_Invoke(IMFAsyncCallba
EnterCriticalSection
(
&
grabber
->
cs
);
if
(
!
grabber
->
is_shut_down
)
LIST_FOR_EACH_ENTRY_SAFE
(
item
,
item2
,
&
grabber
->
items
,
struct
scheduled_item
,
entry
)
{
LIST_FOR_EACH_ENTRY_SAFE
(
item
,
item2
,
&
grabber
->
items
,
struct
scheduled_item
,
entry
)
if
(
item
->
type
==
ITEM_TYPE_MARKER
)
{
sample_grabber_stream_report_marker
(
grabber
,
&
item
->
u
.
marker
.
context
,
S_OK
);
stream_release_pending_item
(
item
);
}
else
if
(
item
->
type
==
ITEM_TYPE_SAMPLE
)
{
if
(
item
->
type
==
ITEM_TYPE_MARKER
)
if
(
!
sample_reported
)
{
sample_grabber_stream_report_marker
(
grabber
,
&
item
->
u
.
marker
.
context
,
S_OK
);
if
(
FAILED
(
hr
=
sample_grabber_report_sample
(
grabber
,
item
->
u
.
sample
,
&
sample_delivered
)))
WARN
(
"Failed to report a sample, hr %#x.
\n
"
,
hr
);
stream_release_pending_item
(
item
);
sample_reported
=
TRUE
;
}
else
if
(
item
->
type
==
ITEM_TYPE_SAMPLE
)
else
{
if
(
!
sample_reported
)
{
if
(
FAILED
(
hr
=
sample_grabber_report_sample
(
grabber
,
item
->
u
.
sample
,
&
sample_delivered
)))
WARN
(
"Failed to report a sample, hr %#x.
\n
"
,
hr
);
stream_release_pending_item
(
item
);
sample_reported
=
TRUE
;
}
else
{
if
(
FAILED
(
hr
=
stream_schedule_sample
(
grabber
,
item
)))
WARN
(
"Failed to schedule a sample, hr %#x.
\n
"
,
hr
);
break
;
}
if
(
FAILED
(
hr
=
stream_schedule_sample
(
grabber
,
item
)))
WARN
(
"Failed to schedule a sample, hr %#x.
\n
"
,
hr
);
break
;
}
}
if
(
sample_delivered
)
sample_grabber_stream_request_sample
(
grabber
);
}
if
(
sample_delivered
)
sample_grabber_stream_request_sample
(
grabber
);
LeaveCriticalSection
(
&
grabber
->
cs
);
...
...
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