From b0e2256615b73ed4c6b2998e79a62793106c435b Mon Sep 17 00:00:00 2001
From: Francois Cartegnie <fcvlcdev@free.fr>
Date: Tue, 11 Jan 2022 17:37:43 +0100
Subject: [PATCH] demux: adaptive: remove now unused random access times

---
 modules/demux/adaptive/PlaylistManager.cpp    | 12 +++++-------
 modules/demux/adaptive/Streams.cpp            |  7 ++-----
 modules/demux/adaptive/Streams.hpp            |  3 +--
 modules/demux/adaptive/plumbing/FakeESOut.cpp |  9 ---------
 modules/demux/adaptive/plumbing/FakeESOut.hpp |  1 -
 5 files changed, 8 insertions(+), 24 deletions(-)

diff --git a/modules/demux/adaptive/PlaylistManager.cpp b/modules/demux/adaptive/PlaylistManager.cpp
index d1eea21aee..a5f8671ef3 100644
--- a/modules/demux/adaptive/PlaylistManager.cpp
+++ b/modules/demux/adaptive/PlaylistManager.cpp
@@ -746,15 +746,12 @@ void PlaylistManager::updateControlsPosition()
         return;
     cached.lastupdate = now;
 
-    vlc_tick_t rapPlaylistStart = 0;
-    vlc_tick_t rapDemuxStart = 0;
     for(AbstractStream* st : streams)
     {
         if(st->isValid() && !st->isDisabled() && st->isSelected())
         {
             if(st->getMediaPlaybackTimes(&cached.playlistStart, &cached.playlistEnd,
-                                         &cached.playlistLength,
-                                         &rapPlaylistStart, &rapDemuxStart))
+                                         &cached.playlistLength))
                 break;
         }
     }
@@ -780,7 +777,7 @@ void PlaylistManager::updateControlsPosition()
     SeekDebug(msg_Dbg(p_demux, "playlist Start/End %ld/%ld len %ld"
                                "rap pl/demux (%ld/%ld)",
                       cached.playlistStart, cached.playlistEnd, cached.playlistEnd,
-                      rapPlaylistStart, rapDemuxStart));
+                      startTimes.segment.media, startTimes.segment.demux));
 
     if(cached.b_live)
     {
@@ -826,8 +823,9 @@ void PlaylistManager::updateControlsPosition()
         }
     }
 
-    SeekDebug(msg_Dbg(p_demux, "cached.i_time (%ld) cur %ld rap start (pl %ld/dmx %ld)",
-               cached.i_time, currentTimes.continuous, rapPlaylistStart, rapDemuxStart));
+    SeekDebug(msg_Dbg(p_demux, "cached.i_time (%ld) cur %ld rap start (pl %ld/dmx %ld) pos %f",
+                      cached.i_time, currentTimes.continuous, startTimes.segment.media,
+                            startTimes.segment.demux, cached.f_position));
 }
 
 AbstractAdaptationLogic *PlaylistManager::createLogic(AbstractAdaptationLogic::LogicType type, AbstractConnectionManager *conn)
diff --git a/modules/demux/adaptive/Streams.cpp b/modules/demux/adaptive/Streams.cpp
index 8dc3320e26..f6f32d6d08 100644
--- a/modules/demux/adaptive/Streams.cpp
+++ b/modules/demux/adaptive/Streams.cpp
@@ -581,12 +581,9 @@ bool AbstractStream::setPosition(vlc_tick_t time, bool tryonly)
 }
 
 bool AbstractStream::getMediaPlaybackTimes(vlc_tick_t *start, vlc_tick_t *end,
-                                           vlc_tick_t *length,
-                                           vlc_tick_t *mediaStart,
-                                           vlc_tick_t *demuxStart) const
+                                           vlc_tick_t *length) const
 {
-    return (segmentTracker->getMediaPlaybackRange(start, end, length) &&
-            fakeEsOut()->getStartTimestamps(mediaStart, demuxStart));
+    return segmentTracker->getMediaPlaybackRange(start, end, length);
 }
 
 void AbstractStream::runUpdates()
diff --git a/modules/demux/adaptive/Streams.hpp b/modules/demux/adaptive/Streams.hpp
index 4137a368a8..4d19660d3d 100644
--- a/modules/demux/adaptive/Streams.hpp
+++ b/modules/demux/adaptive/Streams.hpp
@@ -92,8 +92,7 @@ namespace adaptive
         Status dequeue(Times, Times *);
         bool decodersDrained();
         virtual bool setPosition(vlc_tick_t, bool);
-        bool getMediaPlaybackTimes(vlc_tick_t *, vlc_tick_t *, vlc_tick_t *,
-                                   vlc_tick_t *, vlc_tick_t *) const;
+        bool getMediaPlaybackTimes(vlc_tick_t *, vlc_tick_t *, vlc_tick_t *) const;
         void runUpdates();
 
         /* Used by demuxers fake streams */
diff --git a/modules/demux/adaptive/plumbing/FakeESOut.cpp b/modules/demux/adaptive/plumbing/FakeESOut.cpp
index d7f54b26fa..10b9d6d7d6 100644
--- a/modules/demux/adaptive/plumbing/FakeESOut.cpp
+++ b/modules/demux/adaptive/plumbing/FakeESOut.cpp
@@ -182,15 +182,6 @@ void FakeESOut::resetTimestamps()
     startTimes = SegmentTimes();
 }
 
-bool FakeESOut::getStartTimestamps( vlc_tick_t *pi_mediats, vlc_tick_t *pi_demuxts )
-{
-    if(!expected.b_timestamp_set)
-        return false;
-    *pi_demuxts = startTimes.demux;
-    *pi_mediats = startTimes.media;
-    return true;
-}
-
 void FakeESOut::setExpectedTimestamp(vlc_tick_t ts)
 {
     if(ts < 0)
diff --git a/modules/demux/adaptive/plumbing/FakeESOut.hpp b/modules/demux/adaptive/plumbing/FakeESOut.hpp
index 4ce9c71a34..6dbf05d591 100644
--- a/modules/demux/adaptive/plumbing/FakeESOut.hpp
+++ b/modules/demux/adaptive/plumbing/FakeESOut.hpp
@@ -85,7 +85,6 @@ namespace adaptive
             void setAssociatedTimestamp( vlc_tick_t );
             void setExpectedTimestamp( vlc_tick_t );
             void resetTimestamps();
-            bool getStartTimestamps( vlc_tick_t *, vlc_tick_t * );
             size_t esCount() const;
             bool hasSelectedEs() const;
             bool decodersDrained();