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
cb7fb161
Commit
cb7fb161
authored
Feb 03, 2021
by
Zebediah Figura
Committed by
Alexandre Julliard
Feb 04, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
winegstreamer: Move the "flushing" field to struct wg_parser_stream.
Signed-off-by:
Zebediah Figura
<
z.figura12@gmail.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
c7117240
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
7 deletions
+6
-7
gstdemux.c
dlls/winegstreamer/gstdemux.c
+6
-7
No files found.
dlls/winegstreamer/gstdemux.c
View file @
cb7fb161
...
...
@@ -106,7 +106,7 @@ struct wg_parser_stream
pthread_cond_t
event_cond
,
event_empty_cond
;
struct
wg_parser_event
event
;
bool
eos
;
bool
flushing
,
eos
;
};
struct
parser
...
...
@@ -149,7 +149,6 @@ struct parser_source
SourceSeeking
seek
;
CRITICAL_SECTION
flushing_cs
;
bool
flushing
;
HANDLE
thread
;
};
...
...
@@ -725,9 +724,9 @@ static GstFlowReturn queue_stream_event(struct parser_source *pin, const struct
* is solved by flushing the upstream source. */
pthread_mutex_lock
(
&
parser
->
mutex
);
while
(
!
pin
->
flushing
&&
stream
->
event
.
type
!=
WG_PARSER_EVENT_NONE
)
while
(
!
stream
->
flushing
&&
stream
->
event
.
type
!=
WG_PARSER_EVENT_NONE
)
pthread_cond_wait
(
&
stream
->
event_empty_cond
,
&
parser
->
mutex
);
if
(
pin
->
flushing
)
if
(
stream
->
flushing
)
{
pthread_mutex_unlock
(
&
parser
->
mutex
);
GST_DEBUG
(
"Filter is flushing; discarding event."
);
...
...
@@ -797,7 +796,7 @@ static gboolean event_sink(GstPad *pad, GstObject *parent, GstEvent *event)
{
pthread_mutex_lock
(
&
parser
->
mutex
);
pin
->
flushing
=
true
;
stream
->
flushing
=
true
;
pthread_cond_signal
(
&
stream
->
event_empty_cond
);
switch
(
stream
->
event
.
type
)
...
...
@@ -822,7 +821,7 @@ static gboolean event_sink(GstPad *pad, GstObject *parent, GstEvent *event)
if
(
pin
->
pin
.
pin
.
peer
)
{
pthread_mutex_lock
(
&
parser
->
mutex
);
pin
->
flushing
=
false
;
stream
->
flushing
=
false
;
pthread_mutex_unlock
(
&
parser
->
mutex
);
}
break
;
...
...
@@ -2555,7 +2554,7 @@ static HRESULT GST_RemoveOutputPins(struct parser *This)
pthread_mutex_lock
(
&
parser
->
mutex
);
for
(
i
=
0
;
i
<
This
->
source_count
;
++
i
)
{
This
->
sources
[
i
]
->
flushing
=
true
;
This
->
sources
[
i
]
->
wg_stream
->
flushing
=
true
;
pthread_cond_signal
(
&
This
->
sources
[
i
]
->
wg_stream
->
event_empty_cond
);
}
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