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
bcd39c50
Commit
bcd39c50
authored
Apr 04, 2022
by
Zebediah Figura
Committed by
Alexandre Julliard
Apr 04, 2022
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
winegstreamer: Unblock waits in sink_chain_cb() when disabling a stream.
Signed-off-by:
Zebediah Figura
<
zfigura@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
5861379d
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
5 deletions
+7
-5
wg_parser.c
dlls/winegstreamer/wg_parser.c
+7
-5
No files found.
dlls/winegstreamer/wg_parser.c
View file @
bcd39c50
...
...
@@ -255,6 +255,7 @@ static NTSTATUS wg_parser_stream_disable(void *args)
pthread_mutex_lock
(
&
parser
->
mutex
);
stream
->
enabled
=
false
;
pthread_mutex_unlock
(
&
parser
->
mutex
);
pthread_cond_signal
(
&
stream
->
event_empty_cond
);
return
S_OK
;
}
...
...
@@ -541,6 +542,12 @@ static GstFlowReturn sink_chain_cb(GstPad *pad, GstObject *parent, GstBuffer *bu
pthread_mutex_lock
(
&
parser
->
mutex
);
/* Allow this buffer to be flushed by GStreamer. We are effectively
* implementing a queue object here. */
while
(
stream
->
enabled
&&
!
stream
->
flushing
&&
stream
->
buffer
)
pthread_cond_wait
(
&
stream
->
event_empty_cond
,
&
parser
->
mutex
);
if
(
!
stream
->
enabled
)
{
pthread_mutex_unlock
(
&
parser
->
mutex
);
...
...
@@ -548,11 +555,6 @@ static GstFlowReturn sink_chain_cb(GstPad *pad, GstObject *parent, GstBuffer *bu
return
GST_FLOW_OK
;
}
/* Allow this buffer to be flushed by GStreamer. We are effectively
* implementing a queue object here. */
while
(
!
stream
->
flushing
&&
stream
->
buffer
)
pthread_cond_wait
(
&
stream
->
event_empty_cond
,
&
parser
->
mutex
);
if
(
stream
->
flushing
)
{
pthread_mutex_unlock
(
&
parser
->
mutex
);
...
...
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