Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc
Commits
d568542d
Commit
d568542d
authored
Sep 16, 2007
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Force the sending threads to wakeup at exit - closes #1292
parent
56ec18e7
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
0 deletions
+8
-0
modules/access_output/udp.c
modules/access_output/udp.c
+4
-0
modules/stream_out/rtp.c
modules/stream_out/rtp.c
+4
-0
No files found.
modules/access_output/udp.c
View file @
d568542d
...
@@ -302,6 +302,8 @@ static void Close( vlc_object_t * p_this )
...
@@ -302,6 +302,8 @@ static void Close( vlc_object_t * p_this )
int
i
;
int
i
;
vlc_object_kill
(
p_sys
->
p_thread
);
vlc_object_kill
(
p_sys
->
p_thread
);
block_FifoWake
(
p_sys
->
p_thread
->
p_fifo
);
for
(
i
=
0
;
i
<
10
;
i
++
)
for
(
i
=
0
;
i
<
10
;
i
++
)
{
{
block_t
*
p_dummy
=
block_New
(
p_access
,
p_sys
->
i_mtu
);
block_t
*
p_dummy
=
block_New
(
p_access
,
p_sys
->
i_mtu
);
...
@@ -485,6 +487,8 @@ static void ThreadWrite( vlc_object_t *p_this )
...
@@ -485,6 +487,8 @@ static void ThreadWrite( vlc_object_t *p_this )
}
}
#endif
#endif
p_pk
=
block_FifoGet
(
p_thread
->
p_fifo
);
p_pk
=
block_FifoGet
(
p_thread
->
p_fifo
);
if
(
p_pk
==
NULL
)
continue
;
/* forced wake-up */
i_date
=
p_thread
->
i_caching
+
p_pk
->
i_dts
;
i_date
=
p_thread
->
i_caching
+
p_pk
->
i_dts
;
if
(
i_date_last
>
0
)
if
(
i_date_last
>
0
)
...
...
modules/stream_out/rtp.c
View file @
d568542d
...
@@ -1135,6 +1135,7 @@ static int Del( sout_stream_t *p_stream, sout_stream_id_t *id )
...
@@ -1135,6 +1135,7 @@ static int Del( sout_stream_t *p_stream, sout_stream_id_t *id )
sout_stream_sys_t
*
p_sys
=
p_stream
->
p_sys
;
sout_stream_sys_t
*
p_sys
=
p_stream
->
p_sys
;
vlc_object_kill
(
id
);
vlc_object_kill
(
id
);
block_FifoWake
(
id
->
p_fifo
);
vlc_mutex_lock
(
&
p_sys
->
lock_es
);
vlc_mutex_lock
(
&
p_sys
->
lock_es
);
TAB_REMOVE
(
p_sys
->
i_es
,
p_sys
->
es
,
id
);
TAB_REMOVE
(
p_sys
->
i_es
,
p_sys
->
es
,
id
);
...
@@ -1311,6 +1312,9 @@ static void ThreadSend( vlc_object_t *p_this )
...
@@ -1311,6 +1312,9 @@ static void ThreadSend( vlc_object_t *p_this )
while
(
!
id
->
b_die
)
while
(
!
id
->
b_die
)
{
{
block_t
*
out
=
block_FifoGet
(
id
->
p_fifo
);
block_t
*
out
=
block_FifoGet
(
id
->
p_fifo
);
if
(
out
==
NULL
)
continue
;
/* Forced wakeup */
mtime_t
i_date
=
out
->
i_dts
+
i_caching
;
mtime_t
i_date
=
out
->
i_dts
+
i_caching
;
ssize_t
len
=
out
->
i_buffer
;
ssize_t
len
=
out
->
i_buffer
;
...
...
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