Merge pull request #6920 from kaltura/Mercury-13.17.0-SUPP-13039

Mercury-13.17.0-SUP-13039 Playing apple http with non kaltura live
kaltura · Mar 27, 2018 · 29f2a19 · 29f2a19
2 parents c2d01ca + 73dd015
commit 29f2a19
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/alpha/lib/model/LiveEntry.php b/alpha/lib/model/LiveEntry.php
@@ -329,7 +329,7 @@ public function getCustomLiveStreamConfigurations()
 
 	public function getLiveStreamConfigurationByProtocol($format, $protocol, $tag = null, $currentDcOnly = false, array $flavorParamsIds = array())
 	{
-		$configurations = $this->getLiveStreamConfigurations($protocol, $tag, $currentDcOnly, $flavorParamsIds);
+		$configurations = $this->getLiveStreamConfigurations($protocol, $tag, $currentDcOnly, $flavorParamsIds, $format);
 		foreach($configurations as $configuration)
 		{
 			/* @var $configuration kLiveStreamConfiguration */
@@ -340,7 +340,7 @@ public function getLiveStreamConfigurationByProtocol($format, $protocol, $tag =
 		return null;
 	}
 
-	public function getLiveStreamConfigurations($protocol = 'http', $tag = null, $currentDcOnly = false, array $flavorParamsIds = array())
+	public function getLiveStreamConfigurations($protocol = 'http', $tag = null, $currentDcOnly = false, array $flavorParamsIds = array(), $format = null)
 	{
 		$configurations = array();
 		if (!in_array($this->getSource(), self::$kalturaLiveSourceTypes))

diff --git a/alpha/lib/model/LiveStreamEntry.php b/alpha/lib/model/LiveStreamEntry.php
@@ -91,10 +91,10 @@ private function getDynamicBroadcastUrl($customDataParam, $functionName, $protoc
 		return $url;
 	}
 
-	public function getLiveStreamConfigurations($protocol = 'http', $tag = null, $currentDcOnly = false, array $flavorParamsIds = array())
+	public function getLiveStreamConfigurations($protocol = 'http', $tag = null, $currentDcOnly = false, array $flavorParamsIds = array(), $format = null)
 	{
-		$configurations =  parent::getLiveStreamConfigurations($protocol, $tag, $currentDcOnly, $flavorParamsIds);
-		if($protocol == PlaybackProtocol::APPLE_HTTP && !in_array($this->getSource(), self::$kalturaLiveSourceTypes) && $this->getHlsStreamUrl())
+		$configurations =  parent::getLiveStreamConfigurations($protocol, $tag, $currentDcOnly, $flavorParamsIds, $format);
+		if($format == PlaybackProtocol::APPLE_HTTP && !in_array($this->getSource(), self::$kalturaLiveSourceTypes) && $this->getHlsStreamUrl())
 		{
 			$hlsLiveStreamConfig = new kLiveStreamConfiguration();
 			$hlsLiveStreamConfig->setUrl($this->getHlsStreamUrl());