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
8a42f952
Commit
8a42f952
authored
Oct 06, 2015
by
Francois Cartegnie
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
demux: adaptative: commit queued commands on demuxer Open()
parent
dd166718
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
4 additions
and
1 deletion
+4
-1
modules/demux/adaptative/Streams.cpp
modules/demux/adaptative/Streams.cpp
+1
-0
modules/demux/adaptative/plumbing/Demuxer.cpp
modules/demux/adaptative/plumbing/Demuxer.cpp
+1
-1
modules/demux/dash/DASHStream.cpp
modules/demux/dash/DASHStream.cpp
+1
-0
modules/demux/hls/HLSStreams.cpp
modules/demux/hls/HLSStreams.cpp
+1
-0
No files found.
modules/demux/adaptative/Streams.cpp
View file @
8a42f952
...
@@ -233,6 +233,7 @@ bool AbstractStream::restartDemux()
...
@@ -233,6 +233,7 @@ bool AbstractStream::restartDemux()
/* Restart with ignoring pushes to queue */
/* Restart with ignoring pushes to queue */
return
demuxer
->
restart
(
fakeesout
->
commandsqueue
);
return
demuxer
->
restart
(
fakeesout
->
commandsqueue
);
}
}
fakeesout
->
commandsqueue
.
Commit
();
return
true
;
return
true
;
}
}
...
...
modules/demux/adaptative/plumbing/Demuxer.cpp
View file @
8a42f952
...
@@ -106,7 +106,7 @@ void Demuxer::drain()
...
@@ -106,7 +106,7 @@ void Demuxer::drain()
int
Demuxer
::
demux
(
mtime_t
)
int
Demuxer
::
demux
(
mtime_t
)
{
{
if
(
b_eof
)
if
(
!
p_demux
||
b_eof
)
return
VLC_DEMUXER_EOF
;
return
VLC_DEMUXER_EOF
;
int
i_ret
=
demux_Demux
(
p_demux
);
int
i_ret
=
demux_Demux
(
p_demux
);
if
(
i_ret
!=
VLC_DEMUXER_SUCCESS
)
if
(
i_ret
!=
VLC_DEMUXER_SUCCESS
)
...
...
modules/demux/dash/DASHStream.cpp
View file @
8a42f952
...
@@ -55,6 +55,7 @@ AbstractDemuxer * DASHStream::createDemux(const StreamFormat &format)
...
@@ -55,6 +55,7 @@ AbstractDemuxer * DASHStream::createDemux(const StreamFormat &format)
delete
ret
;
delete
ret
;
ret
=
NULL
;
ret
=
NULL
;
}
}
else
fakeesout
->
commandsqueue
.
Commit
();
return
ret
;
return
ret
;
}
}
...
...
modules/demux/hls/HLSStreams.cpp
View file @
8a42f952
...
@@ -73,6 +73,7 @@ AbstractDemuxer * HLSStream::createDemux(const StreamFormat &format)
...
@@ -73,6 +73,7 @@ AbstractDemuxer * HLSStream::createDemux(const StreamFormat &format)
delete
ret
;
delete
ret
;
ret
=
NULL
;
ret
=
NULL
;
}
}
else
fakeesout
->
commandsqueue
.
Commit
();
return
ret
;
return
ret
;
}
}
...
...
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