[Widevine] Use default KID as fallback

src/decrypters/widevine/WVCencSingleSampleDecrypter.cpp

@@ -44,7 +44,7 @@ void CWVCencSingleSampleDecrypter::SetSession(const char* session,
 
 CWVCencSingleSampleDecrypter::CWVCencSingleSampleDecrypter(CWVCdmAdapter& drm,
                                                            std::vector<uint8_t>& pssh,
-                                                           std::string_view defaultKeyId,
+                                                           std::vector<uint8_t>& defaultKeyId,
                                                            bool skipSessionMessage,
                                                            CryptoMode cryptoMode,
                                                            CWVDecrypter* host)
@@ -436,7 +436,7 @@ bool CWVCencSingleSampleDecrypter::SendSessionMessage()
 
         if (blocks[2][kidPos - 1] == 'H')
         {
-          std::string keyIdUUID{StringUtils::ToHexadecimal(m_defaultKeyId)};
+          std::string keyIdUUID{STRING::ToHexadecimal(m_defaultKeyId)};
           blocks[2].replace(kidPos - 1, 6, keyIdUUID.c_str(), 32);
         }
         else
@@ -664,7 +664,18 @@ AP4_Result CWVCencSingleSampleDecrypter::SetFragmentInfo(AP4_UI32 poolId,
   if (poolId >= m_fragmentPool.size())
     return AP4_ERROR_OUT_OF_RANGE;
 
-  m_fragmentPool[poolId].m_key = keyId;
+  // KID as 00000000000000000000000000000000
+  const std::vector<uint8_t> emptyKeyId = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                           0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
+
+  if (keyId == emptyKeyId)
+  {
+    m_fragmentPool[poolId].m_key = m_defaultKeyId;
+    LOG::Log(LOGDEBUG, "SET DEFAULT KID");
+  }
+  else
+    m_fragmentPool[poolId].m_key = keyId;
+
   m_fragmentPool[poolId].m_nalLengthSize = nalLengthSize;
   m_fragmentPool[poolId].m_annexbSpsPps.SetData(annexbSpsPps.GetData(), annexbSpsPps.GetDataSize());
   m_fragmentPool[poolId].m_decrypterFlags = flags;
@@ -1164,7 +1175,7 @@ void CWVCencSingleSampleDecrypter::ResetVideo()
 
 void CWVCencSingleSampleDecrypter::SetDefaultKeyId(std::string_view keyId)
 {
-  m_defaultKeyId = keyId;
+  m_defaultKeyId.assign(keyId.begin(), keyId.end());
 }
 
 void CWVCencSingleSampleDecrypter::AddKeyId(std::string_view keyId)

src/decrypters/widevine/WVCencSingleSampleDecrypter.h

@@ -32,7 +32,7 @@ class ATTR_DLL_LOCAL CWVCencSingleSampleDecrypter : public Adaptive_CencSingleSa
   // methods
   CWVCencSingleSampleDecrypter(CWVCdmAdapter& drm,
                                std::vector<uint8_t>& pssh,
-                               std::string_view defaultKeyId,
+                               std::vector<uint8_t>& defaultKeyId,
                                bool skipSessionMessage,
                                CryptoMode cryptoMode,
                                CWVDecrypter* host);
@@ -93,7 +93,7 @@ class ATTR_DLL_LOCAL CWVCencSingleSampleDecrypter : public Adaptive_CencSingleSa
   std::string m_strSession;
   std::vector<uint8_t> m_pssh;
   AP4_DataBuffer m_challenge;
-  std::string m_defaultKeyId;
+  std::vector<uint8_t> m_defaultKeyId;
   struct WVSKEY
   {
     bool operator==(WVSKEY const& other) const { return m_keyId == other.m_keyId; };

src/decrypters/widevine/WVDecrypter.cpp

@@ -100,8 +100,10 @@ Adaptive_CencSingleSampleDecrypter* CWVDecrypter::CreateSingleSampleDecrypter(
     bool skipSessionMessage,
     CryptoMode cryptoMode)
 {
+  std::vector<uint8_t> kid(defaultKeyId.begin(), defaultKeyId.end());
+
   CWVCencSingleSampleDecrypter* decrypter = new CWVCencSingleSampleDecrypter(
-      *m_WVCdmAdapter, pssh, defaultKeyId, skipSessionMessage, cryptoMode, this);
+      *m_WVCdmAdapter, pssh, kid, skipSessionMessage, cryptoMode, this);
   if (!decrypter->GetSessionId())
   {
     delete decrypter;

src/main.cpp

@@ -288,6 +288,10 @@ bool CInputStreamAdaptive::OpenStream(int streamid)
   }
 
   uint16_t psshSetPos = stream->m_adStream.getRepresentation()->m_psshSetPos;
+
+  std::string kid = stream->m_adStream.getPeriod()->GetPSSHSets()[psshSetPos].defaultKID_;
+
+
   reader->SetDecrypter(m_session->GetSingleSampleDecryptor(psshSetPos),
                        m_session->GetDecrypterCaps(psshSetPos));
 

src/samplereader/FragmentedSampleReader.cpp

@@ -39,6 +39,8 @@ CFragmentedSampleReader::CFragmentedSampleReader(AP4_ByteStream* input,
     m_track{track},
     m_streamId{streamId}
 {
+  m_defaultKey = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
 }
 
 CFragmentedSampleReader::~CFragmentedSampleReader()

src/utils/StringUtils.cpp

@@ -306,6 +306,17 @@ std::string UTILS::STRING::ToHexadecimal(std::string_view str)
   return ss.str();
 }
 
+std::string UTILS::STRING::ToHexadecimal(const std::vector<uint8_t>& str)
+{
+  std::ostringstream ss;
+  ss << std::hex;
+  for (const uint8_t ch : str)
+  {
+    ss << std::setw(2) << std::setfill('0') << static_cast<unsigned long>(ch);
+  }
+  return ss.str();
+}
+
 std::string UTILS::STRING::Trim(std::string value)
 {
   StringUtils::Trim(value);

src/utils/StringUtils.h

@@ -223,6 +223,7 @@ std::vector<uint8_t> ToVecUint8(std::string_view str);
  * \return The string on its hexadecimal representation
  */
 std::string ToHexadecimal(std::string_view str);
+std::string ToHexadecimal(const std::vector<uint8_t>& str);
 
 /*!
  * \brief Trim a string with remove of not wanted spaces at begin and end of string.

src/utils/Utils.cpp

@@ -238,6 +238,20 @@ std::string UTILS::ConvertKIDtoUUID(std::string_view kid)
   return uuid;
 }
 
+std::string UTILS::ConvertKIDtoUUID(const std::vector<uint8_t>& kid)
+{
+  static char hexDigits[] = "0123456789abcdef";
+  std::string uuid;
+  for (size_t i{0}; i < 16; ++i)
+  {
+    if (i == 4 || i == 6 || i == 8 || i == 10)
+      uuid += '-';
+    uuid += hexDigits[kid[i] >> 4];
+    uuid += hexDigits[kid[i] & 15];
+  }
+  return uuid;
+}
+
 bool UTILS::CreateISMlicense(std::string_view key,
                              std::string_view licenseData,
                              std::vector<uint8_t>& initData)

src/utils/Utils.h

@@ -27,6 +27,7 @@ std::vector<uint8_t> AnnexbToAvc(const char* b16Data);
 std::vector<uint8_t> AvcToAnnexb(const std::vector<uint8_t>& avc);
 std::string ConvertKIDtoWVKID(std::string_view kid);
 std::string ConvertKIDtoUUID(std::string_view kid);
+std::string ConvertKIDtoUUID(const std::vector<uint8_t>& kid);
 bool CreateISMlicense(std::string_view key,
                       std::string_view licenseData,
                       std::vector<uint8_t>& initData);