temp

Author: CastagnaIT

src/common/AdaptiveDecrypter.h

@@ -10,6 +10,7 @@
 
 #include "decrypters/DrmEngineDefines.h"
 #include "utils/CryptoUtils.h"
+#include "utils/ResultType.h"
 
 #include <cstdint>
 #include <stdexcept>
@@ -59,6 +60,17 @@ class Adaptive_CencSingleSampleDecrypter : public AP4_CencSingleSampleDecrypter
   virtual AP4_UI32 AddPool() { return 0; }
   virtual void RemovePool(AP4_UI32 poolId) {}
 
+  /*
+   * \brief Create a DRM session.
+   * \param pssh[OPT] A PSSH to make the license request, its use depends on DRM.
+   * \param licenseUrl[OPT] A license URL or URI to make the license request, its use depends on DRM.
+   * \param skipSessionMessage[OPT] Skip the session message to avoid make a license request, by default should be set false.
+   * \return SResult::Ok on success, otherwise a SResult failed status.
+   */
+  virtual SResult CreateSession(const std::vector<uint8_t>& pssh,
+                                std::string_view licenseUrl,
+                                bool skipSessionMessage) = 0;
+
   /*!
    * \brief The session ID, is mandatory to distinguish sessions.
    */

src/decrypters/DrmEngine.cpp

@@ -45,36 +45,7 @@ STREAM_CRYPTO_KEY_SYSTEM KSToCryptoKeySystem(std::string_view keySystem)
   else
     return STREAM_CRYPTO_KEY_SYSTEM_NONE;
 }
-/*
-SResult CreateDRM(std::string_view keySystem, std::shared_ptr<DRM::IDecrypter>& drm)
-{
-  std::string decrypterPath = CSrvBroker::GetSettings().GetDecrypterPath();
-  if (decrypterPath.empty())
-  {
-    LOG::LogF(LOGERROR, "No decrypter path set in the add-on settings");
-    return SResult::Error(GUI::GetLocalizedString(30302));
-  }
-
-  drm = DRM::FACTORY::GetDecrypter(KSToCryptoKeySystem(keySystem));
-
-  if (!drm)
-  {
-    LOG::LogF(LOGERROR, "Unable to create the DRM decrypter");
-    return SResult::Error(GUI::GetLocalizedString(30303));
-  }
-
-  drm->SetLibraryPath(decrypterPath);
-
-  if (!drm->Initialize())
-  {
-    drm = nullptr;
-    LOG::LogF(LOGERROR, "Unable to initialize the DRM decrypter");
-    return SResult::Error(GUI::GetLocalizedString(30303));
-  }
 
-  return SResultCode::OK;
-}
-*/
 /*!
  * \brief Get a DRMInfo by Key System
  * \param drmInfos The manifest DRM info
@@ -128,10 +99,10 @@ bool GetCapabilities(const std::optional<bool> isForceSecureDecoder,
 }
 } // unnamed namespace
 
-void DRM::CDRMEngine::Initialize()
+bool DRM::CDRMEngine::Initialize()
 {
   if (!m_drms.empty())
-    return; // assume as already initialized
+    return true; // assume as already initialized
 
   //! @todo: to test a way to initialize DRM when manifest is downloaded/parsed
   //! in the hoping to have a more smoother playback transition from unencrypted->to->encrypted periods
@@ -169,7 +140,8 @@ void DRM::CDRMEngine::Initialize()
   {
     LOG::LogF(LOGERROR,
               "Cannot initialize DrmEngine, no decrypter path set in the add-on settings");
-    return;
+    m_status = EngineStatus::DRM_ERROR;
+    return false;
   }
 
   // Initialize DRMs
@@ -178,7 +150,10 @@ void DRM::CDRMEngine::Initialize()
     (*it)->SetLibraryPath(decrypterPath);
 
     if (!(*it)->Initialize()) // Failed to initialize DRM, delete it and go on
+    {
+      LOG::LogF(LOGERROR, "Unable to initialize %s DRM", (*it)->GetName().c_str());
       it = drms.erase(it);
+    }
     else
       ++it;
   }
@@ -193,6 +168,14 @@ void DRM::CDRMEngine::Initialize()
         m_drms.emplace_back(ks, drm);
     }
   }
+
+  if (m_drms.empty())
+  {
+    LOG::LogF(LOGWARNING, "No DRM available");
+    return false;
+  }
+
+  return true;
 }
 
 bool DRM::CDRMEngine::PreInitializeDRM(DRMSession& session)
@@ -204,7 +187,8 @@ bool DRM::CDRMEngine::PreInitializeDRM(DRMSession& session)
   if (!propDrmCfg.priority.has_value() || propDrmCfg.priority != 1 || propDrmCfg.preInitData.empty())
     return false;
 
-  Initialize();
+  if (!Initialize())
+    return false;
 
   // Pre-initialize the DRM is available for Widevine only.
   // Since the manifest will be downloaded later its assumed that
@@ -237,30 +221,31 @@ bool DRM::CDRMEngine::PreInitializeDRM(DRMSession& session)
   if (!drm)
   {
     m_status = EngineStatus::DRM_ERROR;
-    LOG::LogF(LOGERROR, "Cannot get the DRM instance");
+    LOG::LogF(LOGERROR, "Cannot get the DRM instance for keysystem %s", m_keySystem.c_str());
     GUI::ErrorDialog(GUI::GetLocalizedString(30303));
     return false;
   }
 
+  LOG::LogF(LOGDEBUG, "Initializing session with KID: %s", STRING::ToHexadecimal(kidData).c_str());
+
   DRM::Config drmCfg = CreateDRMConfig(m_keySystem, kodiProps.GetDrmConfig(m_keySystem));
 
-  SResult ret = drm->OpenDRMSystem(drmCfg);
-  if (ret.IsFailed())
+  auto dec = drm->CreateSingleSampleDecrypter(drmCfg, kidData, CryptoMode::AES_CTR);
+
+  if (!dec)
   {
-    LOG::LogF(LOGERROR, "Failed to open the DRM");
-    m_status = EngineStatus::DRM_ERROR;
-    GUI::ErrorDialog(ret.Message());
+    LOG::Log(LOGERROR, "Failed to initialize the %s DRM decrypter", drm->GetName().c_str());
+    m_status = EngineStatus::DECRYPTER_ERROR;
     return false;
   }
 
-  LOG::LogF(LOGDEBUG, "Initializing session with KID: %s", STRING::ToHexadecimal(kidData).c_str());
-
-  auto dec = drm->CreateSingleSampleDecrypter(initData, kidData, "", true, CryptoMode::AES_CTR);
+  const SResult ret = dec->CreateSession(initData, "", true);
 
-  if (!dec)
+  if (ret.IsFailed())
   {
-    LOG::LogF(LOGERROR, "Failed to initialize the decrypter");
-    m_status = EngineStatus::DECRYPTER_ERROR;
+    LOG::LogF(LOGERROR, "Failed to create the DRM session");
+    m_status = EngineStatus::DRM_ERROR;
+    GUI::ErrorDialog(ret.Message());
     return false;
   }
 
@@ -291,7 +276,8 @@ bool DRM::CDRMEngine::InitializeSession(std::vector<DRM::DRMInfo> drmInfos,
   if (drmInfos.empty())
     return false;
 
-  Initialize();
+  if (!Initialize())
+    return false;
 
   LOG::Log(LOGDEBUG, "Initialize crypto session");
 
@@ -428,7 +414,7 @@ bool DRM::CDRMEngine::InitializeSession(std::vector<DRM::DRMInfo> drmInfos,
     if (!drm)
     {
       m_status = EngineStatus::DRM_ERROR;
-      LOG::LogF(LOGERROR, "Cannot get the DRM instance");
+      LOG::LogF(LOGERROR, "Cannot get the DRM instance for keysystem %s", m_keySystem.c_str());
       GUI::ErrorDialog(GUI::GetLocalizedString(30303));
       return false;
     }
@@ -438,26 +424,29 @@ bool DRM::CDRMEngine::InitializeSession(std::vector<DRM::DRMInfo> drmInfos,
     newSes.mediaType = mediaType;
     newSes.kid = drmInfo.defaultKid;
 
-    if (!newSes.drm->IsInitialised())
-    {
-      DRM::Config drmCfg = DRM::CreateDRMConfig(m_keySystem, drmPropCfg);
-      const SResult ret = newSes.drm->OpenDRMSystem(drmCfg);
-      if (ret.IsFailed())
-      {
-        LOG::LogF(LOGERROR, "Failed to open the DRM");
-        m_status = EngineStatus::DRM_ERROR;
-        GUI::ErrorDialog(ret.Message());
-        return false;
-      }
-    }
+    DRM::Config drmCfg = DRM::CreateDRMConfig(m_keySystem, drmPropCfg);
 
     newSes.decrypter = newSes.drm->CreateSingleSampleDecrypter(
-        drmInfo.initData, drmInfoKidBytes, drmInfo.licenseServerUri, false,
+        drmCfg, drmInfoKidBytes,
         drmInfo.cryptoMode == CryptoMode::NONE ? CryptoMode::AES_CTR : drmInfo.cryptoMode);
+
     if (!newSes.decrypter)
     {
-      LOG::Log(LOGERROR, "Failed to initialize the decrypter");
       m_status = EngineStatus::DECRYPTER_ERROR;
+      LOG::Log(LOGERROR, "Failed to initialize the %s DRM decrypter",
+               newSes.drm->GetName().c_str());
+      GUI::ErrorDialog(GUI::GetLocalizedString(30303));
+      return false;
+    }
+
+    const SResult ret =
+        newSes.decrypter->CreateSession(drmInfo.initData, drmInfo.licenseServerUri, false);
+
+    if (ret.IsFailed())
+    {
+      LOG::LogF(LOGERROR, "Failed to create the DRM session");
+      m_status = EngineStatus::DRM_ERROR;
+      GUI::ErrorDialog(ret.Message());
       return false;
     }
 
@@ -660,6 +649,7 @@ bool DRM::CDRMEngine::SelectDRM(std::vector<DRM::DRMInfo>& drmInfos)
     if (drmInfo)
     {
       m_keySystem = drm.keySystem;
+      LOG::LogF(LOGDEBUG, "Selected DRM key system: %s", m_keySystem.c_str());
       break;
     }
   }

src/decrypters/DrmEngine.h

@@ -97,7 +97,7 @@ class ATTR_DLL_LOCAL CDRMEngine
   /*!
    * \brief Initialize the DRM engine.
    */
-  void Initialize();
+  bool Initialize();
 
   /*!
    * \brief Configure DRM ClearKey, by replacing manifest DRM info when needed.

src/decrypters/DrmEngineDefines.h

@@ -125,10 +125,10 @@ struct DRMInfo
 
 struct DRMInstance
 {
-  std::string_view keySystem;
+  std::string keySystem;
   std::shared_ptr<DRM::IDecrypter> drm;
 
-  DRMInstance(const std::string_view& ks, std::shared_ptr<DRM::IDecrypter> d)
+  DRMInstance(std::string_view ks, std::shared_ptr<DRM::IDecrypter> d)
     : keySystem(ks), drm(d)
   {
   }

src/decrypters/IDecrypter.h

@@ -75,6 +75,11 @@ class IDecrypter : public IDecrypterDecoder
 
   virtual ~IDecrypter() {}
 
+  /*
+   * \brief Return a short name for the decrypter implementation
+   */
+  virtual const std::string GetName() const { return "Unknown"; }
+
   /*
    * \brief Initialize the decrypter library
    * \return True if has success, otherwise false
@@ -83,13 +88,6 @@ class IDecrypter : public IDecrypterDecoder
 
   virtual bool IsKeySystemSupported(std::string_view keySystem) = 0;
 
-  /*
-   * \brief Initialise the DRM system
-   * \param config The DRM configuration
-   * \return true on success 
-   */
-  virtual SResult OpenDRMSystem(const DRM::Config& config) = 0;
-  
   /*
    * \brief Creates a Single Sample Decrypter for decrypting content 
    * \param initData The data for initialising the decrypter (e.g. PSSH)
@@ -100,10 +98,8 @@ class IDecrypter : public IDecrypterDecoder
    * \return The single sample decrypter if successfully created
    */
   virtual std::shared_ptr<Adaptive_CencSingleSampleDecrypter> CreateSingleSampleDecrypter(
-      const std::vector<uint8_t>& initData,
+      const DRM::Config& config,
       const std::vector<uint8_t>& defaultKeyId,
-      std::string_view licenseUrl,
-      bool skipSessionMessage,
       CryptoMode cryptoMode) = 0;
 
   /*
@@ -131,12 +127,6 @@ class IDecrypter : public IDecrypterDecoder
     return std::nullopt;
   }
 
-  /*
-   * \brief Check if the decrypter has been initialised (OpenDRMSystem called)
-   * \return True if decrypter has been initialised otherwise false
-   */
-  virtual bool IsInitialised() = 0;
-
   /*
    * \brief Retrieve license challenge data
    * \param decrypter The single sample decrypter to use for license challenge