Merge pull request #1995 from CastagnaIT/seek_preceeding

CastagnaIT · web-flow · commit 21449006c0d4 · 2026-02-14T09:13:32.000+01:00
[Session] Removed SeekTime preceeding
diff --git a/src/Session.cpp b/src/Session.cpp
@@ -911,7 +911,7 @@ bool SESSION::CSession::GetNextSample(ISampleReader*& sampleReader)
   return false;
 }
 
-bool SESSION::CSession::SeekTime(double seekTime, bool preceeding)
+bool SESSION::CSession::SeekTime(double seekTime)
 {
   bool ret{false};
 
@@ -989,16 +989,15 @@ bool SESSION::CSession::SeekTime(double seekTime, bool preceeding)
   };
 
   // Helper lambda to perform seek on adaptive stream segment buffer
-  auto SeekAdStream = [](CStream& stream, double seekSecs, bool preceeding) -> bool
+  auto SeekAdStream = [](CStream& stream, double seekSecs) -> bool
   {
     if (!stream.m_adStream.seek_time(seekSecs))
     {
       stream.GetReader()->Reset(true);
       return false;
     }
-    if (!preceeding)
-      stream.GetReader()->Reset(false);
 
+    stream.GetReader()->Reset(false);
     return true;
   };
 
@@ -1023,7 +1022,7 @@ bool SESSION::CSession::SeekTime(double seekTime, bool preceeding)
 
     const double seekSecs = static_cast<double>(seekTimeCorrected) / STREAM_TIME_BASE;
 
-    if (!SeekAdStream(*m_timingStream, seekSecs, preceeding))
+    if (!SeekAdStream(*m_timingStream, seekSecs))
       return false;
 
     if (!CheckReaderRunning(*m_timingStream))
@@ -1063,7 +1062,7 @@ bool SESSION::CSession::SeekTime(double seekTime, bool preceeding)
     {
       const double seekSecs{static_cast<double>(seekTimeCorrected - ptsDiff) / STREAM_TIME_BASE};
 
-      if (!SeekAdStream(*stream, seekSecs, preceeding))
+      if (!SeekAdStream(*stream, seekSecs))
         continue;
     }
 
@@ -1072,7 +1071,7 @@ bool SESSION::CSession::SeekTime(double seekTime, bool preceeding)
 
     streamReader->SetPTSDiff(ptsDiff);
 
-    if (!streamReader->TimeSeek(seekTimeCorrected, preceeding))
+    if (!streamReader->TimeSeek(seekTimeCorrected))
     {
       streamReader->Reset(true);
     }
@@ -1090,7 +1089,6 @@ bool SESSION::CSession::SeekTime(double seekTime, bool preceeding)
       {
         seekTime = destTime;
         seekTimeCorrected = streamReader->PTS();
-        preceeding = false;
       }
       ret = true;
     }
diff --git a/src/Session.h b/src/Session.h
@@ -149,12 +149,10 @@ class ATTR_DLL_LOCAL CSession : public adaptive::AdaptiveStreamObserver
 
   /*! \brief Seek streams and readers to a specified time
    *  \param seekTime The seek time in seconds
-   *  \param preceeding True to seek to keyframe preceeding seektime,
-   *         false to clamp to the start of the next segment
    *  \return True if seeking to another chapter or 1+ streams successfully
    *          seeked, false on error or no streams seeked
    */
-  bool SeekTime(double seekTime, bool preceeding = true);
+  bool SeekTime(double seekTime);
 
   /*! \brief Report if the current content is dynamic/live
    *  \return True if live, false if VOD
diff --git a/src/demuxers/ADTSReader.cpp b/src/demuxers/ADTSReader.cpp
@@ -413,7 +413,7 @@ bool ADTSReader::GetInformation(kodi::addon::InputstreamInfo& info)
 }
 
 // We assume that m_startpos is the current I-Frame position
-bool ADTSReader::SeekTime(uint64_t timeInTs, bool preceeding)
+bool ADTSReader::SeekTime(uint64_t timeInTs)
 {
   while (m_pts < timeInTs)
     if (!ReadPacket())
diff --git a/src/demuxers/ADTSReader.h b/src/demuxers/ADTSReader.h
@@ -102,7 +102,7 @@ class ATTR_DLL_LOCAL ADTSReader
   virtual ~ADTSReader();
 
   void Reset();
-  bool SeekTime(uint64_t timeInTs, bool preceeding);
+  bool SeekTime(uint64_t timeInTs);
 
   bool GetInformation(kodi::addon::InputstreamInfo& info);
   bool ReadPacket();
diff --git a/src/demuxers/TSReader.cpp b/src/demuxers/TSReader.cpp
@@ -206,7 +206,7 @@ bool TSReader::GetInformation(kodi::addon::InputstreamInfo& info)
 }
 
 // We assume that m_startpos is the current I-Frame position
-bool TSReader::SeekTime(uint64_t timeInTs, bool preceeding)
+bool TSReader::SeekTime(uint64_t timeInTs)
 {
   bool hasVideo(false);
   //look if we have video
@@ -218,15 +218,15 @@ bool TSReader::SeekTime(uint64_t timeInTs, bool preceeding)
     }
 
   uint64_t lastRecovery(static_cast<uint64_t>(m_startPos));
-  while (m_pkt.pts == PTS_UNSET || !preceeding || static_cast<uint64_t>(m_pkt.pts) < timeInTs)
+  while (m_pkt.pts == PTS_UNSET || static_cast<uint64_t>(m_pkt.pts) < timeInTs)
   {
     uint64_t thisFrameStart(m_AVContext->GetRecoveryPos());
     if (!ReadPacket())
       return false;
     if (!hasVideo || m_pkt.recoveryPoint || thisFrameStart >= m_startPos)
     {
       lastRecovery = thisFrameStart;
-      if (!preceeding && static_cast<uint64_t>(m_pkt.pts) >= timeInTs)
+      if (static_cast<uint64_t>(m_pkt.pts) >= timeInTs)
         break;
     }
   }
diff --git a/src/demuxers/TSReader.h b/src/demuxers/TSReader.h
@@ -30,7 +30,7 @@ class ATTR_DLL_LOCAL TSReader : public TSDemux::TSDemuxer
 
   void Reset(bool resetPackets = true);
   bool StartStreaming(AP4_UI32 typeMask);
-  bool SeekTime(uint64_t timeInTs, bool preceeding);
+  bool SeekTime(uint64_t timeInTs);
 
   bool GetInformation(kodi::addon::InputstreamInfo& info);
   bool ReadPacket(bool streamInfo = false);
diff --git a/src/demuxers/WebmReader.cpp b/src/demuxers/WebmReader.cpp
@@ -174,7 +174,7 @@ bool WebmReader::GetInformation(kodi::addon::InputstreamInfo& info)
 }
 
 // We assume that m_startpos is the current I-Frame position
-bool WebmReader::SeekTime(uint64_t timeInTs, bool preceeding)
+bool WebmReader::SeekTime(uint64_t timeInTs)
 {
   Reset();
   return true;
diff --git a/src/demuxers/WebmReader.h b/src/demuxers/WebmReader.h
@@ -41,7 +41,7 @@ class ATTR_DLL_LOCAL WebmReader : public webm::Callback
   bool Initialize();
 
   void Reset();
-  bool SeekTime(uint64_t timeInTs, bool preceeding);
+  bool SeekTime(uint64_t timeInTs);
 
   bool GetInformation(kodi::addon::InputstreamInfo& info);
   bool ReadPacket();
diff --git a/src/main.cpp b/src/main.cpp
@@ -304,7 +304,7 @@ DEMUX_PACKET* CInputStreamAdaptive::DemuxRead(void)
   if (~m_failedSeekTime)
   {
     LOG::Log(LOGDEBUG, "Seeking to last failed seek position (%d)", m_failedSeekTime);
-    m_session->SeekTime(static_cast<double>(m_failedSeekTime) * 0.001f, false);
+    m_session->SeekTime(static_cast<double>(m_failedSeekTime) * 0.001f);
     m_failedSeekTime = ~0;
   }
 
@@ -430,7 +430,7 @@ bool CInputStreamAdaptive::PosTime(int ms)
 
   LOG::Log(LOGINFO, "PosTime (%d)", ms);
 
-  bool ret = m_session->SeekTime(static_cast<double>(ms) * 0.001f, false);
+  bool ret = m_session->SeekTime(static_cast<double>(ms) * 0.001f);
   m_failedSeekTime = ret ? ~0 : ms;
 
   return ret;
diff --git a/src/samplereader/ADTSSampleReader.cpp b/src/samplereader/ADTSSampleReader.cpp
@@ -55,10 +55,10 @@ void CADTSSampleReader::Reset(bool bEOS)
   m_eos = bEOS;
 }
 
-bool CADTSSampleReader::TimeSeek(uint64_t pts, bool preceeding)
+bool CADTSSampleReader::TimeSeek(uint64_t pts)
 {
   AP4_UI64 seekPos{(pts * 9) / 100};
-  if (ADTSReader::SeekTime(seekPos, preceeding))
+  if (ADTSReader::SeekTime(seekPos))
   {
     m_started = true;
     return AP4_SUCCEEDED(ReadSample());
diff --git a/src/samplereader/ADTSSampleReader.h b/src/samplereader/ADTSSampleReader.h
@@ -30,7 +30,7 @@ class ATTR_DLL_LOCAL CADTSSampleReader : public ISampleReader, public ADTSReader
   {
     return ADTSReader::GetInformation(info);
   }
-  bool TimeSeek(uint64_t pts, bool preceeding) override;
+  bool TimeSeek(uint64_t pts) override;
   void SetPTSOffset(uint64_t offset) override { m_ptsOffs = offset; }
   int64_t GetPTSDiff() const override { return m_ptsDiff; }
   uint32_t GetTimeScale() const override { return 90000; }
diff --git a/src/samplereader/FragmentedSampleReader.cpp b/src/samplereader/FragmentedSampleReader.cpp
@@ -305,7 +305,7 @@ bool CFragmentedSampleReader::GetInformation(kodi::addon::InputstreamInfo& info)
   return isChanged;
 }
 
-bool CFragmentedSampleReader::TimeSeek(uint64_t pts, bool preceeding)
+bool CFragmentedSampleReader::TimeSeek(uint64_t pts)
 {
   AP4_Ordinal sampleIndex;
   AP4_UI64 seekPos(static_cast<AP4_UI64>((pts * m_timeBaseInt) / m_timeBaseExt));
diff --git a/src/samplereader/FragmentedSampleReader.h b/src/samplereader/FragmentedSampleReader.h
@@ -109,7 +109,7 @@ class ATTR_DLL_LOCAL CFragmentedSampleReader : public ISampleReader, public CLin
   uint64_t GetDuration() const override;
   bool IsEncrypted() const override;
   bool GetInformation(kodi::addon::InputstreamInfo& info) override;
-  bool TimeSeek(uint64_t pts, bool preceeding) override;
+  bool TimeSeek(uint64_t pts) override;
   void SetPTSOffset(uint64_t offset) override;
   int64_t GetPTSDiff() const override { return m_ptsDiff; }
   bool GetFragmentInfo(uint64_t& duration) override;
diff --git a/src/samplereader/SampleReader.h b/src/samplereader/SampleReader.h
@@ -85,10 +85,9 @@ class ATTR_DLL_LOCAL ISampleReader
   /*!
    * \brief Advance the reader to requested PTS.
    * \param pts The PTS to seek for
-   * \param preceeding Allow a backward seek for sample sync
    * \return True if has success, otherwise false.
    */
-  virtual bool TimeSeek(uint64_t pts, bool preceeding) = 0;
+  virtual bool TimeSeek(uint64_t pts) = 0;
 
   virtual void SetPTSOffset(uint64_t offset) = 0;
   virtual int64_t GetPTSDiff() const = 0;
diff --git a/src/samplereader/SubtitleSampleReader.cpp b/src/samplereader/SubtitleSampleReader.cpp
@@ -216,7 +216,7 @@ bool CSubtitleSampleReader::GetInformation(kodi::addon::InputstreamInfo& info)
   return false;
 }
 
-bool CSubtitleSampleReader::TimeSeek(uint64_t pts, bool preceeding)
+bool CSubtitleSampleReader::TimeSeek(uint64_t pts)
 {
   if (dynamic_cast<WebVTTCodecHandler*>(m_codecHandler.get()))
   {
diff --git a/src/samplereader/SubtitleSampleReader.h b/src/samplereader/SubtitleSampleReader.h
@@ -41,7 +41,7 @@ class ATTR_DLL_LOCAL CSubtitleSampleReader : public ISampleReader
   AP4_Result ReadSample() override;
   void Reset(bool bEOS) override;
   bool GetInformation(kodi::addon::InputstreamInfo& info) override;
-  bool TimeSeek(uint64_t pts, bool preceeding) override;
+  bool TimeSeek(uint64_t pts) override;
   void SetPTSOffset(uint64_t offset) override { }
   int64_t GetPTSDiff() const override { return 0; }
   uint32_t GetTimeScale() const override { return 1000; }
diff --git a/src/samplereader/TSSampleReader.cpp b/src/samplereader/TSSampleReader.cpp
@@ -102,13 +102,13 @@ void CTSSampleReader::Reset(bool bEOS)
   m_eos = bEOS;
 }
 
-bool CTSSampleReader::TimeSeek(uint64_t pts, bool preceeding)
+bool CTSSampleReader::TimeSeek(uint64_t pts)
 {
   if (!StartStreaming(m_typeMask))
     return false;
 
   AP4_UI64 seekPos((pts * 9) / 100);
-  if (TSReader::SeekTime(seekPos, preceeding))
+  if (TSReader::SeekTime(seekPos))
   {
     m_started = true;
     return AP4_SUCCEEDED(ReadSample());
diff --git a/src/samplereader/TSSampleReader.h b/src/samplereader/TSSampleReader.h
@@ -36,7 +36,7 @@ class ATTR_DLL_LOCAL CTSSampleReader : public ISampleReader, public TSReader
   {
     return TSReader::GetInformation(info);
   }
-  bool TimeSeek(uint64_t pts, bool preceeding) override;
+  bool TimeSeek(uint64_t pts) override;
   void SetPTSOffset(uint64_t offset) override { m_ptsOffs = offset; }
   int64_t GetPTSDiff() const override { return m_ptsDiff; }
   uint32_t GetTimeScale() const override { return 90000; }
diff --git a/src/samplereader/WebmSampleReader.cpp b/src/samplereader/WebmSampleReader.cpp
@@ -59,10 +59,10 @@ void CWebmSampleReader::Reset(bool bEOS)
   m_eos = bEOS;
 }
 
-bool CWebmSampleReader::TimeSeek(uint64_t pts, bool preceeding)
+bool CWebmSampleReader::TimeSeek(uint64_t pts)
 {
   AP4_UI64 seekPos((pts * 9) / 100);
-  if (WebmReader::SeekTime(seekPos, preceeding))
+  if (WebmReader::SeekTime(seekPos))
   {
     m_started = true;
     return AP4_SUCCEEDED(ReadSample());
diff --git a/src/samplereader/WebmSampleReader.h b/src/samplereader/WebmSampleReader.h
@@ -31,7 +31,7 @@ class ATTR_DLL_LOCAL CWebmSampleReader : public ISampleReader, public WebmReader
   {
     return WebmReader::GetInformation(info);
   }
-  bool TimeSeek(uint64_t pts, bool preceeding) override;
+  bool TimeSeek(uint64_t pts) override;
   void SetPTSOffset(uint64_t offset) override { m_ptsOffs = offset; }
   int64_t GetPTSDiff() const override { return m_ptsDiff; }
   uint32_t GetTimeScale() const override { return 1000; }

Original file line number	Diff line number	Diff line change
`@@ -911,7 +911,7 @@ bool SESSION::CSession::GetNextSample(ISampleReader*& sampleReader)`
`911`	`911`	`return false;`
`912`	`912`	`}`
`913`	`913`
`914`		`-bool SESSION::CSession::SeekTime(double seekTime, bool preceeding)`
	`914`	`+bool SESSION::CSession::SeekTime(double seekTime)`
`915`	`915`	`{`
`916`	`916`	`bool ret{false};`
`917`	`917`
`@@ -989,16 +989,15 @@ bool SESSION::CSession::SeekTime(double seekTime, bool preceeding)`
`989`	`989`	`};`
`990`	`990`
`991`	`991`	`// Helper lambda to perform seek on adaptive stream segment buffer`
`992`		`- auto SeekAdStream = [](CStream& stream, double seekSecs, bool preceeding) -> bool`
	`992`	`+ auto SeekAdStream = [](CStream& stream, double seekSecs) -> bool`
`993`	`993`	`{`
`994`	`994`	`if (!stream.m_adStream.seek_time(seekSecs))`
`995`	`995`	`{`
`996`	`996`	`stream.GetReader()->Reset(true);`
`997`	`997`	`return false;`
`998`	`998`	`}`
`999`		`- if (!preceeding)`
`1000`		`- stream.GetReader()->Reset(false);`
`1001`	`999`
	`1000`	`+ stream.GetReader()->Reset(false);`
`1002`	`1001`	`return true;`
`1003`	`1002`	`};`
`1004`	`1003`
`@@ -1023,7 +1022,7 @@ bool SESSION::CSession::SeekTime(double seekTime, bool preceeding)`
`1023`	`1022`
`1024`	`1023`	`const double seekSecs = static_cast<double>(seekTimeCorrected) / STREAM_TIME_BASE;`
`1025`	`1024`
`1026`		`- if (!SeekAdStream(*m_timingStream, seekSecs, preceeding))`
	`1025`	`+ if (!SeekAdStream(*m_timingStream, seekSecs))`
`1027`	`1026`	`return false;`
`1028`	`1027`
`1029`	`1028`	`if (!CheckReaderRunning(*m_timingStream))`
`@@ -1063,7 +1062,7 @@ bool SESSION::CSession::SeekTime(double seekTime, bool preceeding)`
`1063`	`1062`	`{`
`1064`	`1063`	`const double seekSecs{static_cast<double>(seekTimeCorrected - ptsDiff) / STREAM_TIME_BASE};`
`1065`	`1064`
`1066`		`- if (!SeekAdStream(*stream, seekSecs, preceeding))`
	`1065`	`+ if (!SeekAdStream(*stream, seekSecs))`
`1067`	`1066`	`continue;`
`1068`	`1067`	`}`
`1069`	`1068`
`@@ -1072,7 +1071,7 @@ bool SESSION::CSession::SeekTime(double seekTime, bool preceeding)`
`1072`	`1071`
`1073`	`1072`	`streamReader->SetPTSDiff(ptsDiff);`
`1074`	`1073`
`1075`		`- if (!streamReader->TimeSeek(seekTimeCorrected, preceeding))`
	`1074`	`+ if (!streamReader->TimeSeek(seekTimeCorrected))`
`1076`	`1075`	`{`
`1077`	`1076`	`streamReader->Reset(true);`
`1078`	`1077`	`}`
`@@ -1090,7 +1089,6 @@ bool SESSION::CSession::SeekTime(double seekTime, bool preceeding)`
`1090`	`1089`	`{`
`1091`	`1090`	`seekTime = destTime;`
`1092`	`1091`	`seekTimeCorrected = streamReader->PTS();`
`1093`		`- preceeding = false;`
`1094`	`1092`	`}`
`1095`	`1093`	`ret = true;`
`1096`	`1094`	`}`
Original file line number	Diff line number	Diff line change
`@@ -413,7 +413,7 @@ bool ADTSReader::GetInformation(kodi::addon::InputstreamInfo& info)`
`413`	`413`	`}`
`414`	`414`
`415`	`415`	`// We assume that m_startpos is the current I-Frame position`
`416`		`-bool ADTSReader::SeekTime(uint64_t timeInTs, bool preceeding)`
	`416`	`+bool ADTSReader::SeekTime(uint64_t timeInTs)`
`417`	`417`	`{`
`418`	`418`	`while (m_pts < timeInTs)`
`419`	`419`	`if (!ReadPacket())`
Original file line number	Diff line number	Diff line change
`@@ -206,7 +206,7 @@ bool TSReader::GetInformation(kodi::addon::InputstreamInfo& info)`
`206`	`206`	`}`
`207`	`207`
`208`	`208`	`// We assume that m_startpos is the current I-Frame position`
`209`		`-bool TSReader::SeekTime(uint64_t timeInTs, bool preceeding)`
	`209`	`+bool TSReader::SeekTime(uint64_t timeInTs)`
`210`	`210`	`{`
`211`	`211`	`bool hasVideo(false);`
`212`	`212`	`//look if we have video`
`@@ -218,15 +218,15 @@ bool TSReader::SeekTime(uint64_t timeInTs, bool preceeding)`
`218`	`218`	`}`
`219`	`219`
`220`	`220`	`uint64_t lastRecovery(static_cast<uint64_t>(m_startPos));`
`221`		`- while (m_pkt.pts == PTS_UNSET \|\| !preceeding \|\| static_cast<uint64_t>(m_pkt.pts) < timeInTs)`
	`221`	`+ while (m_pkt.pts == PTS_UNSET \|\| static_cast<uint64_t>(m_pkt.pts) < timeInTs)`
`222`	`222`	`{`
`223`	`223`	`uint64_t thisFrameStart(m_AVContext->GetRecoveryPos());`
`224`	`224`	`if (!ReadPacket())`
`225`	`225`	`return false;`
`226`	`226`	`if (!hasVideo \|\| m_pkt.recoveryPoint \|\| thisFrameStart >= m_startPos)`
`227`	`227`	`{`
`228`	`228`	`lastRecovery = thisFrameStart;`
`229`		`- if (!preceeding && static_cast<uint64_t>(m_pkt.pts) >= timeInTs)`
	`229`	`+ if (static_cast<uint64_t>(m_pkt.pts) >= timeInTs)`
`230`	`230`	`break;`
`231`	`231`	`}`
`232`	`232`	`}`
Original file line number	Diff line number	Diff line change
`@@ -174,7 +174,7 @@ bool WebmReader::GetInformation(kodi::addon::InputstreamInfo& info)`
`174`	`174`	`}`
`175`	`175`
`176`	`176`	`// We assume that m_startpos is the current I-Frame position`
`177`		`-bool WebmReader::SeekTime(uint64_t timeInTs, bool preceeding)`
	`177`	`+bool WebmReader::SeekTime(uint64_t timeInTs)`
`178`	`178`	`{`
`179`	`179`	`Reset();`
`180`	`180`	`return true;`
Original file line number	Diff line number	Diff line change
`@@ -304,7 +304,7 @@ DEMUX_PACKET* CInputStreamAdaptive::DemuxRead(void)`
`304`	`304`	`if (~m_failedSeekTime)`
`305`	`305`	`{`
`306`	`306`	`LOG::Log(LOGDEBUG, "Seeking to last failed seek position (%d)", m_failedSeekTime);`
`307`		`- m_session->SeekTime(static_cast<double>(m_failedSeekTime) * 0.001f, false);`
	`307`	`+ m_session->SeekTime(static_cast<double>(m_failedSeekTime) * 0.001f);`
`308`	`308`	`m_failedSeekTime = ~0;`
`309`	`309`	`}`
`310`	`310`
`@@ -430,7 +430,7 @@ bool CInputStreamAdaptive::PosTime(int ms)`
`430`	`430`
`431`	`431`	`LOG::Log(LOGINFO, "PosTime (%d)", ms);`
`432`	`432`
`433`		`- bool ret = m_session->SeekTime(static_cast<double>(ms) * 0.001f, false);`
	`433`	`+ bool ret = m_session->SeekTime(static_cast<double>(ms) * 0.001f);`
`434`	`434`	`m_failedSeekTime = ret ? ~0 : ms;`
`435`	`435`
`436`	`436`	`return ret;`
Original file line number	Diff line number	Diff line change
`@@ -55,10 +55,10 @@ void CADTSSampleReader::Reset(bool bEOS)`
`55`	`55`	`m_eos = bEOS;`
`56`	`56`	`}`
`57`	`57`
`58`		`-bool CADTSSampleReader::TimeSeek(uint64_t pts, bool preceeding)`
	`58`	`+bool CADTSSampleReader::TimeSeek(uint64_t pts)`
`59`	`59`	`{`
`60`	`60`	`AP4_UI64 seekPos{(pts * 9) / 100};`
`61`		`- if (ADTSReader::SeekTime(seekPos, preceeding))`
	`61`	`+ if (ADTSReader::SeekTime(seekPos))`
`62`	`62`	`{`
`63`	`63`	`m_started = true;`
`64`	`64`	`return AP4_SUCCEEDED(ReadSample());`