Discussion:
demux: adaptive: rename fakeesout->drain
(too old to reply)
Francois Cartegnie
2017-07-13 13:20:59 UTC
Permalink
Raw Message
vlc | branch: master | Francois Cartegnie <***@free.fr> | Thu Jul 13 11:42:37 2017 +0200| [9a3bd71a82656f5efc2206231a25d0d399a9b5cd] | committer: Francois Cartegnie

demux: adaptive: rename fakeesout->drain
http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=9a3bd71a82656f5efc2206231a25d0d399a9b5cd
---

modules/demux/adaptive/PlaylistManager.cpp | 2 +-
modules/demux/adaptive/Streams.cpp | 4 ++--
modules/demux/adaptive/Streams.hpp | 2 +-
modules/demux/adaptive/plumbing/FakeESOut.cpp | 2 +-
modules/demux/adaptive/plumbing/FakeESOut.hpp | 2 +-
5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/modules/demux/adaptive/PlaylistManager.cpp b/modules/demux/adaptive/PlaylistManager.cpp
index 8fcb53edad..f560d0f72f 100644
--- a/modules/demux/adaptive/PlaylistManager.cpp
+++ b/modules/demux/adaptive/PlaylistManager.cpp
@@ -287,7 +287,7 @@ void PlaylistManager::drain()
if (st->isDisabled())
continue;

- b_drained &= st->drain();
+ b_drained &= st->decodersDrained();
}

if(b_drained)
diff --git a/modules/demux/adaptive/Streams.cpp b/modules/demux/adaptive/Streams.cpp
index bfa754c6c4..18d0fa4bdf 100644
--- a/modules/demux/adaptive/Streams.cpp
+++ b/modules/demux/adaptive/Streams.cpp
@@ -266,9 +266,9 @@ bool AbstractStream::canActivate() const
return !dead;
}

-bool AbstractStream::drain()
+bool AbstractStream::decodersDrained()
{
- return fakeesout->drain();
+ return fakeesout->decodersDrained();
}

AbstractStream::buffering_status AbstractStream::getLastBufferStatus() const
diff --git a/modules/demux/adaptive/Streams.hpp b/modules/demux/adaptive/Streams.hpp
index a5ffba15eb..b6c188d081 100644
--- a/modules/demux/adaptive/Streams.hpp
+++ b/modules/demux/adaptive/Streams.hpp
@@ -86,7 +86,7 @@ namespace adaptive
buffering_status getLastBufferStatus() const;
mtime_t getDemuxedAmount() const;
status dequeue(mtime_t, mtime_t *);
- bool drain();
+ bool decodersDrained();
virtual bool setPosition(mtime_t, bool);
mtime_t getPlaybackTime() const;
void runUpdates();
diff --git a/modules/demux/adaptive/plumbing/FakeESOut.cpp b/modules/demux/adaptive/plumbing/FakeESOut.cpp
index 87b70bb34a..2676597e1f 100644
--- a/modules/demux/adaptive/plumbing/FakeESOut.cpp
+++ b/modules/demux/adaptive/plumbing/FakeESOut.cpp
@@ -247,7 +247,7 @@ bool FakeESOut::hasSelectedEs() const
return b_selected;
}

-bool FakeESOut::drain()
+bool FakeESOut::decodersDrained()
{
bool b_drained = true;
std::list<FakeESOutID *>::const_iterator it;
diff --git a/modules/demux/adaptive/plumbing/FakeESOut.hpp b/modules/demux/adaptive/plumbing/FakeESOut.hpp
index 4a514c5362..1c1d686918 100644
--- a/modules/demux/adaptive/plumbing/FakeESOut.hpp
+++ b/modules/demux/adaptive/plumbing/FakeESOut.hpp
@@ -44,7 +44,7 @@ namespace adaptive
void setExpectedTimestampOffset(mtime_t);
size_t esCount() const;
bool hasSelectedEs() const;
- bool drain();
+ bool decodersDrained();
bool restarting() const;
void setExtraInfoProvider( ExtraFMTInfoInterface * );
void checkTimestampsStart(mtime_t);

Loading...