vlc | branch: master | Francois Cartegnie <[email protected]> | Tue Oct 6 16:15:55 2015 +0200| [f28eab72469caf88a69bb2a27cab1cfd4991c89c] | committer: Francois Cartegnie
demux: adaptative: pass demux target time to demuxer call > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=f28eab72469caf88a69bb2a27cab1cfd4991c89c --- modules/demux/adaptative/Streams.cpp | 2 +- modules/demux/adaptative/plumbing/Demuxer.cpp | 2 +- modules/demux/adaptative/plumbing/Demuxer.hpp | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/demux/adaptative/Streams.cpp b/modules/demux/adaptative/Streams.cpp index 4f05410..5cc57a1 100644 --- a/modules/demux/adaptative/Streams.cpp +++ b/modules/demux/adaptative/Streams.cpp @@ -281,7 +281,7 @@ AbstractStream::status AbstractStream::demux(mtime_t nz_deadline, bool send) if(nz_deadline + VLC_TS_0 > getBufferingLevel()) /* not already demuxed */ { /* need to read, demuxer still buffering, ... */ - if(demuxer->demux() != VLC_DEMUXER_SUCCESS) + if(demuxer->demux(nz_deadline) != VLC_DEMUXER_SUCCESS) { if(restarting_output || discontinuity) { diff --git a/modules/demux/adaptative/plumbing/Demuxer.cpp b/modules/demux/adaptative/plumbing/Demuxer.cpp index 682c1e9..58ce858 100644 --- a/modules/demux/adaptative/plumbing/Demuxer.cpp +++ b/modules/demux/adaptative/plumbing/Demuxer.cpp @@ -107,7 +107,7 @@ void Demuxer::drain() while(p_demux && demux_Demux(p_demux) == VLC_DEMUXER_SUCCESS); } -int Demuxer::demux() +int Demuxer::demux(mtime_t) { if(b_eof) return VLC_DEMUXER_EOF; diff --git a/modules/demux/adaptative/plumbing/Demuxer.hpp b/modules/demux/adaptative/plumbing/Demuxer.hpp index 044994b..d1cda2b 100644 --- a/modules/demux/adaptative/plumbing/Demuxer.hpp +++ b/modules/demux/adaptative/plumbing/Demuxer.hpp @@ -37,7 +37,7 @@ namespace adaptative public: AbstractDemuxer(); virtual ~AbstractDemuxer(); - virtual int demux() = 0; + virtual int demux(mtime_t) = 0; virtual void drain() = 0; virtual bool create() = 0; virtual bool restart(CommandsQueue &) = 0; @@ -54,7 +54,7 @@ namespace adaptative public: Demuxer(demux_t *, const std::string &, es_out_t *, AbstractSourceStream *); virtual ~Demuxer(); - virtual int demux(); /* impl */ + virtual int demux(mtime_t); /* impl */ virtual void drain(); /* impl */ virtual bool create(); /* impl */ virtual bool restart(CommandsQueue &); /* impl */ _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
