wip

Author: CastagnaIT

src/CompKodiProps.cpp

@@ -21,6 +21,7 @@
 #include <rapidjson/document.h>
 
 using namespace UTILS;
+using namespace ADP::KODI_PROPS;
 
 namespace
 {
@@ -280,11 +281,20 @@ void ADP::KODI_PROPS::CCompKodiProps::InitStage1(const std::map<std::string, std
     else
     {
       auto first = m_drmConfigs.begin();
-      first->second.license.serverUrl = licenseUrl;
+      first->second.license.serverUri = licenseUrl;
     }
   }
 }
 
+const ADP::KODI_PROPS::DrmCfg ADP::KODI_PROPS::CCompKodiProps::GetDrmConfig(
+    std::string_view keySystem) const
+{
+  if (STRING::KeyExists(m_drmConfigs, keySystem))
+    return m_drmConfigs.at(keySystem.data());
+
+  return {}; // default values
+}
+
 void ADP::KODI_PROPS::CCompKodiProps::ParseConfig(const std::string& data)
 {
   /*
@@ -314,6 +324,38 @@ void ADP::KODI_PROPS::CCompKodiProps::ParseConfig(const std::string& data)
     {
       m_config.internalCookies = jDictVal.GetBool();
     }
+    else if (configName == "check_hdcp" && jDictVal.IsString())
+    {
+      std::string_view value = jDictVal.GetString();
+
+      if (value.empty() || value == "default")
+        m_config.hdcpCheck = HdcpCheckType::DEFAULT;
+      else if (value == "license")
+        m_config.hdcpCheck = HdcpCheckType::LICENSE;
+      else
+        LOG::LogF(LOGERROR, "Value \"%s\" isnt supported on \"%s\" config of \"%s\" property",
+                  value.data(), configName.c_str(), PROP_MANIFEST_CONFIG.data());
+    }
+    else if (configName == "resolution_limit" && jDictVal.IsString())
+    {
+      std::string_view value = jDictVal.GetString();
+      if (!value.empty())
+      {
+        auto pos = value.find('x');
+        if (pos != std::string_view::npos)
+        {
+          const int width = STRING::ToInt32(value.substr(0, pos));
+          const int height = STRING::ToInt32(value.substr(pos + 1));
+          m_config.resolutionLimit = width * height;
+        }
+        else
+        {
+          LOG::LogF(LOGERROR,
+                    "Invalid resolution format \"%s\" on \"%s\" config of \"%s\" property",
+                    value.data(), configName.c_str(), PROP_MANIFEST_CONFIG.data());
+        }
+      }
+    }
     else
     {
       LOG::LogF(LOGERROR, "Unsupported \"%s\" config or wrong data type on \"%s\" property",
@@ -379,9 +421,7 @@ void ADP::KODI_PROPS::CCompKodiProps::ParseDrmOldProps(
 
   if (!STRING::KeyExists(props, PROP_LICENSE_TYPE))
     return;
-  /*
-   *! @todo: TO UNCOMMENT WHEN DRM AUTO-SELECTION WILL BE FULL IMPLEMENTED
-   *
+
   LOG::Log(LOGWARNING, "<<<<<<<<< DEPRECATION NOTICE >>>>>>>>>\n"
                        "DEPRECATED PROPERTIES HAS BEEN USED TO SET THE DRM CONFIGURATION.\n"
                        "THE FOLLOWING PROPERTIES WILL BE REMOVED FROM FUTURE KODI VERSIONS:\n"
@@ -392,11 +432,11 @@ void ADP::KODI_PROPS::CCompKodiProps::ParseDrmOldProps(
                        "- inputstream.adaptive.server_certificate\n"
                        "- inputstream.adaptive.pre_init_data\n"
                        "YOU SHOULD CONSIDER MIGRATING TO THE NEW PROPERTIES:\n"
-                       "- inputstream.adaptive.drm\n"
                        "- inputstream.adaptive.drm_legacy\n"
+                       "- inputstream.adaptive.drm\n"
                        "FOR MORE INFO, PLEASE READ THE WIKI PAGE: "
                        "https://github.com/xbmc/inputstream.adaptive/wiki/Integration-DRM");
-  */
+
   std::string drmKeySystem{DRM::KS_NONE};
   if (STRING::KeyExists(props, PROP_LICENSE_TYPE))
     drmKeySystem = props.at(PROP_LICENSE_TYPE.data());
@@ -485,7 +525,7 @@ void ADP::KODI_PROPS::CCompKodiProps::ParseDrmOldProps(
     {
       // Field 1: License server url
       if (fieldCount >= 1)
-        drmCfg.license.serverUrl = fields[0];
+        drmCfg.license.serverUri = fields[0];
 
       // Field 2: HTTP request headers
       if (fieldCount >= 2)
@@ -567,8 +607,8 @@ void ADP::KODI_PROPS::CCompKodiProps::ParseDrmOldProps(
             // Position 2: The dict Key name to get HDCP value (optional)
             if (jPaths.size() >= 2)
             {
-              drmCfg.license.unwrapperParams["path_hdcp_traverse"] = "true";
-              drmCfg.license.unwrapperParams["path_hdcp"] = jPaths[1];
+              drmCfg.license.unwrapperParams["path_hdcp_res_traverse"] = "true";
+              drmCfg.license.unwrapperParams["path_hdcp_res"] = jPaths[1];
             }
           }
         }
@@ -608,7 +648,7 @@ bool ADP::KODI_PROPS::CCompKodiProps::ParseDrmConfig(const std::string& data)
       continue;
     }
 
-    DrmCfg& drmCfg = m_drmConfigs[keySystem];
+    DrmCfg& drmCfg = m_drmConfigs[keySystem]; // create new configuration
     auto& jDictVal = jChildObj.value;
 
     if (!jDictVal.IsObject())
@@ -663,7 +703,7 @@ bool ADP::KODI_PROPS::CCompKodiProps::ParseDrmConfig(const std::string& data)
         drmCfg.license.serverCert = jDictLic["server_certificate"].GetString();
 
       if (jDictLic.HasMember("server_url") && jDictLic["server_url"].IsString())
-        drmCfg.license.serverUrl = jDictLic["server_url"].GetString();
+        drmCfg.license.serverUri = jDictLic["server_url"].GetString();
 
       if (jDictLic.HasMember("use_http_get_request") && jDictLic["use_http_get_request"].IsBool())
         drmCfg.license.isHttpGetRequest = jDictLic["use_http_get_request"].GetBool();
@@ -704,9 +744,6 @@ bool ADP::KODI_PROPS::CCompKodiProps::ParseDrmConfig(const std::string& data)
         }
       }
     }
-
-    //! @todo: temporary support only one DRM config, must be reworked the CSession for DRM auto-selection
-    break;
   }
 
   return true;
@@ -752,9 +789,9 @@ bool ADP::KODI_PROPS::CCompKodiProps::ParseDrmLegacyConfig(const std::string& da
 
   if (!licenseStr.empty())
   {
-    if (URL::IsValidUrl(licenseStr)) // License server URL
+    if (URL::IsValidUrl(licenseStr) || URL::IsValidUri(licenseStr)) // License server URI
     {
-      drmCfg.license.serverUrl = licenseStr;
+      drmCfg.license.serverUri = licenseStr;
     }
     else // Assume are keyid's for ClearKey DRM
     {

src/CompKodiProps.h

@@ -35,6 +35,12 @@ struct ChooserProps
   std::pair<int, int> m_resolutionSecureMax; // Res. limit for DRM protected videos (values 0 means auto)
 };
 
+enum class HdcpCheckType
+{
+  DEFAULT,
+  LICENSE, // To check HDCP values from DRM license response
+};
+
 // Generic add-on configuration
 struct Config
 {
@@ -43,6 +49,10 @@ struct Config
   bool curlSSLVerifyPeer{true};
   // Determines if cookies are internally handled by InputStream Adaptive add-on
   bool internalCookies{false};
+  // Determines how HDCP should be checked
+  HdcpCheckType hdcpCheck{HdcpCheckType::DEFAULT};
+  // Force limit resolutions of manifest streams to the specified value included (value in px, height x width)
+  int resolutionLimit{0};
 };
 
 struct ManifestConfig
@@ -83,8 +93,8 @@ struct DrmCfg
   {
     // The license server certificate encoded as base64
     std::string serverCert;
-    // The license server url
-    std::string serverUrl;
+    // The license server uri
+    std::string serverUri;
     // To force an HTTP GET request, instead that POST request
     bool isHttpGetRequest{false};
     // HTTP request headers
@@ -152,20 +162,10 @@ class ATTR_DLL_LOCAL CCompKodiProps
   // \brief Specifies the manifest configuration
   const ManifestConfig& GetManifestConfig() const { return m_manifestConfig; }
 
+  // \brief Gets the DRM configuration for the specified keysystem. If not found, returns default values.
+  const DrmCfg GetDrmConfig(std::string_view keySystem) const;
 
-  //! @todo: temporary method, for future rework
-  const std::string GetDrmKeySystem()
-  {
-    return m_drmConfigs.empty() ? "" : m_drmConfigs.begin()->first;
-  }
-  //! @todo: temporary method, for future rework
-  const DrmCfg& GetDrmConfig() { return m_drmConfigs[GetDrmKeySystem()]; }
-
-
-  // \brief Get DRM configuration for specified keysystem, if not found will return default values
-  const DrmCfg& GetDrmConfig(const std::string& keySystem) { return m_drmConfigs[keySystem]; }
-  const DrmCfg& GetDrmConfig(std::string_view keySystem) { return m_drmConfigs[std::string(keySystem)]; }
-
+  // \brief Gets the DRM configurations (Key System, DRM config)
   const std::map<std::string, DrmCfg>& GetDrmConfigs() const { return m_drmConfigs; }
 
 private:

src/Iaes_decrypter.h

@@ -26,7 +26,7 @@ class IAESDecrypter
                        size_t dstOffset,
                        size_t& dataSize,
                        bool lastChunk) = 0;
-  virtual std::string convertIV(const std::string& input) = 0;
+  virtual std::vector<uint8_t> convertIV(const std::string& input) = 0;
   virtual void ivFromSequence(uint8_t* buffer, uint64_t sid) = 0;
   // virtual const std::string& getLicenseKey() const = 0;
   // virtual bool RenewLicense(const std::string& pluginUrl) = 0;