Merge pull request #634 from matthuisman/backport_fixes

[Leia] Backport Matrix bug fixes

CMakeLists.txt

@@ -83,11 +83,7 @@ else()
   add_subdirectory(lib/libbento4)
 endif()
 
-if(CORE_SYSTEM_NAME STREQUAL android)
-  set(DECRYPTERPATH "special://xbmcbinaddons")
-else()
-  set(DECRYPTERPATH "special://home/cdm")
-endif()
+set(DECRYPTERPATH "special://home/cdm")
 
 list(APPEND DEPLIBS bento4)
 list(APPEND DEPLIBS mpegts)

Jenkinsfile

@@ -1 +1 @@
-buildPlugin(version: "Leia", deploy: ['osx-x86_64', 'windows-i686', 'windows-x86_64', 'ubuntu-ppa'])
+buildPlugin(version: "Leia")

README.md

@@ -1,4 +1,4 @@
-# inputstream.adaptive (2.4.6)
+# inputstream.adaptive (2.4.7)
 
 This is an adaptive file addon for kodi's new InputStream Interface.
 

debian/control

@@ -1,11 +1,11 @@
 Source: kodi-inputstream-adaptive
 Priority: extra
-Maintainer: peak3d <[email protected]>
+Maintainer: Team Kodi <[email protected]>
 Build-Depends: debhelper (>= 9.0.0), cmake, libkodiplatform-dev (>= 17.0.0),
                kodi-addon-dev, pkg-config, libexpat1-dev
-Standards-Version: 3.9.7
+Standards-Version: 3.9.8
 Section: libs
-Homepage: http://www.peak3d.de
+Homepage: https://kodi.tv
 
 Package: kodi-inputstream-adaptive
 Section: libs

inputstream.adaptive/addon.xml.in

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <addon
   id="inputstream.adaptive"
-  version="2.4.6"
+  version="2.4.7"
   name="InputStream Adaptive"
   provider-name="peak3d">
   <requires>@ADDON_DEPENDS@</requires>
@@ -19,6 +19,17 @@
 	<description lang="es">Cliente InputStream para flujo de datos adaptativos</description>
     <platform>@PLATFORM@</platform>
 	<news>
+v2.4.7 (2021-04-10)
+- [Dash] Fix missing audio languages
+- [Dash] Correctly set timeshift_buffer (live)
+- [Dash] Fix Timing (remove publishTime and presentationTimeOffset)
+- [Dash] Append / to baseurl if required
+- [Dash] Support fpsScale in AdaptationSets
+- [Dash] Use full BaseUrl if real url inside an AdaptationSet
+- Fix for URLs starting with /
+- Use CDllHelper for opening ssd_wv
+- Move Android addon to binary addons repo
+
 v2.4.6 (2020-05-18)
 - Fix effective url if paths beginning with / provided
 - Several translations added / fixed

src/DllHelper.h

@@ -0,0 +1,211 @@
+/*
+ *  Copyright (C) 2005-2018 Team Kodi
+ *  This file is part of Kodi - https://kodi.tv
+ *
+ *  SPDX-License-Identifier: GPL-2.0-or-later
+ *  See LICENSES/README.md for more information.
+ */
+
+#pragma once
+
+#ifdef __cplusplus
+
+#include <string>
+
+#include <dlfcn.h>
+#include <kodi/AddonBase.h>
+#include <kodi/Filesystem.h>
+
+//==============================================================================
+/// @ingroup cpp_kodi_tools_CDllHelper
+/// @brief Macro to translate the given pointer value name of functions to
+/// requested function name.
+///
+/// @note This should always be used and does the work of
+/// @ref kodi::tools::CDllHelper::RegisterSymbol().
+///
+#define REGISTER_DLL_SYMBOL(functionPtr) \
+  kodi::tools::CDllHelper::RegisterSymbol(functionPtr, #functionPtr)
+//------------------------------------------------------------------------------
+
+namespace kodi
+{
+namespace tools
+{
+
+//==============================================================================
+/// @defgroup cpp_kodi_tools_CDllHelper class CDllHelper
+/// @ingroup cpp_kodi_tools
+/// @brief **Class to help with load of shared library functions**\n
+/// You can add them as parent to your class and to help with load of shared
+/// library functions.
+///
+/// @note To use on Windows must you also include [dlfcn-win32](https://github.com/dlfcn-win32/dlfcn-win32)
+/// on your addon!\n\n
+/// Furthermore, this allows the use of Android where the required library is
+/// copied to an EXE useable folder.
+///
+///
+/// ----------------------------------------------------------------------------
+///
+/// **Example:**
+/// ~~~~~~~~~~~~~{.cpp}
+///
+/// #include <kodi/tools/DllHelper.h>
+///
+/// ...
+/// class CMyInstance : public kodi::addon::CInstanceAudioDecoder,
+///                     private kodi::tools::CDllHelper
+/// {
+/// public:
+///   CMyInstance(KODI_HANDLE instance, const std::string& kodiVersion);
+///   bool Start();
+///
+///   ...
+///
+///   // The pointers for on shared library exported functions
+///   int (*Init)();
+///   void (*Cleanup)();
+///   int (*GetLength)();
+/// };
+///
+/// CMyInstance::CMyInstance(KODI_HANDLE instance, const std::string& kodiVersion)
+///   : CInstanceAudioDecoder(instance, kodiVersion)
+/// {
+/// }
+///
+/// bool CMyInstance::Start()
+/// {
+///   std::string lib = kodi::GetAddonPath("myLib.so");
+///   if (!LoadDll(lib)) return false;
+///   if (!REGISTER_DLL_SYMBOL(Init)) return false;
+///   if (!REGISTER_DLL_SYMBOL(Cleanup)) return false;
+///   if (!REGISTER_DLL_SYMBOL(GetLength)) return false;
+///
+///   Init();
+///   return true;
+/// }
+/// ...
+/// ~~~~~~~~~~~~~
+///
+///@{
+class ATTRIBUTE_HIDDEN CDllHelper
+{
+public:
+  //============================================================================
+  /// @ingroup cpp_kodi_tools_CDllHelper
+  /// @brief Class constructor.
+  ///
+  CDllHelper() = default;
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @ingroup cpp_kodi_tools_CDllHelper
+  /// @brief Class destructor.
+  ///
+  virtual ~CDllHelper()
+  {
+    if (m_dll)
+      dlclose(m_dll);
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @ingroup cpp_kodi_tools_CDllHelper
+  /// @brief Function to load requested library.
+  ///
+  /// @param[in] path The path with filename of shared library to load
+  /// @return true if load was successful done
+  ///
+  bool LoadDll(std::string path)
+  {
+#if defined(TARGET_ANDROID)
+    if (kodi::vfs::FileExists(path))
+    {
+      // Check already defined for "xbmcaltbinaddons", if yes no copy necassary.
+      std::string xbmcaltbinaddons =
+          kodi::vfs::TranslateSpecialProtocol("special://xbmcaltbinaddons/");
+      if (path.compare(0, xbmcaltbinaddons.length(), xbmcaltbinaddons) != 0)
+      {
+        bool doCopy = true;
+        std::string dstfile = xbmcaltbinaddons + kodi::vfs::GetFileName(path);
+
+        STAT_STRUCTURE dstFileStat;
+        if (kodi::vfs::StatFile(dstfile, dstFileStat))
+        {
+          STAT_STRUCTURE srcFileStat;
+          if (kodi::vfs::StatFile(path, srcFileStat))
+          {
+            if (dstFileStat.size == srcFileStat.size &&
+                dstFileStat.modificationTime.tv_sec > srcFileStat.modificationTime.tv_sec)
+              doCopy = false;
+          }
+        }
+
+        if (doCopy)
+        {
+          kodi::Log(ADDON_LOG_DEBUG, "Caching '%s' to '%s'", path.c_str(), dstfile.c_str());
+          if (!kodi::vfs::CopyFile(path, dstfile))
+          {
+            kodi::Log(ADDON_LOG_ERROR, "Failed to cache '%s' to '%s'", path.c_str(),
+                      dstfile.c_str());
+            return false;
+          }
+        }
+
+        path = dstfile;
+      }
+    }
+    else
+    {
+      return false;
+    }
+#endif
+
+    m_dll = dlopen(path.c_str(), RTLD_LAZY);
+    if (m_dll == nullptr)
+    {
+      kodi::Log(ADDON_LOG_ERROR, "Unable to load %s", dlerror());
+      return false;
+    }
+    return true;
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @ingroup cpp_kodi_tools_CDllHelper
+  /// @brief Function to register requested library symbol.
+  ///
+  /// @warning This function should not be used, use instead the macro
+  /// @ref REGISTER_DLL_SYMBOL to register the symbol pointer.
+  ///
+  ///
+  /// Use this always via Macro, e.g.:
+  /// ~~~~~~~~~~~~~{.cpp}
+  /// if (!REGISTER_DLL_SYMBOL(Init))
+  ///   return false;
+  /// ~~~~~~~~~~~~~
+  ///
+  template <typename T>
+  bool RegisterSymbol(T& functionPtr, const char* strFunctionPtr)
+  {
+    functionPtr = reinterpret_cast<T>(dlsym(m_dll, strFunctionPtr));
+    if (functionPtr == nullptr)
+    {
+      kodi::Log(ADDON_LOG_ERROR, "Unable to assign function %s", dlerror());
+      return false;
+    }
+    return true;
+  }
+  //----------------------------------------------------------------------------
+
+private:
+  void* m_dll = nullptr;
+};
+///@}
+//------------------------------------------------------------------------------
+
+} /* namespace tools */
+} /* namespace kodi */
+
+#endif /* __cplusplus */

src/common/AdaptiveTree.cpp

@@ -47,7 +47,6 @@ namespace adaptive
     , overallSeconds_(0)
     , stream_start_(0)
     , available_time_(0)
-    , publish_time_(0)
     , base_time_(0)
     , minPresentationOffset(0)
     , has_timeshift_buffer_(false)
@@ -172,7 +171,7 @@ namespace adaptive
   }
 
   void AdaptiveTree::OnDataArrived(unsigned int segNum, uint16_t psshSet, uint8_t iv[16], const uint8_t *src, uint8_t *dst, size_t dstOffset, size_t dataSize)
-  { 
+  {
     memcpy(dst + dstOffset, src, dataSize);
   }
 
@@ -331,7 +330,7 @@ namespace adaptive
     }
     base_url_.resize(paramPos + 1);
 
-    paramPos = base_url_.find("://", 0, 8);
+    paramPos = base_url_.find("://");
     if (paramPos != std::string::npos)
     {
       base_domain_ = base_url_;

src/common/AdaptiveTree.h

@@ -140,7 +140,7 @@ class AdaptiveTree
 
   struct SegmentTemplate
   {
-    SegmentTemplate() : timescale(0), duration(0), presentationTimeOffset(0){};
+    SegmentTemplate() : timescale(0), duration(0) {};
     std::string initialization;
     std::string media;
     unsigned int timescale, duration;
@@ -422,7 +422,7 @@ class AdaptiveTree
   XML_Parser parser_;
   uint32_t currentNode_;
   uint32_t segcount_;
-  uint64_t overallSeconds_, stream_start_, available_time_, publish_time_, base_time_;
+  uint64_t overallSeconds_, stream_start_, available_time_, base_time_;
   uint64_t minPresentationOffset;
   bool has_timeshift_buffer_, has_overall_seconds_;
 
@@ -435,7 +435,7 @@ class AdaptiveTree
 
   uint8_t adpChannelCount_, adp_pssh_set_;
   uint16_t adpwidth_, adpheight_;
-  uint32_t adpfpsRate_;
+  uint32_t adpfpsRate_, adpfpsScale_;
   float adpaspect_;
   ContainerType adpContainerType_;
   bool adp_timelined_, period_timelined_;