Add dvcc parsing and store in inputstream

Author: cscd98

lib/cdm/cdm/media/base/cdm_config.h

@@ -15,8 +15,12 @@ namespace media {
 // |requestMediaKeySystemAccess|. This is in some sense the Chromium-side
 // counterpart of Blink's WebMediaKeySystemConfiguration.
 struct CdmConfig {
+<<<<<<< HEAD
   CdmConfig(bool distinctive_identifier=false, bool persistent_state=false,
     bool hw_secure_codecs=false)
+=======
+  CdmConfig(bool distinctive_identifier=false, bool persistent_state=false, bool hw_secure_codecs=false)
+>>>>>>> afd588d6 (Add dvcc parsing and store in inputstream)
     :allow_distinctive_identifier(distinctive_identifier)
     , allow_persistent_state(persistent_state)
     , use_hw_secure_codecs(hw_secure_codecs){};

src/common/AdaptiveCencSampleDecrypter.h

@@ -7,6 +7,10 @@
  */
 
 #include "AdaptiveDecrypter.h"
+<<<<<<< HEAD
+=======
+
+>>>>>>> 380146c9 (Add dvcc parsing and store in inputstream)
 #include "decrypters/DrmEngineDefines.h"
 
 #include <memory>

src/decrypters/widevine/WVCdmAdapter.cpp

@@ -122,8 +122,7 @@ SResult CWVCdmAdapter::Initialize(const DRM::Config& config, CWVDecrypter* host)
 
   auto cdmAdapter =
       std::make_shared<media::CdmAdapter>("com.widevine.alpha", cdmPath, basePath,
-                                          media::CdmConfig(false, m_config.isPersistentStorage, 
-                                            use_hw_secure_codecs),
+                                          media::CdmConfig(false, m_config.isPersistentStorage, use_hw_secure_codecs),
                                           dynamic_cast<media::CdmAdapterClient*>(this));
 
   if (!cdmAdapter->LoadCDM())

src/decrypters/widevine/WVCencSingleSampleDecrypter.cpp

@@ -76,7 +76,6 @@ CWVCencSingleSampleDecrypter::CWVCencSingleSampleDecrypter(
   // prepare the promise before calling into CDM
   std::future<std::string> fut = m_cdmAdapter->PrepareSessionFuture(pid);
 
-  LOG::LogF(LOGDEBUG, "Creating widevine session with promise ID: %u", pid);
   m_cdmAdapter->GetCDM()->CreateSessionAndGenerateRequest(
       pid, cdm::SessionType::kTemporary, cdm::InitDataType::kCenc,
       m_pssh.data(), static_cast<uint32_t>(m_pssh.size()));
@@ -588,7 +587,7 @@ AP4_Result CWVCencSingleSampleDecrypter::DecryptSampleData(AP4_UI32 poolId,
           dataIn, payload, subsampleCount, fragInfo, iv,
           bytesOfCleartextData, bytesOfEncryptedData, convertAnnexB, rebuiltSubs);
       if (res != AP4_SUCCESS) {
-        LOG::LogF(LOGERROR, "[DecryptSampleData] ConvertToAnnexB failed: %d", res);
+        LOG::LogF(LOGERROR, "ConvertToAnnexBandInject failed: %d", res);
         return res;
       }
     }
@@ -639,8 +638,6 @@ AP4_Result CWVCencSingleSampleDecrypter::DecryptSampleData(AP4_UI32 poolId,
     // Prepare CDM input using rebuiltSubs
     cdm::InputBuffer_2 cdmIn;
     SetInput(cdmIn, payload, static_cast<uint32_t>(rebuiltSubs.size()), iv, fragInfo, rebuiltSubs);
-    LOG::LogF(LOGDEBUG, "[DecryptSampleData] CDM input prepared [V=%d] subSampleCount=%u",
-              streamType, static_cast<unsigned>(rebuiltSubs.size()));
 
     const size_t header_cushion = 64;
     m_decryptOut.Reserve(payload.GetDataSize() + dataOut.GetDataSize() + header_cushion);
@@ -652,16 +649,14 @@ AP4_Result CWVCencSingleSampleDecrypter::DecryptSampleData(AP4_UI32 poolId,
 
     CheckLicenseRenewal();
 
-    cdm::Status ret = m_cdmAdapter->GetCDM()->Decrypt(cdmIn, &cdmOut, streamType);
+    cdm::Status ret = m_cdmAdapter->GetCDM()->Decrypt(cdmIn, &cdmOut, ToCdmStreamType(streamType));
     if (ret != cdm::kSuccess) {
       LOG::LogF(LOGERROR, "[DecryptSampleData] CDM->Decrypt failed, status=%d", static_cast<int>(ret));
       return AP4_ERROR_INVALID_FORMAT;
     }
 
     // Prefix (if any) + SVP-wrapped payload
     dataOut.AppendData(m_decryptOut.GetData(), m_decryptOut.GetDataSize());
-    LOG::LogF(LOGDEBUG, "[DecryptSampleData] Secure-path success, forwarding CDM output size=%zu",
-              dataOut.GetDataSize());
 #else
     // Prefix (if IV) + raw payload
     dataOut.AppendData(payload.GetData(), payload.GetDataSize());
@@ -856,7 +851,6 @@ CWVCencSingleSampleDecrypter::ConvertToAnnexBandInject(
       packetIn[2] == 0x00 &&
       packetIn[3] == 0x01))
     {
-      LOG::LogF(LOGDEBUG, "Injecting annex b header");
       dataOut.AppendData(annexbStartCode, 4);
     }
 

src/decrypters/widevine/WVCencSingleSampleDecrypter.h

@@ -151,6 +151,8 @@ class ATTR_DLL_LOCAL CWVCencSingleSampleDecrypter : public Adaptive_CencSingleSa
                                       bool convertAnnexB,
                                       std::vector<cdm::SubsampleEntry>& rebuiltSubs);
 
+  cdm::StreamType ToCdmStreamType(DRM::DRMMediaType stream_type);
+
   uint32_t m_promiseId;
   bool m_isDrained;
 

src/samplereader/FragmentedSampleReader.cpp

@@ -135,6 +135,16 @@ AP4_Result CFragmentedSampleReader::ReadSample()
   if (m_track->GetType() == AP4_Track::Type::TYPE_AUDIO)
     streamType = DRM::DRMMediaType::AUDIO;
 
+#ifdef TARGET_WEBOS
+  // if we are not in secure path mode, adding SVP header/meta data is not needed
+  if(m_track->GetType() == AP4_Track::Type::TYPE_VIDEO &&
+    (!CSrvBroker::GetSettings().IsSecurePathOverride()))
+  {
+    LOG::LogF(LOGDEBUG, "Overriding VIDEO as non-secure path to: kStreamTypeAudio");
+    streamType = DRM::DRMMediaType::AUDIO;
+  }
+#endif
+
   AP4_Result result;
   if (!m_codecHandler->ReadNextSample(m_sample, m_sampleData))
   {
@@ -268,6 +278,11 @@ bool CFragmentedSampleReader::GetInformation(kodi::addon::InputstreamInfo& info)
 
   isChanged |= m_codecHandler->GetInformation(info);
 
+  // store dvcc metadata
+  if (auto dvcc = ParseDvcc()) {
+    PopulateDvccMetadata(info, dvcc);
+  }
+
   m_bSampleDescChanged = false;
 
   return isChanged;
@@ -511,7 +526,7 @@ void CFragmentedSampleReader::UpdateSampleDescription()
 
   LOG::LogF(LOGDEBUG, "Codec fourcc: %s (%u)", CODEC::FourCCToString(desc->GetFormat()).c_str(),
             desc->GetFormat());
-  
+
   if (AP4_DYNAMIC_CAST(AP4_AudioSampleDescription, desc))
   {
     // Audio sample of any format
@@ -590,3 +605,53 @@ void CFragmentedSampleReader::ParseTrafTfrf(AP4_UuidAtom* uuidAtom)
     m_observer->OnTFRFatom(time, duration, m_track->GetMediaTimeScale());
   }
 }
+
+AP4_DvccAtom* CFragmentedSampleReader::ParseDvcc()
+{
+  if (AP4_TrakAtom* trak = m_track->UseTrakAtom()) {
+    if (auto mdia = AP4_DYNAMIC_CAST(AP4_ContainerAtom,
+                    trak->GetChild(AP4_ATOM_TYPE_MDIA, 0))) {
+      if (auto minf = AP4_DYNAMIC_CAST(AP4_ContainerAtom,
+                      mdia->GetChild(AP4_ATOM_TYPE_MINF, 0))) {
+          if (auto stbl = AP4_DYNAMIC_CAST(AP4_ContainerAtom,
+                          minf->GetChild(AP4_ATOM_TYPE_STBL, 0))) {
+            if (auto stsd = AP4_DYNAMIC_CAST(AP4_ContainerAtom,
+                            stbl->GetChild(AP4_ATOM_TYPE_STSD, 0))) {
+              for (auto* eitem = stsd->GetChildren().FirstItem(); eitem; eitem = eitem->GetNext()) {
+                auto entry_ctn = AP4_DYNAMIC_CAST(AP4_ContainerAtom, eitem->GetData());
+
+                if (!entry_ctn) continue;
+                AP4_Atom* dv_atom = entry_ctn->GetChild(AP4_ATOM_TYPE_DVCC, 0);
+                if (!dv_atom) dv_atom = entry_ctn->GetChild(AP4_ATOM_TYPE_DVVC, 0);
+                if (!dv_atom) continue;
+
+                if (auto dvcc = AP4_DYNAMIC_CAST(AP4_DvccAtom, dv_atom)) {
+                  return dvcc;
+                }
+              }
+            }
+          }
+        }
+    }
+  }
+
+  return nullptr;
+}
+
+void CFragmentedSampleReader::PopulateDvccMetadata(kodi::addon::InputstreamInfo& info, AP4_DvccAtom* dvcc)
+{
+  if (!dvcc)
+    return;
+
+  auto* meta = new INPUTSTREAM_DVCC_METADATA();
+  meta->m_dvVersionMajor = dvcc->GetDvVersionMajor();
+  meta->m_dvVersionMinor = dvcc->GetDvVersionMinor();
+  meta->m_dvProfile = dvcc->GetDvProfile();
+  meta->m_dvLevel = dvcc->GetDvLevel();
+  meta->m_rpuPresentFlag = dvcc->GetRpuPresentFlag();
+  meta->m_elPresentFlag = dvcc->GetElPresentFlag();
+  meta->m_blPresentFlag = dvcc->GetBlPresentFlag();
+  meta->m_dvBlSignalCompatibilityId = dvcc->GetDvBlSignalCompatibilityID();
+
+  info.SetDvccMetadata(meta);
+}

src/samplereader/FragmentedSampleReader.h

@@ -54,6 +54,8 @@ class ATTR_DLL_LOCAL CFragmentedSampleReader : public ISampleReader, public AP4_
 private:
   void UpdateSampleDescription();
   void ParseTrafTfrf(AP4_UuidAtom* uuidAtom);
+  AP4_DvccAtom* ParseDvcc();
+  void PopulateDvccMetadata(kodi::addon::InputstreamInfo& info, AP4_DvccAtom* dvcc);
 
   AP4_Track* m_track;
   AP4_UI32 m_poolId{0};