[Session] Use total segments duration to check the period

src/Session.cpp

@@ -12,6 +12,7 @@
 #include "CompSettings.h"
 #include "SrvBroker.h"
 #include "aes_decrypter.h"
+#include "common/AdaptationSet.h"
 #include "common/AdaptiveDecrypter.h"
 #include "common/AdaptiveTreeFactory.h"
 #include "common/Chooser.h"
@@ -1120,15 +1121,15 @@ bool CSession::SeekTime(double seekTime, unsigned int streamId, bool preceeding)
 
  for (; pi != m_adaptiveTree->m_periods.cend(); pi++)
  {
- chapterTime += double((*pi)->GetDuration()) / (*pi)->GetTimescale();
+ chapterTime += double((*pi)->GetSegDuration()) / (*pi)->GetTimescale();
  if (chapterTime > seekTime)
  break;
  }
 
  if (pi == m_adaptiveTree->m_periods.cend())
  --pi;
 
- chapterTime -= double((*pi)->GetDuration()) / (*pi)->GetTimescale();
+ chapterTime -= double((*pi)->GetSegDuration()) / (*pi)->GetTimescale();
 
  if ((*pi).get() != m_adaptiveTree->m_currentPeriod)
  {
@@ -1369,7 +1370,7 @@ int64_t CSession::GetChapterPos(int ch) const
 
  for (; ch; --ch)
  {
- sum += (m_adaptiveTree->m_periods[ch - 1]->GetDuration() * STREAM_TIME_BASE) /
+ sum += (m_adaptiveTree->m_periods[ch - 1]->GetSegDuration() * STREAM_TIME_BASE) /
  m_adaptiveTree->m_periods[ch - 1]->GetTimescale();
  }
 
@@ -1384,7 +1385,7 @@ uint64_t CSession::GetChapterStartTime() const
  if (p.get() == m_adaptiveTree->m_currentPeriod)
  break;
  else
- start_time += (p->GetDuration() * STREAM_TIME_BASE) / p->GetTimescale();
+ start_time += (p->GetSegDuration() * STREAM_TIME_BASE) / p->GetTimescale();
  }
  return start_time;
 }

src/common/Period.cpp

@@ -23,6 +23,17 @@ PLAYLIST::CPeriod::~CPeriod()
 {
 }
 
+uint64_t PLAYLIST::CPeriod::GetSegDuration()
+{
+ CAdaptationSet* adp = CAdaptationSet::FindByFirstAVStream(m_adaptationSets);
+ if (adp && !adp->GetRepresentations().empty())
+ {
+ auto& rep = adp->GetRepresentations().front();
+ return rep->Timeline().GetDuration() * m_timescale / rep->GetTimescale();
+ }
+ return 0;
+}
+
 void PLAYLIST::CPeriod::CopyHLSData(const CPeriod* other)
 {
  m_adaptationSets.reserve(other->m_adaptationSets.size());
@@ -99,3 +110,5 @@ void PLAYLIST::CPeriod::AddAdaptationSet(std::unique_ptr<CAdaptationSet>& adapta
 {
  m_adaptationSets.push_back(std::move(adaptationSet));
 }
+
+

src/common/Period.h

@@ -57,7 +57,18 @@ class ATTR_DLL_LOCAL CPeriod : public CCommonSegAttribs
  void SetStart(uint64_t start) { m_start = start; }
 
  /*!
- * \brief Get the duration, in timescale units.
+ * \brief Get a precise duration of all segments, in timescale units.
+ * Value is taken from the first A/V representation timeline.
+ * The value can differ from GetDuration, because GetDuration take in account
+ * the duration from "start" time of period,
+ * and may be affected by inaccurate estimates of ADS streams.
+ * \return The duration value.
+ */
+ uint64_t GetSegDuration();
+
+ /*!
+ * \brief Get the duration, in timescale units,
+ * (value may be affected by inaccurate estimates of ADS streams).
  * \return The duration value.
  */
  uint64_t GetDuration() const { return m_duration; }