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
8a15c811
Commit
8a15c811
authored
Feb 01, 2021
by
Zebediah Figura
Committed by
Alexandre Julliard
Feb 02, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
winegstreamer: Move the "push_thread" field to struct wg_parser.
Signed-off-by:
Zebediah Figura
<
z.figura12@gmail.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
e8cb9946
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
9 additions
and
9 deletions
+9
-9
gstdemux.c
dlls/winegstreamer/gstdemux.c
+9
-9
No files found.
dlls/winegstreamer/gstdemux.c
View file @
8a15c811
...
...
@@ -53,6 +53,8 @@ struct wg_parser
GstPad
*
my_src
,
*
their_sink
;
guint64
file_size
,
start_offset
,
next_offset
,
stop_offset
;
pthread_t
push_thread
;
};
struct
parser
...
...
@@ -82,8 +84,6 @@ struct parser
pthread_cond_t
init_cond
;
bool
no_more_pads
,
has_duration
,
error
;
pthread_t
push_thread
;
HANDLE
read_thread
;
pthread_cond_t
read_cond
,
read_done_cond
;
struct
...
...
@@ -635,7 +635,7 @@ static gboolean gst_base_src_perform_seek(struct parser *This, GstEvent *event)
gboolean
flush
;
guint32
seqnum
;
GstEvent
*
tevent
;
BOOL
thread
=
!!
This
->
push_thread
;
BOOL
thread
=
!!
parser
->
push_thread
;
gst_event_parse_seek
(
event
,
&
rate
,
&
seek_format
,
&
flags
,
&
cur_type
,
&
cur
,
&
stop_type
,
&
stop
);
...
...
@@ -1436,19 +1436,19 @@ static gboolean activate_push(GstPad *pad, gboolean activate)
struct
wg_parser
*
parser
=
This
->
wg_parser
;
if
(
!
activate
)
{
if
(
This
->
push_thread
)
{
pthread_join
(
This
->
push_thread
,
NULL
);
This
->
push_thread
=
0
;
if
(
parser
->
push_thread
)
{
pthread_join
(
parser
->
push_thread
,
NULL
);
parser
->
push_thread
=
0
;
}
if
(
This
->
filter
.
state
==
State_Stopped
)
parser
->
next_offset
=
parser
->
start_offset
;
}
else
if
(
!
This
->
push_thread
)
{
}
else
if
(
!
parser
->
push_thread
)
{
int
ret
;
if
((
ret
=
pthread_create
(
&
This
->
push_thread
,
NULL
,
push_data
,
This
)))
if
((
ret
=
pthread_create
(
&
parser
->
push_thread
,
NULL
,
push_data
,
This
)))
{
GST_ERROR
(
"Failed to create push thread: %s"
,
strerror
(
errno
));
This
->
push_thread
=
0
;
parser
->
push_thread
=
0
;
return
FALSE
;
}
}
...
...
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