Merge pull request xbmc#6 from smf007/parameter_fix

[HLS][Revert] share parameters between master / sub playlists
Maven85 · Aug 27, 2020 · 6a630d1 · 6a630d1
1 parent cd3ab94
commit 6a630d1
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 13 deletions.
diff --git a/src/common/AdaptiveTree.cpp b/src/common/AdaptiveTree.cpp
@@ -320,8 +320,6 @@ namespace adaptive
   {
     size_t paramPos = url.find('?');
     base_url_ = (paramPos == std::string::npos) ? url : url.substr(0, paramPos);
-    if (paramPos != std::string::npos)
-      manifest_parameter_= url.substr(paramPos);
 
     paramPos = base_url_.find_last_of('/', base_url_.length());
     if (paramPos == std::string::npos)

diff --git a/src/common/AdaptiveTree.h b/src/common/AdaptiveTree.h
@@ -415,7 +415,6 @@ class AdaptiveTree
   std::string etag_, last_modified_;
   std::string media_renewal_url_;
   uint32_t media_renewal_time_;
-  std::string manifest_parameter_;
 
   /* XML Parsing*/
   XML_Parser parser_;

diff --git a/src/parser/HLSTree.cpp b/src/parser/HLSTree.cpp
@@ -245,11 +245,6 @@ bool HLSTree::processManifest(std::stringstream& stream, const std::string& url)
         else
           rep->source_url_ = res->second;
 
-        if (!manifest_parameter_.empty() &&
-            rep->source_url_.compare(0, base_url_.size(), base_url_) == 0 &&
-            rep->source_url_.find('?') == std::string::npos)
-          rep->source_url_ += manifest_parameter_;
-
         // default to WebVTT
         if (type == SUBTITLE)
           rep->codecs_ = "wvtt";
@@ -339,11 +334,6 @@ bool HLSTree::processManifest(std::stringstream& stream, const std::string& url)
       else
         current_representation_->source_url_ = line;
 
-      if (!manifest_parameter_.empty() &&
-          current_representation_->source_url_.compare(0, base_url_.size(), base_url_) == 0 &&
-          current_representation_->source_url_.find('?') == std::string::npos)
-        current_representation_->source_url_ += manifest_parameter_;
-
       //Ignore duplicate reps
       for (auto const* rep : current_adaptationset_->representations_)
         if (rep != current_representation_ &&