wip

Author: CastagnaIT

depends/android/libandroidjni/libandroidjni.sha256

@@ -1 +1 @@
-ed8439238a7f2ff53293761abb48844fab51ff66f868d759face8b51523f45bc
+b6a7eb847c473a7329679fe8c50ac91485497d36e3b7f755b47853340766864a

depends/android/libandroidjni/libandroidjni.txt

@@ -1 +1 @@
-libandroidjni https://github.com/CastagnaIT/libandroidjni/archive/59b68509c1d175db2610afeb2daedcdb5e1a77a4.tar.gz
+libandroidjni https://github.com/CastagnaIT/libandroidjni/archive/refs/heads/mediadrm_keys.tar.gz

src/decrypters/widevineandroid/WVCdmAdapter.cpp

@@ -11,6 +11,7 @@
 #include "WVDecrypter.h"
 #include "decrypters/HelperWv.h"
 #include "decrypters/Helpers.h"
+#include "utils/StringUtils.h"
 #include "utils/FileUtils.h"
 #include "utils/log.h"
 
@@ -36,6 +37,24 @@ void CMediaDrmOnEventListener::onEvent(const CJNIMediaDrm& mediaDrm,
   m_decrypterEventCallback->OnMediaDrmEvent(mediaDrm, sessionId, event, extra, data);
 }
 
+CMediaDrmOnKeyStatusChangeListener::CMediaDrmOnKeyStatusChangeListener(
+    CMediaDrmOnKeyStatusChangeCallback* decrypterOnKeyStatusChangeCallback,
+    std::shared_ptr<CJNIClassLoader> classLoader)
+  : CJNIMediaDrmOnKeyStatusChangeListener(*classLoader)
+{
+  m_decrypterOnKeyStatusChangeCallback = decrypterOnKeyStatusChangeCallback;
+}
+
+void CMediaDrmOnKeyStatusChangeListener::onKeyStatusChange(
+    const CJNIMediaDrm& mediaDrm,
+    const std::vector<char>& sessionId,
+    const CJNIList<CJNIMediaDrmKeyStatus>& keyInformation,
+    bool hasNewUsableKey)
+{
+  m_decrypterOnKeyStatusChangeCallback->OnKeyStatusChange(mediaDrm, sessionId, keyInformation,
+                                                          hasNewUsableKey);
+}
+
 CWVCdmAdapterA::CWVCdmAdapterA(std::string_view keySystem,
                                const DRM::Config& config,
                                std::shared_ptr<CJNIClassLoader> jniClassLoader,
@@ -80,14 +99,28 @@ CWVCdmAdapterA::CWVCdmAdapterA(std::string_view keySystem,
 
   // Create media drm EventListener (unique_ptr explanation on class comment)
   m_mediaDrmEventListener = std::make_unique<CMediaDrmOnEventListener>(this, jniClassLoader);
-  m_cdmAdapter->setOnEventListener(*m_mediaDrmEventListener.get());
   if (xbmc_jnienv()->ExceptionCheck())
   {
     LOG::LogF(LOGERROR, "Exception during installation of EventListener");
     xbmc_jnienv()->ExceptionClear();
     m_cdmAdapter->release();
     return;
   }
+  m_cdmAdapter->setOnEventListener(*m_mediaDrmEventListener.get());
+
+  // Create media drm OnKeyStatusChangeListener (unique_ptr explanation on class comment)
+  m_mediaDrmOnKeyChangeListener =
+      std::make_unique<CMediaDrmOnKeyStatusChangeListener>(this, jniClassLoader);
+  if (xbmc_jnienv()->ExceptionCheck())
+  {
+    LOG::LogF(LOGERROR, "Exception during installation of OnKeyStatusChangeListener");
+    xbmc_jnienv()->ExceptionClear();
+    m_cdmAdapter->release();
+    return;
+  }
+  CJNIMediaDrmKeyStatus::PopulateStaticFields(); // should be done by CJNIContext but currently not implemented for add-ons case
+  m_cdmAdapter->setOnKeyStatusChangeListener(*m_mediaDrmOnKeyChangeListener.get());
+
 
   std::vector<uint8_t> strDeviceId = m_cdmAdapter->getPropertyByteArray("deviceUniqueId");
   xbmc_jnienv()->ExceptionClear();
@@ -199,6 +232,29 @@ void CWVCdmAdapterA::OnMediaDrmEvent(const CJNIMediaDrm& mediaDrm,
   NotifyObservers(cdmMsg);
 }
 
+void CWVCdmAdapterA::OnKeyStatusChange(const CJNIMediaDrm& mediaDrm,
+                                       const std::vector<char>& sessionId,
+                                       const CJNIList<CJNIMediaDrmKeyStatus>& keyInformation,
+                                       bool hasNewUsableKey)
+{
+  LOG::LogF(LOGDEBUG, "MediaDrm OnKeyStatusChange event: SID %s", sessionId.data());
+
+  if (keyInformation.size() == 0)
+  {
+    LOG::LogF(LOGWARNING, "MediaDrm OnKeyStatusChange: NO KEYS");
+    return;
+  }
+
+  for (int i = 0; i < keyInformation.size(); ++i)
+  {
+    const std::vector<uint8_t> kid = keyInformation.get(i).getKeyId();
+    const int statusCode = keyInformation.get(i).getStatusCode();
+
+    LOG::LogF(LOGWARNING, "MediaDrm OnKeyStatusChange: KID %s, status code: %i",
+              STRING::ToHexadecimal(kid).c_str(), statusCode);
+  }
+}
+
 void CWVCdmAdapterA::SaveServiceCertificate()
 {
   const std::vector<uint8_t> sc = m_cdmAdapter->getPropertyByteArray("serviceCertificate");

src/decrypters/widevineandroid/WVCdmAdapter.h

@@ -14,6 +14,7 @@
 #include <androidjni/ClassLoader.h>
 #include <androidjni/MediaDrm.h>
 #include <androidjni/MediaDrmOnEventListener.h>
+#include <androidjni/MediaDrmOnKeyStatusChangeListener.h>
 
 #ifdef INPUTSTREAM_TEST_BUILD
 #include "test/KodiStubs.h"
@@ -62,7 +63,42 @@ class CMediaDrmOnEventListener : public CJNIMediaDrmOnEventListener
   CMediaDrmOnEventCallback* m_decrypterEventCallback;
 };
 
+class CMediaDrmOnKeyStatusChangeCallback
+{
+public:
+  CMediaDrmOnKeyStatusChangeCallback() = default;
+  virtual ~CMediaDrmOnKeyStatusChangeCallback() = default;
+
+  virtual void OnKeyStatusChange(const CJNIMediaDrm& mediaDrm,
+                                 const std::vector<char>& sessionId,
+                                 const CJNIList<CJNIMediaDrmKeyStatus>& keyInformation,
+                                 bool hasNewUsableKey) = 0;
+};
+
+/*!
+ * \brief This class is derived from CJNIMediaDrmOnKeyStatusChangeListener to allow us
+ *        to initialize the base class at later time, since the constructors
+ *        of CJNIMediaDrmOnKeyStatusChangeListener need to access to the global
+ *        xbmc_jnienv method immediately.
+ */
+class CMediaDrmOnKeyStatusChangeListener : public CJNIMediaDrmOnKeyStatusChangeListener
+{
+public:
+  CMediaDrmOnKeyStatusChangeListener(CMediaDrmOnKeyStatusChangeCallback* decrypterEventCallback,
+                           std::shared_ptr<CJNIClassLoader> classLoader);
+  virtual ~CMediaDrmOnKeyStatusChangeListener() = default;
+
+  virtual void onKeyStatusChange(const CJNIMediaDrm& mediaDrm,
+                                 const std::vector<char>& sessionId,
+                                 const CJNIList<CJNIMediaDrmKeyStatus>& keyInformation,
+                                 bool hasNewUsableKey) override;
+
+private:
+  CMediaDrmOnKeyStatusChangeCallback* m_decrypterOnKeyStatusChangeCallback;
+};
+
 class ATTR_DLL_LOCAL CWVCdmAdapterA : public CMediaDrmOnEventCallback,
+                                      public CMediaDrmOnKeyStatusChangeCallback,
                                       public IWVCdmAdapter<CJNIMediaDrm>
 {
 public:
@@ -96,13 +132,20 @@ class ATTR_DLL_LOCAL CWVCdmAdapterA : public CMediaDrmOnEventCallback,
                        int extra,
                        const std::vector<char>& data) override;
 
+  // CMediaDrmOnKeyStatusChangeCallback interface methods
+  void OnKeyStatusChange(const CJNIMediaDrm& mediaDrm,
+                         const std::vector<char>& sessionId,
+                         const CJNIList<CJNIMediaDrmKeyStatus>& keyInformation,
+                         bool hasNewUsableKey) override;
+
   DRM::Config m_config;
   std::shared_ptr<CJNIMediaDrm> m_cdmAdapter;
   std::list<IWVObserver*> m_observers;
   std::mutex m_observer_mutex;
 
   std::string m_keySystem;
   std::unique_ptr<CMediaDrmOnEventListener> m_mediaDrmEventListener;
+  std::unique_ptr<CMediaDrmOnKeyStatusChangeListener> m_mediaDrmOnKeyChangeListener;
   std::string m_strBasePath;
   CWVDecrypterA* m_host;
 };