[Cleanup] Removed isDrmChanged variables

xbmc · Apr 24, 2024 · db83a63 · db83a63
1 parent 15865fc
commit db83a63
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 28 deletions.
diff --git a/src/Session.cpp b/src/Session.cpp
@@ -943,9 +943,8 @@ void CSession::PrepareStream(CStream* stream)
   // Download the manifest only at first start of the stream
   if (startEvent == EVENT_TYPE::STREAM_START)
   {
-    bool noop;
     m_adaptiveTree->PrepareRepresentation(stream->m_adStream.getPeriod(),
-                                          stream->m_adStream.getAdaptationSet(), repr, noop,
+                                          stream->m_adStream.getAdaptationSet(), repr,
                                           SEGMENT_NO_NUMBER);
   }
 

diff --git a/src/common/AdaptiveStream.cpp b/src/common/AdaptiveStream.cpp
@@ -953,8 +953,7 @@ bool AdaptiveStream::ensureSegment()
         {
           // On manifests type like HLS we need also to get update segments
           // because need to be downloaded/parsed from different child manifest files
-          bool isDrmChanged;
-          m_tree->PrepareRepresentation(current_period_, current_adp_, newRep, isDrmChanged,
+          m_tree->PrepareRepresentation(current_period_, current_adp_, newRep,
                                         current_rep_->getCurrentSegmentNumber());
 
           // If the representation has been changed, segments may have to be generated (DASH)

diff --git a/src/common/AdaptiveTree.h b/src/common/AdaptiveTree.h
@@ -126,7 +126,6 @@ class ATTR_DLL_LOCAL AdaptiveTree
   virtual bool PrepareRepresentation(PLAYLIST::CPeriod* period,
                                      PLAYLIST::CAdaptationSet* adp,
                                      PLAYLIST::CRepresentation* rep,
-                                     bool& isDrmChanged,
                                      uint64_t currentSegNumber)
   {
     return false;

diff --git a/src/parser/HLSTree.cpp b/src/parser/HLSTree.cpp
@@ -180,7 +180,6 @@ bool adaptive::CHLSTree::Open(std::string_view url,
 bool adaptive::CHLSTree::PrepareRepresentation(PLAYLIST::CPeriod* period,
                                                PLAYLIST::CAdaptationSet* adp,
                                                PLAYLIST::CRepresentation* rep,
-                                               bool& isDrmChanged,
                                                uint64_t currentSegNumber)
 {
   // Prepare child manifest only once time for VOD stream and always for live stream
@@ -201,8 +200,7 @@ bool adaptive::CHLSTree::PrepareRepresentation(PLAYLIST::CPeriod* period,
     if (!DownloadChildManifest(adp, rep, resp))
       return false;
 
-    status = ParseChildManifest(resp.data, URL::GetUrlPath(resp.effectiveUrl), period, adp, rep,
-                                isDrmChanged);
+    status = ParseChildManifest(resp.data, URL::GetUrlPath(resp.effectiveUrl), period, adp, rep);
 
     if (status == ParseStatus::SUCCESS)
     {
@@ -433,8 +431,7 @@ void adaptive::CHLSTree::FixDiscSequence(std::stringstream& streamData, uint32_t
     std::string_view sourceUrl,
     PLAYLIST::CPeriod* period,
     PLAYLIST::CAdaptationSet* adp,
-    PLAYLIST::CRepresentation* rep,
-    bool& isDrmChanged)
+    PLAYLIST::CRepresentation* rep)
 {
   const auto& manifestCfg = CSrvBroker::GetKodiProps().GetManifestConfig();
   size_t adpSetPos = GetPtrPosition(period->GetAdaptationSets(), adp);
@@ -521,12 +518,6 @@ void adaptive::CHLSTree::FixDiscSequence(std::stringstream& streamData, uint32_t
 
           rep->m_psshSetPos = InsertPsshSet(adp->GetStreamType(), period, adp, m_currentPssh,
                                             m_currentDefaultKID, m_currentKidUrl, m_currentIV);
-
-          if (period->GetPSSHSets()[rep->GetPsshSetPos()].m_usageCount == 1 || isDrmChanged)
-            isDrmChanged = true;
-          else
-            isDrmChanged = false;
-          break;
         default:
           break;
       }
@@ -1048,7 +1039,6 @@ void adaptive::CHLSTree::RefreshSegments(PLAYLIST::CPeriod* period,
   if (rep->IsIncludedStream())
     return;
 
-  bool isDrmChanged{false};
   UTILS::CURL::HTTPResponse resp;
 
   if (!DownloadChildManifest(adp, rep, resp))
@@ -1059,14 +1049,11 @@ void adaptive::CHLSTree::RefreshSegments(PLAYLIST::CPeriod* period,
   const uint64_t segNumber = rep->getCurrentSegmentNumber();
 
   const ParseStatus status = ParseChildManifest(resp.data, URL::GetUrlPath(resp.effectiveUrl),
-                                                period, adp, rep, isDrmChanged);
+                                                period, adp, rep);
   if (status == ParseStatus::SUCCESS)
   {
     PrepareSegments(period, adp, rep, segNumber);
   }
-
-  if (isDrmChanged)
-    LOG::Log(LOGERROR, "Unmanaged DRM change between segments");
 }
 
 bool adaptive::CHLSTree::DownloadKey(std::string_view url,
@@ -1106,7 +1093,6 @@ void adaptive::CHLSTree::RefreshLiveSegments()
 
   for (auto& [adpSet, repr] : refreshList)
   {
-    bool isDrmChanged{false};
     UTILS::CURL::HTTPResponse resp;
 
     if (!DownloadChildManifest(adpSet, repr, resp))
@@ -1117,7 +1103,7 @@ void adaptive::CHLSTree::RefreshLiveSegments()
     const uint64_t segNumber = repr->getCurrentSegmentNumber();
 
     const ParseStatus status = ParseChildManifest(resp.data, URL::GetUrlPath(resp.effectiveUrl),
-                                                  m_currentPeriod, adpSet, repr, isDrmChanged);
+                                                  m_currentPeriod, adpSet, repr);
 
     if (status == ParseStatus::SUCCESS)
     {

diff --git a/src/parser/HLSTree.h b/src/parser/HLSTree.h
@@ -46,7 +46,6 @@ class ATTR_DLL_LOCAL CHLSTree : public AdaptiveTree
   virtual bool PrepareRepresentation(PLAYLIST::CPeriod* period,
                                      PLAYLIST::CAdaptationSet* adp,
                                      PLAYLIST::CRepresentation* rep,
-                                     bool& isDrmChanged,
                                      uint64_t currentSegNumber) override;
 
   virtual void OnDataArrived(uint64_t segNum,
@@ -150,8 +149,7 @@ class ATTR_DLL_LOCAL CHLSTree : public AdaptiveTree
                                  std::string_view sourceUrl,
                                  PLAYLIST::CPeriod* period,
                                  PLAYLIST::CAdaptationSet* adp,
-                                 PLAYLIST::CRepresentation* rep,
-                                 bool& isDrmChanged);
+                                 PLAYLIST::CRepresentation* rep);
 
   void PrepareSegments(PLAYLIST::CPeriod* period,
                        PLAYLIST::CAdaptationSet* adp,

diff --git a/src/test/TestHLSTree.cpp b/src/test/TestHLSTree.cpp
@@ -86,8 +86,7 @@ class HLSTreeTest : public ::testing::Test
       rep->SetSourceUrl(url);
 
     testHelper::testFile = filePath;
-    bool isDrmChanged;
-    return tree->PrepareRepresentation(per, adp, rep, isDrmChanged, PLAYLIST::SEGMENT_NO_NUMBER);
+    return tree->PrepareRepresentation(per, adp, rep, PLAYLIST::SEGMENT_NO_NUMBER);
   }
 
   adaptive::CHLSTree* tree;