Live stream jump

inputstream.adaptive/addon.xml.in

@@ -10,7 +10,7 @@
     name="adaptive"
     extension=""
     tags="true"
-    listitemprops="drm_legacy|license_type|license_key|license_url|license_url_append|license_data|license_flags|manifest_type|server_certificate|manifest_update_parameter|manifest_upd_params|manifest_params|manifest_headers|stream_params|stream_headers|original_audio_language|play_timeshift_buffer|pre_init_data|stream_selection_type|chooser_bandwidth_max|chooser_resolution_max|chooser_resolution_secure_max|live_delay|internal_cookies|config|manifest_config"
+    listitemprops="drm_legacy|license_type|license_key|license_url|license_url_append|license_data|license_flags|manifest_type|server_certificate|manifest_update_parameter|manifest_upd_params|manifest_params|manifest_headers|stream_params|stream_headers|original_audio_language|play_timeshift_buffer|pre_init_data|stream_selection_type|chooser_bandwidth_max|chooser_resolution_max|chooser_resolution_secure_max|live_delay|live_offset|internal_cookies|config|manifest_config"
     library_@PLATFORM@="@LIBRARY_FILENAME@"/>
   <extension point="xbmc.addon.metadata">
     <platform>@PLATFORM@</platform>

src/CompKodiProps.cpp

@@ -52,6 +52,7 @@ constexpr std::string_view PROP_STREAM_HEADERS = "inputstream.adaptive.stream_he
 constexpr std::string_view PROP_AUDIO_LANG_ORIG = "inputstream.adaptive.original_audio_language";
 constexpr std::string_view PROP_PLAY_TIMESHIFT_BUFFER = "inputstream.adaptive.play_timeshift_buffer";
 constexpr std::string_view PROP_LIVE_DELAY = "inputstream.adaptive.live_delay";
+constexpr std::string_view PROP_LIVE_OFFSET = "inputstream.adaptive.live_offset";
 constexpr std::string_view PROP_PRE_INIT_DATA = "inputstream.adaptive.pre_init_data";
 
 constexpr std::string_view PROP_CONFIG = "inputstream.adaptive.config";
@@ -200,6 +201,10 @@ ADP::KODI_PROPS::CCompKodiProps::CCompKodiProps(const std::map<std::string, std:
     {
       m_liveDelay = STRING::ToUint64(prop.second); //! @todo: move to PROP_MANIFEST_CONFIG
     }
+    else if (prop.first == PROP_LIVE_OFFSET)
+    {
+      m_liveOffset = STRING::ToUint64(prop.second); //! @todo: move to PROP_MANIFEST_CONFIG
+    }
     else if (prop.first == PROP_PRE_INIT_DATA)
     {
       m_drmPreInitData = prop.second;

src/CompKodiProps.h

@@ -118,6 +118,8 @@ class ATTR_DLL_LOCAL CCompKodiProps
   bool IsPlayTimeshift() const { return m_playTimeshiftBuffer; }
   // \brief Get a custom delay from LIVE edge in seconds
   uint64_t GetLiveDelay() const { return m_liveDelay; }
+  // \brief Get a custom offset from LIVE start in seconds
+  uint64_t GetLiveOffset() const { return m_liveOffset; }
 
   /*
    * \brief Get data to "pre-initialize" the DRM, if set is represented as a string
@@ -162,6 +164,7 @@ class ATTR_DLL_LOCAL CCompKodiProps
   std::string m_audioLanguageOrig;
   bool m_playTimeshiftBuffer{false};
   uint64_t m_liveDelay{0};
+  uint64_t m_liveOffset{0};
   std::string m_drmPreInitData;
   ChooserProps m_chooserProps;
   Config m_config;

src/Session.cpp

@@ -26,6 +26,7 @@
 #include "utils/log.h"
 
 #include <array>
+#include <limits>
 
 #include <kodi/addon-instance/Inputstream.h>
 
@@ -1441,15 +1442,18 @@ int CSession::GetChapter() const
       }
     }
   }
-  return -1;
+  return 0;
 }
 
 int CSession::GetChapterCount() const
 {
-  if (m_adaptiveTree && m_adaptiveTree->m_periods.size() > 1)
-      return static_cast<int>(m_adaptiveTree->m_periods.size());
+  if (!m_adaptiveTree)
+    return 0;
 
-  return 0;
+  int count = static_cast<int>(m_adaptiveTree->m_periods.size());
+  if (count > 0 && m_adaptiveTree->IsLive())
+    count += 1;
+  return count;
 }
 
 std::string CSession::GetChapterName(int ch) const
@@ -1459,6 +1463,8 @@ std::string CSession::GetChapterName(int ch) const
     --ch;
     if (ch >= 0 && ch < static_cast<int>(m_adaptiveTree->m_periods.size()))
       return m_adaptiveTree->m_periods[ch]->GetId().data();
+    if (ch == static_cast<int>(m_adaptiveTree->m_periods.size()) && m_adaptiveTree->IsLive())
+      return "Live";
   }
 
   return "[Unknown]";
@@ -1469,6 +1475,14 @@ int64_t CSession::GetChapterPos(int ch) const
   int64_t sum{0};
   --ch;
 
+  if (m_adaptiveTree && ch == static_cast<int>(m_adaptiveTree->m_periods.size()) &&
+      m_adaptiveTree->IsLive())
+    return static_cast<int64_t>(m_adaptiveTree->m_totalTime / 1000);
+
+  // Chapter 1 of a live stream: return configured start offset
+  if (ch == 0 && m_adaptiveTree && m_adaptiveTree->IsLive())
+    return static_cast<int64_t>(CSrvBroker::GetKodiProps().GetLiveOffset());
+
   for (; ch; --ch)
   {
     sum += (m_adaptiveTree->m_periods[ch - 1]->GetDuration() * STREAM_TIME_BASE) /
@@ -1516,23 +1530,40 @@ bool CSession::SeekChapter(int ch)
     return true;
 
   --ch;
-  if (ch >= 0 && ch < static_cast<int>(m_adaptiveTree->m_periods.size()) &&
-      m_adaptiveTree->m_periods[ch].get() != m_adaptiveTree->m_currentPeriod)
+
+  if (ch == static_cast<int>(m_adaptiveTree->m_periods.size()) && m_adaptiveTree->IsLive())
   {
-    CPeriod* nextPeriod = m_adaptiveTree->m_periods[ch].get();
-    m_adaptiveTree->m_nextPeriod = nextPeriod;
-    LOG::LogF(LOGDEBUG, "Switching to new Period (id=%s, start=%llu, seq=%u)",
-              nextPeriod->GetId().data(), nextPeriod->GetStart(), nextPeriod->GetSequence());
+    LOG::LogF(LOGDEBUG, "Seeking to live edge (virtual chapter)");
+    SeekTime(std::numeric_limits<double>::max(), 0, false);
+    return true;
+  }
 
-    for (auto& stream : m_streams)
+  if (ch >= 0 && ch < static_cast<int>(m_adaptiveTree->m_periods.size()))
+  {
+    CPeriod* targetPeriod = m_adaptiveTree->m_periods[ch].get();
+    if (targetPeriod != m_adaptiveTree->m_currentPeriod)
     {
-      ISampleReader* sr{stream->GetReader()};
-      if (sr)
+      m_adaptiveTree->m_nextPeriod = targetPeriod;
+      LOG::LogF(LOGDEBUG, "Switching to new Period (id=%s, start=%llu, seq=%u)",
+                targetPeriod->GetId().data(), targetPeriod->GetStart(),
+                targetPeriod->GetSequence());
+
+      for (auto& stream : m_streams)
       {
-        sr->WaitReadSampleAsyncComplete();
-        sr->Reset(true);
+        ISampleReader* sr{stream->GetReader()};
+        if (sr)
+        {
+          sr->WaitReadSampleAsyncComplete();
+          sr->Reset(true);
+        }
       }
     }
+    else
+    {
+      double startTime = GetChapterPos(ch + 1);
+      LOG::LogF(LOGDEBUG, "Seeking to start of current Period (startTime=%.3f)", startTime);
+      SeekTime(startTime, 0, false);
+    }
     return true;
   }
   return false;

src/main.cpp

@@ -495,12 +495,21 @@ bool CInputStreamAdaptive::IsRealTimeStream()
 #if INPUTSTREAM_VERSION_LEVEL > 1
 int CInputStreamAdaptive::GetChapter()
 {
+  // Provide the current chapter number
+  // chapter numbering starts from 1, specify 0 for no chapter
   return m_session ? m_session->GetChapter() : 0;
 }
 
 int CInputStreamAdaptive::GetChapterCount()
 {
-  return m_session ? m_session->GetChapterCount() : 0;
+  if (m_session)
+  {
+    const int count = m_session->GetChapterCount();
+    if (count > 1)
+      return count;
+  }
+  // Return 0 to prevent Kodi core from handling chapters
+  return 0;
 }
 
 const char* CInputStreamAdaptive::GetChapterName(int ch)