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
f28eab72
Commit
f28eab72
authored
Oct 06, 2015
by
Francois Cartegnie
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
demux: adaptative: pass demux target time to demuxer call
parent
df5bb189
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
4 deletions
+4
-4
modules/demux/adaptative/Streams.cpp
modules/demux/adaptative/Streams.cpp
+1
-1
modules/demux/adaptative/plumbing/Demuxer.cpp
modules/demux/adaptative/plumbing/Demuxer.cpp
+1
-1
modules/demux/adaptative/plumbing/Demuxer.hpp
modules/demux/adaptative/plumbing/Demuxer.hpp
+2
-2
No files found.
modules/demux/adaptative/Streams.cpp
View file @
f28eab72
...
@@ -281,7 +281,7 @@ AbstractStream::status AbstractStream::demux(mtime_t nz_deadline, bool send)
...
@@ -281,7 +281,7 @@ AbstractStream::status AbstractStream::demux(mtime_t nz_deadline, bool send)
if
(
nz_deadline
+
VLC_TS_0
>
getBufferingLevel
())
/* not already demuxed */
if
(
nz_deadline
+
VLC_TS_0
>
getBufferingLevel
())
/* not already demuxed */
{
{
/* need to read, demuxer still buffering, ... */
/* need to read, demuxer still buffering, ... */
if
(
demuxer
->
demux
()
!=
VLC_DEMUXER_SUCCESS
)
if
(
demuxer
->
demux
(
nz_deadline
)
!=
VLC_DEMUXER_SUCCESS
)
{
{
if
(
restarting_output
||
discontinuity
)
if
(
restarting_output
||
discontinuity
)
{
{
...
...
modules/demux/adaptative/plumbing/Demuxer.cpp
View file @
f28eab72
...
@@ -107,7 +107,7 @@ void Demuxer::drain()
...
@@ -107,7 +107,7 @@ void Demuxer::drain()
while
(
p_demux
&&
demux_Demux
(
p_demux
)
==
VLC_DEMUXER_SUCCESS
);
while
(
p_demux
&&
demux_Demux
(
p_demux
)
==
VLC_DEMUXER_SUCCESS
);
}
}
int
Demuxer
::
demux
()
int
Demuxer
::
demux
(
mtime_t
)
{
{
if
(
b_eof
)
if
(
b_eof
)
return
VLC_DEMUXER_EOF
;
return
VLC_DEMUXER_EOF
;
...
...
modules/demux/adaptative/plumbing/Demuxer.hpp
View file @
f28eab72
...
@@ -37,7 +37,7 @@ namespace adaptative
...
@@ -37,7 +37,7 @@ namespace adaptative
public:
public:
AbstractDemuxer
();
AbstractDemuxer
();
virtual
~
AbstractDemuxer
();
virtual
~
AbstractDemuxer
();
virtual
int
demux
()
=
0
;
virtual
int
demux
(
mtime_t
)
=
0
;
virtual
void
drain
()
=
0
;
virtual
void
drain
()
=
0
;
virtual
bool
create
()
=
0
;
virtual
bool
create
()
=
0
;
virtual
bool
restart
(
CommandsQueue
&
)
=
0
;
virtual
bool
restart
(
CommandsQueue
&
)
=
0
;
...
@@ -54,7 +54,7 @@ namespace adaptative
...
@@ -54,7 +54,7 @@ namespace adaptative
public:
public:
Demuxer
(
demux_t
*
,
const
std
::
string
&
,
es_out_t
*
,
AbstractSourceStream
*
);
Demuxer
(
demux_t
*
,
const
std
::
string
&
,
es_out_t
*
,
AbstractSourceStream
*
);
virtual
~
Demuxer
();
virtual
~
Demuxer
();
virtual
int
demux
();
/* impl */
virtual
int
demux
(
mtime_t
);
/* impl */
virtual
void
drain
();
/* impl */
virtual
void
drain
();
/* impl */
virtual
bool
create
();
/* impl */
virtual
bool
create
();
/* impl */
virtual
bool
restart
(
CommandsQueue
&
);
/* impl */
virtual
bool
restart
(
CommandsQueue
&
);
/* impl */
...
...
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