[vlc-commits] demux: adaptive: remove double check

[Francois Cartegnie]

vlc/vlc-3.0 | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Mon Jul 20 09:38:44 2020 +0200| [67ff7adc559abb4306c134fe4d44d06f6780b323] | committer: Francois Cartegnie

demux: adaptive: remove double check

(cherry picked from commit e04bb5159625d000a5eac0d156ebb2d2d4088798)

> http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=67ff7adc559abb4306c134fe4d44d06f6780b323
---

 modules/demux/adaptive/SegmentTracker.cpp | 13 -------------
 modules/demux/adaptive/SegmentTracker.hpp |  1 -
 modules/demux/adaptive/Streams.cpp        |  6 ------
 3 files changed, 20 deletions(-)

diff --git a/modules/demux/adaptive/SegmentTracker.cpp b/modules/demux/adaptive/SegmentTracker.cpp
index c987cb40ae..a8beef4526 100644
--- a/modules/demux/adaptive/SegmentTracker.cpp
+++ b/modules/demux/adaptive/SegmentTracker.cpp
@@ -149,19 +149,6 @@ const Role & SegmentTracker::getStreamRole() const
     return adaptationSet->getRole();
 }
 
-bool SegmentTracker::segmentsListReady() const
-{
-    BaseRepresentation *rep = curRepresentation;
-    if(!rep)
-        rep = logic->getNextRepresentation(adaptationSet, NULL);
-    if(rep && rep->getPlaylist()->isLive())
-    {
-        assert(curNumber != std::numeric_limits<uint64_t>::max());
-        return rep->getMinAheadTime(curNumber) > 0;
-    }
-    return true;
-}
-
 void SegmentTracker::reset()
 {
     notify(SegmentTrackerEvent(curRepresentation, NULL));
diff --git a/modules/demux/adaptive/SegmentTracker.hpp b/modules/demux/adaptive/SegmentTracker.hpp
index e0c7a1bfe1..e766463789 100644
--- a/modules/demux/adaptive/SegmentTracker.hpp
+++ b/modules/demux/adaptive/SegmentTracker.hpp
@@ -127,7 +127,6 @@ namespace adaptive
             const std::string & getStreamDescription() const;
             const std::string & getStreamLanguage() const;
             const Role & getStreamRole() const;
-            bool segmentsListReady() const;
             void reset();
             SegmentChunk* getNextChunk(bool, AbstractConnectionManager *);
             bool setPositionByTime(mtime_t, bool, bool);
diff --git a/modules/demux/adaptive/Streams.cpp b/modules/demux/adaptive/Streams.cpp
index f3bbed2b27..190b8e0e4f 100644
--- a/modules/demux/adaptive/Streams.cpp
+++ b/modules/demux/adaptive/Streams.cpp
@@ -375,12 +375,6 @@ AbstractStream::buffering_status AbstractStream::doBufferize(mtime_t nz_deadline
     segmentTracker->notifyBufferingLevel(i_min_buffering, i_demuxed, i_total_buffering);
     if(i_demuxed < i_total_buffering) /* not already demuxed */
     {
-        if(!segmentTracker->segmentsListReady()) /* Live Streams */
-        {
-            vlc_mutex_unlock(&lock);
-            return AbstractStream::buffering_suspended;
-        }
-
         mtime_t nz_extdeadline = fakeEsOut()->commandsQueue()->getBufferingLevel() +
                                     (i_total_buffering - i_demuxed) / 4;
         nz_deadline = std::max(nz_deadline, nz_extdeadline);