Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-2-2
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-2-2
Commits
3fe7ae53
Commit
3fe7ae53
authored
Jun 21, 2008
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
When the underlying access dies, suicide the stream
parent
dcd84049
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
0 deletions
+8
-0
src/input/stream.c
src/input/stream.c
+8
-0
No files found.
src/input/stream.c
View file @
3fe7ae53
...
@@ -1872,6 +1872,8 @@ static int AReadStream( stream_t *s, void *p_read, int i_read )
...
@@ -1872,6 +1872,8 @@ static int AReadStream( stream_t *s, void *p_read, int i_read )
if
(
!
p_sys
->
i_list
)
if
(
!
p_sys
->
i_list
)
{
{
i_read
=
p_access
->
pf_read
(
p_access
,
p_read
,
i_read
);
i_read
=
p_access
->
pf_read
(
p_access
,
p_read
,
i_read
);
if
(
p_access
->
b_die
)
vlc_object_kill
(
s
);
if
(
p_input
)
if
(
p_input
)
{
{
vlc_mutex_lock
(
&
p_input
->
p
->
counters
.
counters_lock
);
vlc_mutex_lock
(
&
p_input
->
p
->
counters
.
counters_lock
);
...
@@ -1887,6 +1889,8 @@ static int AReadStream( stream_t *s, void *p_read, int i_read )
...
@@ -1887,6 +1889,8 @@ static int AReadStream( stream_t *s, void *p_read, int i_read )
i_read
=
p_sys
->
p_list_access
->
pf_read
(
p_sys
->
p_list_access
,
p_read
,
i_read
=
p_sys
->
p_list_access
->
pf_read
(
p_sys
->
p_list_access
,
p_read
,
i_read
);
i_read
);
if
(
p_access
->
b_die
)
vlc_object_kill
(
s
);
/* If we reached an EOF then switch to the next stream in the list */
/* If we reached an EOF then switch to the next stream in the list */
if
(
i_read
==
0
&&
p_sys
->
i_list_index
+
1
<
p_sys
->
i_list
)
if
(
i_read
==
0
&&
p_sys
->
i_list_index
+
1
<
p_sys
->
i_list
)
...
@@ -1938,6 +1942,8 @@ static block_t *AReadBlock( stream_t *s, bool *pb_eof )
...
@@ -1938,6 +1942,8 @@ static block_t *AReadBlock( stream_t *s, bool *pb_eof )
if
(
!
p_sys
->
i_list
)
if
(
!
p_sys
->
i_list
)
{
{
p_block
=
p_access
->
pf_block
(
p_access
);
p_block
=
p_access
->
pf_block
(
p_access
);
if
(
p_access
->
b_die
)
vlc_object_kill
(
s
);
if
(
pb_eof
)
*
pb_eof
=
p_access
->
info
.
b_eof
;
if
(
pb_eof
)
*
pb_eof
=
p_access
->
info
.
b_eof
;
if
(
p_input
&&
p_block
&&
libvlc_stats
(
p_access
)
)
if
(
p_input
&&
p_block
&&
libvlc_stats
(
p_access
)
)
{
{
...
@@ -1953,6 +1959,8 @@ static block_t *AReadBlock( stream_t *s, bool *pb_eof )
...
@@ -1953,6 +1959,8 @@ static block_t *AReadBlock( stream_t *s, bool *pb_eof )
}
}
p_block
=
p_sys
->
p_list_access
->
pf_block
(
p_access
);
p_block
=
p_sys
->
p_list_access
->
pf_block
(
p_access
);
if
(
p_access
->
b_die
)
vlc_object_kill
(
s
);
b_eof
=
p_sys
->
p_list_access
->
info
.
b_eof
;
b_eof
=
p_sys
->
p_list_access
->
info
.
b_eof
;
if
(
pb_eof
)
*
pb_eof
=
b_eof
;
if
(
pb_eof
)
*
pb_eof
=
b_eof
;
...
...
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