wip

Author: CastagnaIT

src/CompKodiProps.cpp

@@ -314,6 +314,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",

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

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;